Fix compile errors with recent SDL versions, bug #152628

Package-Manager: portage-2.1.2_pre3-r9

4 files changed, 54 insertions, 21 deletions

diff --git a/dev-games/kyra/ChangeLog b/dev-games/kyra/ChangeLog
index b5e0d16fed18..f1a1475a78ee 100644
--- a/dev-games/kyra/ChangeLog
+++ b/dev-games/kyra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/kyra
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/ChangeLog,v 1.9 2006/04/27 15:13:46 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/ChangeLog,v 1.10 2006/10/26 21:37:27 nyhm Exp $
+
+  26 Oct 2006; Tristan Heaven <nyhm@gentoo.org> +files/kyra-2.0.7-sdl.patch,
+  kyra-2.0.7.ebuild:
+  Fix compile errors with recent SDL versions, bug #152628
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org> files/digest-kyra-2.0.7,
   Manifest:
diff --git a/dev-games/kyra/Manifest b/dev-games/kyra/Manifest
index ef7ef50f0df9..0b45210be794 100644
--- a/dev-games/kyra/Manifest
+++ b/dev-games/kyra/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX kyra-2.0.7-gcc41.patch 1625 RMD160 427622ba0a08623ca6b59d497dc3cda65f746cce SHA1 4e7df5958c92e8100a618becb32f782c5e80efb1 SHA256 a6e6da8256d051632f1659e74ca3822ce2b457309e8fadcccb0b633eb51f4819 size 1625
+AUX kyra-2.0.7-gcc41.patch 1625 RMD160 427622ba0a08623ca6b59d497dc3cda65f746cce SHA1 4e7df5958c92e8100a618becb32f782c5e80efb1 SHA256 a6e6da8256d051632f1659e74ca3822ce2b457309e8fadcccb0b633eb51f4819
 MD5 d9f4cd9e141a4831512acbb225ccc1c3 files/kyra-2.0.7-gcc41.patch 1625
 RMD160 427622ba0a08623ca6b59d497dc3cda65f746cce files/kyra-2.0.7-gcc41.patch 1625
 SHA256 a6e6da8256d051632f1659e74ca3822ce2b457309e8fadcccb0b633eb51f4819 files/kyra-2.0.7-gcc41.patch 1625
-DIST kyra_src_2_0_7.tar.gz 1994743 RMD160 e9e78a67d452cdc5082da5e16113f4ccd910c70b SHA256 63502490ed5e0a0c1c7fb68410412ab498eb3b26898ec7ebdd328845bba114c6 size 1994743
-EBUILD kyra-2.0.7.ebuild 844 RMD160 0eaea0fd5d2081c7faaf13829986123d5bcdbf89 SHA1 56099cb9e4c4a9b621b8ae0b4d1cd6f7bb8d3440 SHA256 b4436a10ac65c4434483a1916cdc2af58a6176c39cf7a9c7bc15cadce580816f size 844
-MD5 90ac0b15becc91773fab8c224bd8c8ef kyra-2.0.7.ebuild 844
-RMD160 0eaea0fd5d2081c7faaf13829986123d5bcdbf89 kyra-2.0.7.ebuild 844
-SHA256 b4436a10ac65c4434483a1916cdc2af58a6176c39cf7a9c7bc15cadce580816f kyra-2.0.7.ebuild 844
-MISC ChangeLog 1134 RMD160 04ac7f2ee427a9e625ffc70d49179636dc173ed1 SHA1 ddbe7e2a9d873e9195ff5393ec909af8b58a3f35 SHA256 6592e34d3954d8e0c9fa235780337f793291f521d9f84154f1946e0398c6a6d7 size 1134
-MD5 e707060b14cf4e525cceeb96e587dbe4 ChangeLog 1134
-RMD160 04ac7f2ee427a9e625ffc70d49179636dc173ed1 ChangeLog 1134
-SHA256 6592e34d3954d8e0c9fa235780337f793291f521d9f84154f1946e0398c6a6d7 ChangeLog 1134
-MISC metadata.xml 2481 RMD160 09171f66958637e45994da3a50375877b59f9d62 SHA1 421d6b3e519d70201cf79da93d118f2e03061f0d SHA256 6e4d5c1d2524111ca002698be79bc8647a630602a0318ce3f66a8aa865194937 size 2481
+AUX kyra-2.0.7-sdl.patch 467 RMD160 b9735ca6ac0bfed805bb575ed2438849040e2c3a SHA1 73bc37d7f8bea10c0b30988b7a1a3b5fc7b0533c SHA256 c27531b9db4acaca978b0c474bf9ee88d0ea618ab6daa1b3b94b30c4781beca4
+MD5 142f627df94c637fc676d6aae5dcf8b7 files/kyra-2.0.7-sdl.patch 467
+RMD160 b9735ca6ac0bfed805bb575ed2438849040e2c3a files/kyra-2.0.7-sdl.patch 467
+SHA256 c27531b9db4acaca978b0c474bf9ee88d0ea618ab6daa1b3b94b30c4781beca4 files/kyra-2.0.7-sdl.patch 467
+DIST kyra_src_2_0_7.tar.gz 1994743 RMD160 e9e78a67d452cdc5082da5e16113f4ccd910c70b SHA1 09e02a072aa3db874593e65c0255842df3e379c4 SHA256 63502490ed5e0a0c1c7fb68410412ab498eb3b26898ec7ebdd328845bba114c6
+EBUILD kyra-2.0.7.ebuild 865 RMD160 ee4bff3b125fa4692b91197fb87e5ceef3e921e0 SHA1 055b76c4d95f3c9a215eee9b340132f1d5d1103b SHA256 0e2fd988dd32308528d36cb3da01bc7026891ead8f2abf98d16bbc71ec90ca5f
+MD5 1c39f2ab8d060956fcf7b6993e0aae7c kyra-2.0.7.ebuild 865
+RMD160 ee4bff3b125fa4692b91197fb87e5ceef3e921e0 kyra-2.0.7.ebuild 865
+SHA256 0e2fd988dd32308528d36cb3da01bc7026891ead8f2abf98d16bbc71ec90ca5f kyra-2.0.7.ebuild 865
+MISC ChangeLog 1290 RMD160 674b7156c51b76d6d3297aeb5fb483d9db99eb32 SHA1 9fa8a300a65a7a15e9dbe43438e1bd122d525199 SHA256 9a9f1fc60f18f256921549cc3e00ba9bb8358e4beb5a28edac14cd6d8bbb95cf
+MD5 78f8555daaf3b0be9b79400b448ee935 ChangeLog 1290
+RMD160 674b7156c51b76d6d3297aeb5fb483d9db99eb32 ChangeLog 1290
+SHA256 9a9f1fc60f18f256921549cc3e00ba9bb8358e4beb5a28edac14cd6d8bbb95cf ChangeLog 1290
+MISC metadata.xml 2481 RMD160 09171f66958637e45994da3a50375877b59f9d62 SHA1 421d6b3e519d70201cf79da93d118f2e03061f0d SHA256 6e4d5c1d2524111ca002698be79bc8647a630602a0318ce3f66a8aa865194937
 MD5 7b8663dd5b15e058787ffdb8010774d0 metadata.xml 2481
 RMD160 09171f66958637e45994da3a50375877b59f9d62 metadata.xml 2481
 SHA256 6e4d5c1d2524111ca002698be79bc8647a630602a0318ce3f66a8aa865194937 metadata.xml 2481
@@ -22,9 +26,9 @@ MD5 69cf3297aab17d058667ca95aab19915 files/digest-kyra-2.0.7 247
 RMD160 ae5de8b56f6293b3c932e7c895ed38698c717541 files/digest-kyra-2.0.7 247
 SHA256 ae8f646c097b02abb433322b4618c3b81dc6a6a62bd52226a4b16fe979d41699 files/digest-kyra-2.0.7 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEUN+wW78445TWHXcRAod/AJ9Atq29Sq49IKlbHxcjd3NzAgSXQwCeKZcM
-6nuytm4FOW7ZETvv7cex+to=
-=HuX/
+iD8DBQFFQSqddz7hIScOURERAj6PAKC1vIHMQQN3mnYOiblfTtQxB3viNwCgvA6/
+G/s96+aNww0H1SrUr0ecb8g=
+=/ajh
 -----END PGP SIGNATURE-----
diff --git a/dev-games/kyra/files/kyra-2.0.7-sdl.patch b/dev-games/kyra/files/kyra-2.0.7-sdl.patch
new file mode 100644
index 000000000000..28139e1b1fa5
--- /dev/null
+++ b/dev-games/kyra/files/kyra-2.0.7-sdl.patch
@@ -0,0 +1,23 @@
+--- engine/namefield.h
++++ engine/namefield.h
+@@ -31,6 +31,7 @@
+ #include "../util/gltypes.h"
+ #include "../util/gllist.h"
+ #include "SDL_endian.h"
++#include "SDL_rwops.h"
+ 
+ 
+ 
+--- util/gltypes.h
++++ util/gltypes.h
+@@ -40,8 +40,8 @@
+ 	typedef Sint32			S32;
+ 
+ 	#ifdef SDL_HAS_64BIT_TYPE
+-		typedef SDL_HAS_64BIT_TYPE				S64;
+-		typedef unsigned SDL_HAS_64BIT_TYPE		U64;
++		typedef Sint64			S64;
++		typedef Uint64			U64;
+ 	#else
+ 		#error No 64-bit integer.
+ 	#endif
diff --git a/dev-games/kyra/kyra-2.0.7.ebuild b/dev-games/kyra/kyra-2.0.7.ebuild
index 16545b0437ec..3c992c711a51 100644
--- a/dev-games/kyra/kyra-2.0.7.ebuild
+++ b/dev-games/kyra/kyra-2.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/kyra-2.0.7.ebuild,v 1.11 2006/04/04 17:56:38 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/kyra-2.0.7.ebuild,v 1.12 2006/10/26 21:37:27 nyhm Exp $
 
 inherit eutils
 
@@ -13,16 +13,18 @@ SLOT="0"
 KEYWORDS="~amd64 ppc sparc x86"
 IUSE="doc opengl"
 
-DEPEND=">=media-libs/libsdl-1.2
-	>=media-libs/sdl-image-1.2
+DEPEND="media-libs/libsdl
+	media-libs/sdl-image
 	opengl? ( virtual/opengl )"
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}"-gcc41.patch
+	epatch \
+		"${FILESDIR}/${P}"-gcc41.patch \
+		"${FILESDIR}"/${P}-sdl.patch
 }
 
 src_compile() {