diff options
Diffstat (limited to 'games-rpg/eternal-lands')
4 files changed, 130 insertions, 22 deletions
diff --git a/games-rpg/eternal-lands/ChangeLog b/games-rpg/eternal-lands/ChangeLog index 3b284496d14e..bb93e415a171 100644 --- a/games-rpg/eternal-lands/ChangeLog +++ b/games-rpg/eternal-lands/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-rpg/eternal-lands # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.65 2012/06/24 16:17:30 rich0 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.66 2012/12/02 23:23:43 rich0 Exp $ + + 02 Dec 2012; Richard Freeman <rich0@gentoo.org> + eternal-lands-1.9.3-r2.ebuild, +files/eternal-lands-1.9.3-glbuild.patch, + +files/eternal-lands-1.9.3-minizip.patch: + Fixes for bugs 445658, 423327 - unbundle minizip and fix build issue. 24 Jun 2012; Richard Freeman <rich0@gentoo.org> eternal-lands-1.9.3-r2.ebuild: diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild index bf01d588d83c..fc8ee94e4301 100644 --- a/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild +++ b/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild,v 1.2 2012/06/24 16:17:30 rich0 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild,v 1.3 2012/12/02 23:23:44 rich0 Exp $ EAPI=4 inherit eutils flag-o-matic gnome2-utils games @@ -15,26 +15,27 @@ SLOT="0" KEYWORDS="~amd64 ~x86 ~x86-fbsd" IUSE="debug doc kernel_linux" -RDEPEND="x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - virtual/opengl - virtual/glu - media-libs/libsdl[X] - media-libs/sdl-net - media-libs/sdl-image - media-libs/openal +RDEPEND="dev-libs/libxml2 + media-libs/cal3d[-16bit-indices] media-libs/freealut + media-libs/libpng:0 + media-libs/libsdl[X] media-libs/libvorbis - dev-libs/libxml2 - media-libs/cal3d[-16bit-indices] - media-libs/libpng - >=games-rpg/eternal-lands-data-1.9.3" - + media-libs/openal + media-libs/sdl-image + media-libs/sdl-net + >=games-rpg/eternal-lands-data-1.9.3 + sys-libs/zlib[minizip] + virtual/glu + virtual/opengl + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext" DEPEND="${RDEPEND} >=app-admin/eselect-opengl-1.0.6-r1 app-arch/unzip + virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz )" @@ -53,18 +54,20 @@ src_prepare() { sed -i -e '/#server_address =/ s/.*/#server_address = game.eternal-lands.com/' \ el.ini || die "sed failed" - epatch "${FILESDIR}/${PN}-1.9.2-glext.patch" + epatch "${FILESDIR}/${PN}-1.9.3-glbuild.patch" epatch "${FILESDIR}/${PN}-1.9.3-build.patch" + epatch "${FILESDIR}/${PN}-1.9.3-minizip.patch" - cp Makefile.linux Makefile + # remove bundled minizip + rm io/{crypt,ioapi,unzip,zip}.h || die + rm io/{ioapi,unzip,zip}.c || die - # Fix for Gentoo zlib OF redefine - sed -i '1i#define OF(x) x' `find -name "*.c"` || die "sed failed" + cp Makefile.linux Makefile } src_compile() { emake \ - DEBUG="$(usex debug "yes" "no")" \ + DEBUG="$(usex debug)" \ BSD_KERNEL="$(usex !kernel_linux)" \ DATADIR="${GAMES_DATADIR}/${PN}/" diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-glbuild.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-glbuild.patch new file mode 100644 index 000000000000..972abd9b0d2b --- /dev/null +++ b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-glbuild.patch @@ -0,0 +1,25 @@ +--- gl_init.c 2012-02-13 22:01:54.000000000 -0500 ++++ gl_init.c 2012-12-02 18:09:41.274014922 -0500 +@@ -27,6 +27,8 @@ + #include "fsaa/fsaa.h" + #endif /* FSAA */ + ++#define APIENTRY ++ + Uint32 flags; + + int window_width=640; +--- platform.h 2012-02-13 22:01:54.000000000 -0500 ++++ platform.h 2012-12-02 17:32:46.017627957 -0500 +@@ -87,9 +87,10 @@ + #define APIENTRYP * + #elif !defined(BSD) + #define GL_GLEXT_LEGACY ++ #include <GL/glew.h> + #include <GL/gl.h> + #include <GL/glu.h> +- #include "glext.h" ++ #include <GL/glext.h> + #else // BSD + #include <GL/gl.h> + #include <GL/glu.h> diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-minizip.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-minizip.patch new file mode 100644 index 000000000000..9edb22254502 --- /dev/null +++ b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-minizip.patch @@ -0,0 +1,75 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Sun Jun 24 16:33:08 UTC 2012 +Subject: unbundle minizip + +https://bugs.gentoo.org/show_bug.cgi?id=423327 +applied on top of eternal-lands-1.9.3-build.patch + +--- elc/new_update.c ++++ elc/new_update.c +@@ -5,8 +5,8 @@ + #include <string.h> + #include "md5.h" + #include "elc_private.h" +-#include "io/zip.h" +-#include "io/unzip.h" ++#include <zip.h> ++#include <unzip.h> + #include "io/ziputil.h" + #include "io/fileutil.h" + #include "io/elfilewrapper.h" +--- elc/io/ziputil.h ++++ elc/io/ziputil.h +@@ -8,8 +8,8 @@ + + #include <SDL.h> + #include "../md5.h" +-#include "zip.h" +-#include "unzip.h" ++#include <zip.h> ++#include <unzip.h> + + #ifdef __cplusplus + extern "C" +--- elc/io/elfilewrapper.c ++++ elc/io/elfilewrapper.c +@@ -1,5 +1,5 @@ + #include "elfilewrapper.h" +-#include "unzip.h" ++#include <unzip.h> + #include "elpathwrapper.h" + #include "fileutil.h" + #include <sys/stat.h> +--- elc/Makefile.linux ++++ elc/Makefile.linux +@@ -25,11 +25,13 @@ + + CFLAGS += $(shell sdl-config --cflags) \ + $(shell xml2-config --cflags) \ ++ $(shell pkg-config --cflags minizip) \ + -fno-strict-aliasing \ + $(EXTRA_INCLUDES) + + CXXFLAGS += $(shell sdl-config --cflags) \ + $(shell xml2-config --cflags) \ ++ $(shell pkg-config --cflags minizip) \ + -fno-strict-aliasing \ + $(EXTRA_INCLUDES) + +@@ -47,6 +49,7 @@ + $(shell pkg-config --libs vorbis) \ + $(shell pkg-config --libs vorbisfile) \ + $(shell pkg-config --libs zlib) \ ++ $(shell pkg-config --libs minizip) \ + -lm \ + $(EXTRA_LIBS) \ + $(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_LIBS)) \ +@@ -80,7 +83,7 @@ + gamewin.o gl_init.o hud.o help.o highlight.o \ + ignore.o init.o interface.o items.o io/fileutil.o \ + io/e3d_io.o io/elc_io.o io/map_io.o io/elpathwrapper.o io/xmlcallbacks.o \ +- io/half.o io/normal.o io/elfilewrapper.o io/unzip.o io/ioapi.o io/zip.o io/ziputil.o \ ++ io/half.o io/normal.o io/elfilewrapper.o io/ziputil.o \ + keys.o knowledge.o langselwin.o lights.o list.o load_gl_extensions.o loginwin.o loading_win.o \ + main.o manufacture.o map.o mapwin.o memory.o \ + md5.o mines.o minimap.o misc.o missiles.o multiplayer.o \ |