diff options
Diffstat (limited to 'games-engines/exult')
| -rw-r--r-- | games-engines/exult/ChangeLog | 10 | ||||
| -rw-r--r-- | games-engines/exult/exult-1.2.ebuild | 103 | ||||
| -rw-r--r-- | games-engines/exult/files/exult-1.2-64bits.patch | 20 | ||||
| -rw-r--r-- | games-engines/exult/files/exult-1.2-gcc41.patch | 42 | ||||
| -rw-r--r-- | games-engines/exult/files/exult-1.2-gcc43.patch | 212 | ||||
| -rw-r--r-- | games-engines/exult/files/exult-1.2-gcc44.patch | 21 | ||||
| -rw-r--r-- | games-engines/exult/files/exult-1.2-libpng14.patch | 22 | ||||
| -rw-r--r-- | games-engines/exult/files/exult-1.2-libpng15.patch | 29 | ||||
| -rw-r--r-- | games-engines/exult/files/exult-1.2-x11link.patch | 11 |
9 files changed, 9 insertions, 461 deletions
diff --git a/games-engines/exult/ChangeLog b/games-engines/exult/ChangeLog index 96f5b7db87ef..70b4331a03b5 100644 --- a/games-engines/exult/ChangeLog +++ b/games-engines/exult/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for games-engines/exult # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.33 2015/01/09 01:52:57 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.34 2015/01/09 02:57:14 mr_bones_ Exp $ + + 09 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org> -exult-1.2.ebuild, + -files/exult-1.2-64bits.patch, -files/exult-1.2-gcc41.patch, + -files/exult-1.2-gcc43.patch, -files/exult-1.2-gcc44.patch, + -files/exult-1.2-libpng14.patch, -files/exult-1.2-libpng15.patch, + -files/exult-1.2-x11link.patch: + remove old and broken 'stable' version since it is not recommended for use by + upstream *exult-9999 (09 Jan 2015) diff --git a/games-engines/exult/exult-1.2.ebuild b/games-engines/exult/exult-1.2.ebuild deleted file mode 100644 index 55370edefcd0..000000000000 --- a/games-engines/exult/exult-1.2.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.2.ebuild,v 1.24 2014/05/15 16:41:45 ulm Exp $ - -EAPI=2 -inherit eutils autotools multilib games - -DESCRIPTION="an Ultima 7 game engine that runs on modern operating systems" -HOMEPAGE="http://exult.sourceforge.net/" -SRC_URI="mirror://sourceforge/exult/${P}.tar.gz - mirror://sourceforge/exult/U7MusicOGG_1of2.zip - mirror://sourceforge/exult/U7MusicOGG_2of2.zip - mirror://sourceforge/exult/jmsfx.zip - mirror://sourceforge/exult/jmsfxsi.zip" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ppc ~sparc x86" -IUSE="timidity zlib" - -RDEPEND=">=media-libs/libpng-1.4 - media-libs/libsdl[sound,video,X] - media-libs/sdl-mixer[vorbis,timidity?] - timidity? ( >=media-sound/timidity++-2 ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - app-arch/unzip" - -# upstream says... "the opengl renderer is very very experimental and -# not recommended for actual use" -#opengl? ( virtual/opengl ) - -src_unpack() { - unpack ${P}.tar.gz - mkdir music/ - cd music/ - unpack U7MusicOGG_{1,2}of2.zip - cd "${WORKDIR}" - mkdir flx/ - cd flx/ - unpack jmsfx{,si}.zip -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-gcc41.patch \ - "${FILESDIR}"/${P}-64bits.patch \ - "${FILESDIR}"/${P}-x11link.patch \ - "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-gcc44.patch \ - "${FILESDIR}"/${P}-libpng14.patch \ - "${FILESDIR}"/${P}-libpng15.patch - sed -i \ - -e "s/u7siinstrics.data/u7siintrinsics.data/" \ - usecode/ucxt/data/Makefile.am \ - || die "sed usecode/ucxt/data/Makefile.am failed" - sed -i \ - -e '/^Encoding/d' \ - -e '/^Icon/s/\.png//' \ - -e '/^Categories/s/Application;//' \ - desktop/exult.desktop \ - || die - # This fix is needed for gimp-plugin support if we want to turn that on. - #sed -i \ - #-e 's/$(DESTDIR)$(GIMP_PLUGINS) /$(GIMP_PLUGINS) $(DESTDIR)/' \ - #mapedit/Makefile.in \ - #|| die "sed mapedit/Makefile.in failed" - eautoreconf -} - -src_configure() { - egamesconf \ - --x-libraries="/usr/$(get_libdir)" \ - --disable-dependency-tracking \ - --disable-tools \ - --disable-opengl \ - $(use_enable timidity) \ - $(use_enable zlib zip-support) -} - -src_install() { - emake \ - DESTDIR="${D}" \ - desktopdir=/usr/share/applications/ \ - icondir=/usr/share/icons \ - install || die "emake install failed" - # no need for this directory for just playing the game - rm -rf "${D}${GAMES_DATADIR}/${PN}/estudio" - dodoc AUTHORS ChangeLog NEWS FAQ README README.1ST - insinto "${GAMES_DATADIR}/${PN}/music" - doins "${WORKDIR}/music/"*ogg || die "doins failed" - insinto "${GAMES_DATADIR}/${PN}/" - doins "${WORKDIR}/flx/"*.flx || die "doins failed" - newdoc "${WORKDIR}/music/readme.txt" music-readme.txt - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - elog "You *must* have the original Ultima7 The Black Gate and/or" - elog "The Serpent Isle installed." - elog "See README in /usr/share/doc/${PF} for information." -} diff --git a/games-engines/exult/files/exult-1.2-64bits.patch b/games-engines/exult/files/exult-1.2-64bits.patch deleted file mode 100644 index ed4be4a4f2da..000000000000 --- a/games-engines/exult/files/exult-1.2-64bits.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- usecode/useval.cc.old 2006-10-25 21:43:21.000000000 +0200 -+++ usecode/useval.cc 2006-10-25 21:48:49.000000000 +0200 -@@ -464,7 +464,7 @@ - if (buflen < 5) - return -1; - *ptr++ = type; -- Write4(ptr, (int)value.ptr); -+ Write4(ptr, 0); - break; - case string_type: - { -@@ -525,7 +525,7 @@ - case pointer_type: - if (buflen < 5) - return false; -- value.ptr = (Game_object*)Read4(ptr); //DON'T dereference this pointer! -+ value.ptr = 0; //DON'T dereference this pointer! - // Maybe add a new type "serialized_pointer" to prevent "accidents"? - return true; - case string_type: diff --git a/games-engines/exult/files/exult-1.2-gcc41.patch b/games-engines/exult/files/exult-1.2-gcc41.patch deleted file mode 100644 index 045fd83405d5..000000000000 --- a/games-engines/exult/files/exult-1.2-gcc41.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- hash_utils.h.old 2006-05-04 20:47:24.000000000 +0200 -+++ hash_utils.h 2006-05-04 20:58:58.000000000 +0200 -@@ -26,7 +26,7 @@ - #else - #if HAVE_EXT_HASH_MAP - # include <ext/hash_map> --# if (defined(__GNUC__) && (__GNUC__ == 3) && ( __GNUC_MINOR__ > 0)) -+# if defined(__GNUC__) && (((__GNUC__ == 3) && ( __GNUC_MINOR__ > 0)) || __GNUC__ >= 4) - using __gnu_cxx::hash_map; - # else - using std::hash_map; -@@ -44,7 +44,7 @@ - #else - #if HAVE_EXT_HASH_SET - # include <ext/hash_set> --# if (defined(__GNUC__) && (__GNUC__ == 3) && ( __GNUC_MINOR__ > 0)) -+# if defined(__GNUC__) && (((__GNUC__ == 3) && ( __GNUC_MINOR__ > 0)) || __GNUC__ >= 4) - using __gnu_cxx::hash_set; - # else - using std::hash_set; ---- mouse.h.old 2006-05-04 21:02:49.000000000 +0200 -+++ mouse.h 2006-05-04 21:03:37.000000000 +0200 -@@ -27,6 +27,8 @@ - #include "vgafile.h" - #include "glshape.h" - -+class Game_window; -+ - /* - * Handle custom mouse pointers. - */ ---- audio/midi_drivers/fmopldrv.h.old 2006-05-04 21:05:16.000000000 +0200 -+++ audio/midi_drivers/fmopldrv.h 2006-05-04 21:05:29.000000000 +0200 -@@ -76,7 +76,7 @@ - /* output a packed midi command to the midi stream - * valid only if mode is MO_SIMPLE - */ -- void OplDriver::send(uint32 b); -+ void send(uint32 b); - - /* retrieve a string representation of an error code */ - static const char *get_error_name(int error_code); diff --git a/games-engines/exult/files/exult-1.2-gcc43.patch b/games-engines/exult/files/exult-1.2-gcc43.patch deleted file mode 100644 index 7900b6c50575..000000000000 --- a/games-engines/exult/files/exult-1.2-gcc43.patch +++ /dev/null @@ -1,212 +0,0 @@ ---- actions.cc -+++ actions.cc -@@ -22,6 +22,8 @@ - # include <config.h> - #endif - -+#include <cstdlib> -+#include <cstring> - #include "gamewin.h" - #include "actions.h" - #include "actors.h" ---- args.cc -+++ args.cc -@@ -24,6 +24,7 @@ - # include <iostream> - #endif - -+#include <cstdlib> - #include "args.h" - - #ifndef UNDER_CE ---- audio/xmidi.cc -+++ audio/xmidi.cc -@@ -31,6 +31,7 @@ - # include <cmath> - #endif - #include <unistd.h> -+#include <cstdlib> - #include "../files/utils.h" - #include "xmidi.h" - #include "../conf/Configuration.h" ---- conf/Configuration.cc -+++ conf/Configuration.cc -@@ -32,6 +32,7 @@ - #include <stdio.h> - #include <iostream> - #include <fstream> -+#include <cstdlib> - #ifdef HAVE_SSTREAM - #include <sstream> - #endif ---- files/Flex.h -+++ files/Flex.h -@@ -24,6 +24,7 @@ - #include <vector> - #include <string> - #include <iosfwd> -+#include <cstring> - #include "common_types.h" - #include "U7file.h" - ---- files/IFF.h -+++ files/IFF.h -@@ -21,6 +21,7 @@ - - #include <vector> - #include <string> -+#include <cstring> - #include "common_types.h" - #include "U7file.h" - ---- files/listfiles.cc -+++ files/listfiles.cc -@@ -29,6 +29,7 @@ - #include <vector> - #include <string> - #include <iostream> -+#include <cstring> - - #ifndef UNDER_CE - using std::vector; ---- files/msgfile.cc -+++ files/msgfile.cc -@@ -24,6 +24,7 @@ - - #include <iostream> - #include <vector> -+#include <cstdlib> - #include "utils.h" - - using std::istream; ---- files/Table.cc -+++ files/Table.cc -@@ -26,6 +26,7 @@ - # include <cstdio> - #endif - #include <iostream> -+#include <cstdlib> - #include "exceptions.h" - #include "utils.h" - ---- files/U7file.cc -+++ files/U7file.cc -@@ -24,6 +24,7 @@ - # include <cstdio> - #endif - #include <iostream> -+#include <cstdlib> - - #include "U7file.h" - #include "Flex.h" ---- hash_utils.h -+++ hash_utils.h -@@ -19,6 +19,7 @@ - #ifndef _HASH_UTILS_H_ - #define _HASH_UTILS_H_ - -+#include <cstring> - #include "exult_types.h" - - #ifdef DONT_HAVE_HASH_MAP ---- imagewin/ibuf8.cc -+++ imagewin/ibuf8.cc -@@ -29,6 +29,8 @@ - # include <iostream> - #endif - -+#include <cstdlib> -+#include <cstring> - #include "exult_types.h" - #include "utils.h" - ---- objs/chunkter.cc -+++ objs/chunkter.cc -@@ -25,6 +25,7 @@ - #ifdef HAVE_CONFIG_H - # include <config.h> - #endif -+#include <cstring> - #include "chunkter.h" - #include "gamewin.h" - #ifdef INCL_OPENGL ---- party.cc -+++ party.cc -@@ -26,6 +26,7 @@ - - #include <iostream> - #include <string> -+#include <cstring> - #include "party.h" - #include "actors.h" - #include "gamewin.h" ---- server/objserial.cc -+++ server/objserial.cc -@@ -30,6 +30,7 @@ - #include "objserial.h" - #include "servemsg.h" - #include <iostream> -+#include <cstring> - - using std::cout; - using std::endl; ---- server/server.cc -+++ server/server.cc -@@ -45,6 +45,7 @@ - #endif - - #include <cstdio> -+#include <cstdlib> - - #ifdef _AIX - #include <strings.h> ---- shapes/shapeinf.cc -+++ shapes/shapeinf.cc -@@ -32,6 +32,7 @@ - - #include "utils.h" - #include <iomanip> /* Debugging */ -+#include <cstring> - using std::cout; - using std::endl; - ---- shapes/shapewrite.cc -+++ shapes/shapewrite.cc -@@ -24,6 +24,7 @@ - # include <config.h> - #endif - -+#include <cstring> - #include "shapevga.h" - #include "shapeinf.h" - #include "monstinf.h" ---- usecode/ucmachine.cc -+++ usecode/ucmachine.cc -@@ -23,6 +23,7 @@ - # include <config.h> - #endif - -+#include <cstring> - #include "ucmachine.h" - #include "keyring.h" - #include "conversation.h" ---- usecode/useval.cc -+++ usecode/useval.cc -@@ -32,6 +32,7 @@ - #include <cstdio> - #endif - -+#include <cstdlib> - #include "useval.h" - #include "utils.h" - ---- usecode/useval.h -+++ usecode/useval.h -@@ -24,6 +24,7 @@ - - #include <cassert> - #include <iostream> -+#include <cstdlib> - - #include <vector> // STL container - #include <deque> // STL container diff --git a/games-engines/exult/files/exult-1.2-gcc44.patch b/games-engines/exult/files/exult-1.2-gcc44.patch deleted file mode 100644 index 056feb25c6c7..000000000000 --- a/games-engines/exult/files/exult-1.2-gcc44.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- exult.cc -+++ exult.cc -@@ -350,7 +350,7 @@ - add_system_path("<DATA>", "data"); - if(!U7exists("<DATA>/exult.flx")) - { -- char *sep = std::strrchr(runpath,'/'); -+ const char *sep = std::strrchr(runpath,'/'); - if (!sep) sep = std::strrchr(runpath,'\\'); - int plen = sep-runpath; - char *dpath = new char[plen+10]; ---- files/utils.h -+++ files/utils.h -@@ -24,6 +24,7 @@ - - #include <iostream> - #include <string> -+#include <cstdio> - #ifndef ALPHA_LINUX_CXX - # include <iosfwd> - #endif diff --git a/games-engines/exult/files/exult-1.2-libpng14.patch b/games-engines/exult/files/exult-1.2-libpng14.patch deleted file mode 100644 index 7617ad6b9a8e..000000000000 --- a/games-engines/exult/files/exult-1.2-libpng14.patch +++ /dev/null @@ -1,22 +0,0 @@ -http://exult.svn.sourceforge.net/viewvc/exult/exult/trunk/shapes/pngio.cc?r1=3752&r2=5381 - ---- shapes/pngio.cc -+++ shapes/pngio.cc -@@ -89,7 +89,7 @@ - // Indicate we already read something. - png_set_sig_bytes(png, sizeof(sigbuf)); - png_read_info(png, info); // Read in image info. -- unsigned long w, h; -+ png_uint_32 w, h; - int depth, color, interlace; - png_get_IHDR(png, info, &w, &h, &depth, &color, - &interlace, 0, 0); -@@ -316,7 +316,7 @@ - // Indicate we already read something. - png_set_sig_bytes(png, sizeof(sigbuf)); - png_read_info(png, info); // Read in image info. -- unsigned long w, h; -+ png_uint_32 w, h; - int depth, color, interlace; - png_get_IHDR(png, info, &w, &h, &depth, &color, - &interlace, 0, 0); diff --git a/games-engines/exult/files/exult-1.2-libpng15.patch b/games-engines/exult/files/exult-1.2-libpng15.patch deleted file mode 100644 index 1577658ce6d6..000000000000 --- a/games-engines/exult/files/exult-1.2-libpng15.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- shapes/pngio.cc -+++ shapes/pngio.cc -@@ -79,7 +79,7 @@ - } - // Allocate info. structure. - png_infop info = png_create_info_struct(png); -- if (setjmp(png->jmpbuf)) // Handle errors. -+ if (setjmp(png_jmpbuf(png))) // Handle errors. - { - png_destroy_read_struct(&png, &info, 0); - fclose(fp); -@@ -208,7 +208,7 @@ - } - // Allocate info. structure. - png_infop info = png_create_info_struct(png); -- if (setjmp(png->jmpbuf)) // Handle errors. -+ if (setjmp(png_jmpbuf(png))) // Handle errors. - { - png_destroy_write_struct(&png, &info); - fclose(fp); -@@ -306,7 +306,7 @@ - } - // Allocate info. structure. - png_infop info = png_create_info_struct(png); -- if (setjmp(png->jmpbuf)) // Handle errors. -+ if (setjmp(png_jmpbuf(png))) // Handle errors. - { - png_destroy_read_struct(&png, &info, 0); - fclose(fp); diff --git a/games-engines/exult/files/exult-1.2-x11link.patch b/games-engines/exult/files/exult-1.2-x11link.patch deleted file mode 100644 index 5fbd3a6ab4ce..000000000000 --- a/games-engines/exult/files/exult-1.2-x11link.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.old 2006-10-08 12:38:54.000000000 +0200 -+++ configure.ac 2006-10-08 12:39:19.000000000 +0200 -@@ -49,6 +49,8 @@ - EXULT_DATADIR="$datadir/exult" - ARCH="" - -+AC_PATH_XTRA -+ - # determine windowing system from 'host' - AC_MSG_CHECKING("windowing system") - case "$host_os" in |