avoid compile breakage with newer sdl-gfx (bug #324483)

Package-Manager: portage-2.1.8.3/cvs/Linux i686

5 files changed, 34 insertions, 27 deletions

diff --git a/games-rpg/freedroidrpg/ChangeLog b/games-rpg/freedroidrpg/ChangeLog
index 3ad5410a714d..489c4c3c0519 100644
--- a/games-rpg/freedroidrpg/ChangeLog
+++ b/games-rpg/freedroidrpg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-rpg/freedroidrpg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/ChangeLog,v 1.26 2010/04/19 07:19:26 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/ChangeLog,v 1.27 2010/07/12 21:40:55 mr_bones_ Exp $
+
+  12 Jul 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  freedroidrpg-0.13.ebuild, +files/freedroidrpg-0.13-sdl-gfx.patch,
+  files/freedroidrpg-0.13-syslibs.patch:
+  avoid compile breakage with newer sdl-gfx (bug #324483)
 
   19 Apr 2010; Tupone Alfredo <tupone@gentoo.org> freedroidrpg-0.13.ebuild:
   Force python2 version. Fix bug #312275 by arfrever@gentoo.org
diff --git a/games-rpg/freedroidrpg/Manifest b/games-rpg/freedroidrpg/Manifest
index 99910ca48f36..28423e29f367 100644
--- a/games-rpg/freedroidrpg/Manifest
+++ b/games-rpg/freedroidrpg/Manifest
@@ -1,5 +1,6 @@
-AUX freedroidrpg-0.13-syslibs.patch 3479 RMD160 42553640361efa864cef3ff93bb1360361df3f89 SHA1 b4758b9b1b08f697a7de9f5b8017e2172ae689e3 SHA256 cb867535e59eca44dcc4bf5b117634092214ab3a0b246ad6494c584f573b052c
+AUX freedroidrpg-0.13-sdl-gfx.patch 514 RMD160 4650aaa0e99762441734ca574ab1465a3639dbc2 SHA1 77cc40c6c16b98201acb22801ea6f52e58956526 SHA256 8dc6ec61f0501f1f799b7f5837da88637e146928bfa4de8edcde6974a7e62c0e
+AUX freedroidrpg-0.13-syslibs.patch 2965 RMD160 b1a3cba9e52e3493f5cc292bd524595fe4e7d3a4 SHA1 8f442500b67c7ae0c012a86322e5b6600117dc0f SHA256 e19e7804a2ef3abfab2ec1207c7cc467a4d77accca52884c872dc0e457ecba76
 DIST freedroidrpg-0.13.tar.bz2 137389662 RMD160 dfd5d60fb173ba6a9107894b2ba4a6f0d5868116 SHA1 6c58cc88c503a3050ef940158f5e338f70899533 SHA256 e4ed0ba187c0c74ec353345825bbf520bdc6d4d173a66ed6dba6e8e1683ffb8a
-EBUILD freedroidrpg-0.13.ebuild 1513 RMD160 10d4a949981dd6409a32f0c7c2feace10ace5292 SHA1 27ef24e9398122b377ad29c8696830bc4e6ec8e3 SHA256 081a53e7c3d1a5eb9f822343e833e3c333d267873f5f1b202459489f051b67a3
-MISC ChangeLog 3558 RMD160 25aafbd09d7ffcf47f33d5f9635ca78457103380 SHA1 070ae9d8bb41c7abc1d7cf56f4817d4c4b9cc21b SHA256 339552d1a2ff09f537dd2ca24d167b03bb974f4493a69d4ba8653e13e078ce4a
+EBUILD freedroidrpg-0.13.ebuild 1609 RMD160 2532c5917c294a7f38078eb4c0579b9fd24011e9 SHA1 fd74557a95de11c163593a30ca4e80cb5e554b25 SHA256 103fddeb544709dac1fb8a1c6cd5d59168fe3489c47aed1d3363b1753cc7d5ec
+MISC ChangeLog 3784 RMD160 48918290e5d0827306bef0d106dbfc58cda67b00 SHA1 8b2ae1b65890f9fe77ec9ba6f4b04a969ef5b648 SHA256 82e642f482f224b036eac54cee2bfa4aad7248b54c283175375cafca41d1d013
 MISC metadata.xml 2102 RMD160 b4460164b2f9e4bc4cc206fcb7a688afa6f127b7 SHA1 aaa79dbac1d09bda7e33de3cdaaf749ce2c1f0ad SHA256 d06c8ed4ae0f0763859351dfebfad1b41e3d054261fa555ba26e67be0f7b60f1
diff --git a/games-rpg/freedroidrpg/files/freedroidrpg-0.13-sdl-gfx.patch b/games-rpg/freedroidrpg/files/freedroidrpg-0.13-sdl-gfx.patch
new file mode 100644
index 000000000000..20031dbb7d70
--- /dev/null
+++ b/games-rpg/freedroidrpg/files/freedroidrpg-0.13-sdl-gfx.patch
@@ -0,0 +1,21 @@
+diff -ru freedroidrpg-0.13.orig/src/struct.h freedroidrpg-0.13/src/struct.h
+--- freedroidrpg-0.13.orig/src/struct.h	2010-01-21 07:31:29.000000000 -0500
++++ freedroidrpg-0.13/src/struct.h	2010-01-25 11:35:34.764604580 -0500
+@@ -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.
diff --git a/games-rpg/freedroidrpg/files/freedroidrpg-0.13-syslibs.patch b/games-rpg/freedroidrpg/files/freedroidrpg-0.13-syslibs.patch
index 0e0209d78d6e..3064d0a68e5a 100644
--- a/games-rpg/freedroidrpg/files/freedroidrpg-0.13-syslibs.patch
+++ b/games-rpg/freedroidrpg/files/freedroidrpg-0.13-syslibs.patch
@@ -68,27 +68,6 @@ diff -ru freedroidrpg-0.13.orig/src/lua.c freedroidrpg-0.13/src/lua.c
  
  /* Our Lua state for event execution */
  lua_State *global_lua_state;
-diff -ru freedroidrpg-0.13.orig/src/struct.h freedroidrpg-0.13/src/struct.h
---- freedroidrpg-0.13.orig/src/struct.h	2010-01-21 07:31:29.000000000 -0500
-+++ freedroidrpg-0.13/src/struct.h	2010-01-25 11:35:34.764604580 -0500
-@@ -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.
 diff -ru freedroidrpg-0.13.orig/src/system.h freedroidrpg-0.13/src/system.h
 --- freedroidrpg-0.13.orig/src/system.h	2010-01-21 07:31:29.000000000 -0500
 +++ freedroidrpg-0.13/src/system.h	2010-01-25 11:35:53.944486530 -0500
diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.13.ebuild b/games-rpg/freedroidrpg/freedroidrpg-0.13.ebuild
index 2a909cbfdc29..a424dc9dfca2 100644
--- a/games-rpg/freedroidrpg/freedroidrpg-0.13.ebuild
+++ b/games-rpg/freedroidrpg/freedroidrpg-0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/freedroidrpg-0.13.ebuild,v 1.4 2010/04/19 07:19:26 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/freedroidrpg-0.13.ebuild,v 1.5 2010/07/12 21:40:55 mr_bones_ Exp $
 
 EAPI=2
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE="opengl"
 
-RDEPEND="media-libs/libsdl[video]
+RDEPEND="media-libs/libsdl[opengl?,video]
 	dev-lang/lua
 	media-libs/jpeg
 	media-libs/libpng
@@ -39,6 +39,7 @@ pkg_setup() {
 src_prepare() {
 	rm -rf lua src/SDL_rotozoom*
 	epatch "${FILESDIR}"/${P}-syslibs.patch
+	has_version '<media-libs/sdl-gfx-2.0.21' && epatch "${FILESDIR}"/${P}-sdl-gfx.patch
 
 	python_convert_shebangs -r 2 .