Use system lua and sdl-gfx instead of the bundled versions, bug #252469

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 174 insertions, 2 deletions

diff --git a/games-rpg/freedroidrpg/ChangeLog b/games-rpg/freedroidrpg/ChangeLog
index 04d358b75284..026318f54127 100644
--- a/games-rpg/freedroidrpg/ChangeLog
+++ b/games-rpg/freedroidrpg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-rpg/freedroidrpg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/ChangeLog,v 1.19 2009/04/24 23:29:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/ChangeLog,v 1.20 2009/05/27 12:07:55 nyhm Exp $
+
+*freedroidrpg-0.12.1-r1 (27 May 2009)
+
+  27 May 2009; Tristan Heaven <nyhm@gentoo.org>
+  +freedroidrpg-0.12.1-r1.ebuild, +files/freedroidrpg-0.12.1-syslibs.patch:
+  Use system lua and sdl-gfx instead of the bundled versions, bug #252469
 
 *freedroidrpg-0.12.1 (24 Apr 2009)
 
diff --git a/games-rpg/freedroidrpg/Manifest b/games-rpg/freedroidrpg/Manifest
index 0d672e0dddcf..61eda285b1e6 100644
--- a/games-rpg/freedroidrpg/Manifest
+++ b/games-rpg/freedroidrpg/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX freedroidrpg-0.12.1-syslibs.patch 2622 RMD160 ed90c39ef194dbf2f917c374d45c44da30aa9a10 SHA1 2f2d60a2b9aafa09aedbdeb142b4182ca8abf469 SHA256 382ec25b45911bb4813da1946452552dae26460829e4f5fdce8d79c69d30b17d
 DIST freedroidrpg-0.11.1.tar.bz2 127203731 RMD160 99c73526632cbf4f5873b0b21933e9aa3671b098 SHA1 aaaf2b5a5d4b8957cc2779ab355005d5673b9c43 SHA256 c9c922d4e3eeb972c65fd7f85caf88dca9b04ecacbe904df669ec8fe4d851100
 DIST freedroidrpg-0.12.1.tar.bz2 131651496 RMD160 8307c840e43059849c0abe372bee904be0c7b36a SHA1 5081b9351a62ef1506c8cb1f72d1dfc730d94669 SHA256 e06149e3c90fd815b3a7fd677ebf25e550418f935699503a1c461cadcd93a073
 EBUILD freedroidrpg-0.11.1.ebuild 1203 RMD160 fc66bdc189ace7b6dc621e7434d6b49ffde73500 SHA1 af5dfcbcb0cf18f2fdc199455f749f7ee78b7731 SHA256 e2f00df427109b1d3a5cb09a5e83fa955bb0b27c0eda163cec2a41fd35ebd2d1
+EBUILD freedroidrpg-0.12.1-r1.ebuild 1390 RMD160 4e625aaa69a981ab40ef7eedc39e87f852c54cc8 SHA1 5e76c289c16269b9d4ec55d5130b870b6c400749 SHA256 7cb603ee1271d155738e93fbed4928ced38fbd463bded858d407f03937de6c08
 EBUILD freedroidrpg-0.12.1.ebuild 1497 RMD160 55ae516be6d9bf4b3415d72764a4176bdf1a5fdb SHA1 6a7e3b6f18b9b9880ab0c08a138bb0f6a101d885 SHA256 2d1873bd3c8660d44576e59af984bcbbc894b8e1e2e3fe8dc1a52bce33afc867
-MISC ChangeLog 2591 RMD160 cc6d25d6b94951459bc69bff5fa2b23eb933a676 SHA1 99a19d713af9f86f2a5d4ee076979f61705ef559 SHA256 273a118aae9e16bfe52d8414a922ad8292e6e61ceb9cf80a981dac44dd636729
+MISC ChangeLog 2824 RMD160 cba53f6c73fb2a1e1a30ec1927ac9ff0a8e28b5b SHA1 005c65151c507ceca415680fc83e094cc51fe6fe SHA256 dfc1b860b7fdd58acdbaef341fd642ad31ec64a167cad48cc78f741ef71405d1
 MISC metadata.xml 2102 RMD160 b4460164b2f9e4bc4cc206fcb7a688afa6f127b7 SHA1 aaa79dbac1d09bda7e33de3cdaaf749ce2c1f0ad SHA256 d06c8ed4ae0f0763859351dfebfad1b41e3d054261fa555ba26e67be0f7b60f1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkodLScACgkQdz7hIScOURFv2QCgyLcj6oG8zT+eVsAX0t59MrvL
+AHMAnRptFWS4qBJKluZMtXSvZUb0IRp/
+=TBT+
+-----END PGP SIGNATURE-----
diff --git a/games-rpg/freedroidrpg/files/freedroidrpg-0.12.1-syslibs.patch b/games-rpg/freedroidrpg/files/freedroidrpg-0.12.1-syslibs.patch
new file mode 100644
index 000000000000..4bd8e8c049e9
--- /dev/null
+++ b/games-rpg/freedroidrpg/files/freedroidrpg-0.12.1-syslibs.patch
@@ -0,0 +1,99 @@
+--- configure.ac
++++ configure.ac
+@@ -111,6 +111,14 @@
+ 	AC_MSG_ERROR([SDL_image library needed for FreedroidRPG!
+ see http://www.libsdl.org/]))
+ 
++AC_CHECK_LIB([SDL_gfx], [rotozoomSurface],,
++	AC_MSG_ERROR([SDL_gfx library needed to run FreedroidRPG
++see http://www.ferzkopp.net/Software/SDL_gfx-2.0/]))
++
++AC_CHECK_LIB([lua], [luaL_openlibs],,
++	AC_MSG_ERROR([lua library needed to run FreedroidRPG
++see http://www.lua.org/]))
++
+ AC_MSG_NOTICE([[Checking for optional SDL libraries:]])
+ AC_CHECK_LIB([SDL_mixer], [Mix_ChannelFinished],, AC_MSG_WARN([
+ --------------------------------------------------
+--- src/lua.c
++++ src/lua.c
+@@ -37,9 +37,9 @@
+ #include "lvledit/lvledit_actions.h"
+ #include "lvledit/lvledit_map.h"
+ 
+-#include "../lua/lua.h"
+-#include "../lua/lauxlib.h"
+-#include "../lua/lualib.h"
++#include <lua.h>
++#include <lauxlib.h>
++#include <lualib.h>
+ 
+ 
+ /* Our Lua state for event execution */
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -1,9 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-freedroidRPG_LDADD = ../lua/liblua.a
+-
+ if WIN32
+-freedroidRPG_LDADD += ../win32/freedroidRPG.coff
++freedroidRPG_LDADD = ../win32/freedroidRPG.coff
+ endif
+ 
+ bin_PROGRAMS = freedroidRPG
+@@ -18,7 +16,7 @@
+ 	enemy.c input.c keyboard.c main.c hud.c view.c automap.c BFont.c \
+ 	defs.h map.h vars.h takeover.h global.h \
+ 	proto.h struct.h system.h BFont.h \
+-	SDL_rotozoom.c SDL_rotozoom.h open_gl.c open_gl_atlas.c mission.c chat.c light.c \
++	open_gl.c open_gl_atlas.c mission.c chat.c light.c \
+ 	getopt.c getopt1.c getopt.h scandir.c scandir.h sound.h sound_effects.c \
+ 	lang.h lists.c lists.h gen_savestruct.py savestruct.c savestruct.h pathfinder.c \
+ 	lvledit/lvledit.c lvledit/lvledit.h \
+@@ -41,13 +39,4 @@
+ 	lvledit/lvledit_widgets.c lvledit/lvledit_widgets.h
+ 
+ savestruct.c savestruct.h: struct.h
+-	python2.5 gen_savestruct.py struct.h savestruct
+-
+-clean-local:
+-	cd ../lua; make clean
+-
+-../lua/liblua.a: 
+-	cd ../lua; make CC=${CC} AR="${AR} rcu" liblua.a
+-if WIN32
+-	i686-pc-mingw32-ranlib ../lua/liblua.a
+-endif
++	python gen_savestruct.py struct.h savestruct
+--- src/struct.h
++++ src/struct.h
+@@ -30,16 +30,7 @@
+ #include "system.h"
+ #include "defs.h"
+ 
+-typedef struct tColorRGBA {
+-    Uint8 r;
+-    Uint8 g;
+-    Uint8 b;
+-    Uint8 a;
+-} tColorRGBA, myColor;
+-
+-typedef struct tColorY {
+-    Uint8 y;
+-} tColorY;
++typedef tColorRGBA myColor;
+ 
+ /**
+  * Simple doubly linked list implementation.
+--- src/system.h
++++ src/system.h
+@@ -112,6 +112,7 @@
+ 
+ #include "SDL.h"
+ #include "SDL_image.h"
++#include "SDL_rotozoom.h"
+ 
+ #ifdef HAVE_LIBSDL_MIXER
+ #include "SDL_mixer.h"
diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.12.1-r1.ebuild b/games-rpg/freedroidrpg/freedroidrpg-0.12.1-r1.ebuild
new file mode 100644
index 000000000000..3840be6f2836
--- /dev/null
+++ b/games-rpg/freedroidrpg/freedroidrpg-0.12.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/freedroidrpg-0.12.1-r1.ebuild,v 1.1 2009/05/27 12:07:55 nyhm Exp $
+
+EAPI=2
+inherit autotools eutils games
+
+DESCRIPTION="A modification of the classical Freedroid engine into an RPG"
+HOMEPAGE="http://freedroid.sourceforge.net/"
+SRC_URI="mirror://sourceforge/freedroid/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="opengl"
+
+RDEPEND="media-libs/libsdl
+	dev-lang/lua
+	media-libs/jpeg
+	media-libs/libpng
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-net
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-gfx
+	media-libs/libogg
+	media-libs/libvorbis
+	x11-libs/libX11
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	dev-lang/python"
+
+src_prepare() {
+	rm -rf lua src/SDL_rotozoom*
+	epatch "${FILESDIR}"/${P}-syslibs.patch
+
+	# No need for executable game resources
+	find sound graphics -type f -exec chmod -c a-x '{}' +
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf \
+		--disable-dependency-tracking \
+		--disable-fastmath \
+		$(use_enable opengl)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	rm -f "${D}/${GAMES_BINDIR}/"{croppy,pngtoico,gluem}
+	newicon win32/w32icon2_64x64.png ${PN}.png
+	make_desktop_entry freedroidRPG "Freedroid RPG"
+	prepgamesdirs
+}