Fix building with libpng14 wrt #320113 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 35 insertions, 6 deletions

diff --git a/games-engines/exult/ChangeLog b/games-engines/exult/ChangeLog
index d77b814b2e33..8e30b1bdd684 100644
--- a/games-engines/exult/ChangeLog
+++ b/games-engines/exult/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-engines/exult
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.26 2010/03/18 18:55:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.27 2010/05/17 10:36:19 ssuominen Exp $
+
+  17 May 2010; Samuli Suominen <ssuominen@gentoo.org> exult-1.2.ebuild,
+  +files/exult-1.2-libpng14.patch:
+  Fix building with libpng14 wrt #320113 by Diego E. Pettenò.
 
   18 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org> exult-1.2.ebuild:
   fix desktop entry issues reported by desktop-file-validate
diff --git a/games-engines/exult/Manifest b/games-engines/exult/Manifest
index c77087d99330..db53ee64c2e6 100644
--- a/games-engines/exult/Manifest
+++ b/games-engines/exult/Manifest
@@ -2,12 +2,13 @@ AUX exult-1.2-64bits.patch 591 RMD160 8674319c38bb9f06975e52494e00f8a4b5c47a96 S
 AUX exult-1.2-gcc41.patch 1357 RMD160 c18a2bf589d106e265a543821502be55a9cdbe60 SHA1 7ad3d82641f1e3f355c7085cc3c7349e5687b008 SHA256 cee50e50c21e00d832552d659d08e4b985b84cbeb6ed07e32e0af8b71eee5c04
 AUX exult-1.2-gcc43.patch 3741 RMD160 b513b8e88f476b06aa2ecbbdd40d082996d8eb54 SHA1 e0542298b8136edf1666882804f3eee8bf3f27ff SHA256 4a4f224cd44c3250ac43ffaae1d0fae0a8a8a2d291ddcd9e4a053bceda36bf6a
 AUX exult-1.2-gcc44.patch 508 RMD160 7974d2f85a700c03f30943618f06bc68d4f8c087 SHA1 733a4f5be2b0db89191e130f73ebff0f35ddd4d8 SHA256 14148f3d74fb6e491bff4de7e8341e6c948765731f6c77b1ebdb98ac777953e4
+AUX exult-1.2-libpng14.patch 735 RMD160 ee989730f18baca4a66ebbdf9af337319e300a74 SHA1 37bbed12b3d7bd11ff781605fcc61ca787e5a828 SHA256 a2a2d6c97528d7cafa9cab4fe5e2aeadd92e9e1e35c6c6c26adbd8e641f6ca5c
 AUX exult-1.2-x11link.patch 286 RMD160 426eb039f9becfbcad6d87cacef4b489e423d45b SHA1 bc76419d4a86d88fa3f3f26da29ae0c03ef4757b SHA256 c0b971e64fb04e8ec91fea77b530755aa9c448d1421bca176f56b5561c2ab308
 DIST U7MusicOGG_1of2.zip 12614413 RMD160 2818c026664f6c8ef79201ea34a507091340fbb8 SHA1 50684766f3ca3eb33a777b752e904939a1470bd8 SHA256 ccf748b346345986b08355ae3bf21c72e3bfffe30ecf9f70fe10fdc8c573a503
 DIST U7MusicOGG_2of2.zip 11382878 RMD160 830a718674e1a2acf79ef131d30929c55fb91b44 SHA1 91250accd89bf931ce5fee6433ae988d55266a2f SHA256 58627a090f3f75cc4f5731053d5a2b02c6ba0edff1db0551bcd565d04089baaa
 DIST exult-1.2.tar.gz 1722259 RMD160 339231edf84507f05115ab3189875cb15be9c04f SHA1 81f9d3d428c80990b8e970a4dee5c85a7236dace SHA256 a6dd9d4e399281ed2db691ede21dbb79818ee11b08ef717e3eac255e290cf21a
 DIST jmsfx.zip 4778572 RMD160 6998abd6cf42e2011c71bb4c39f651b3ccd103c4 SHA1 933678416679b8fd42240f8fe38fa3474dd65267 SHA256 6932a70e999a203fb478edc6c009ad331709b9d1a760316244b82b60f93b41b2
 DIST jmsfxsi.zip 6194646 RMD160 3d1badcda304c12d738f49bc9f559465620248eb SHA1 a8d546b44c81c49f0560f97a2e43d55c6444fd6b SHA256 be842ae046453ff969bd68516638cf9b66fc0395013c0b0350688f9dcb0e7f42
-EBUILD exult-1.2.ebuild 2854 RMD160 17f7143dd7e558fcc37114b3497ecc89f04fcb75 SHA1 7a226c71686f110d67937a571129e9821a431826 SHA256 fe4f49f94f062d37ee99fb7379967d127db2eaaa6bd5d2d099e675f88f4b3744
-MISC ChangeLog 3402 RMD160 ec05e398d24824eaf2d0f585d4f8efc9f0fdb99a SHA1 a32e09e30d2e4a827db47d8d67ed76a0eb2ff620 SHA256 7d12bec6cf6471f9f196b5b7033b7207d1bc72595d76c493e530da92b9bc4188
+EBUILD exult-1.2.ebuild 2925 RMD160 f880bc1b36b443d752b9ac0d083f15b18771b476 SHA1 311b93b6084cc732a4ba5c755519740617fd3e45 SHA256 2ec1d7b4deb47f674bae94425ee78a7d5d95c4ba87c4c526378b7b88ee0038b1
+MISC ChangeLog 3573 RMD160 281855fdeba005930beda4dcc8ab1aa121eafd4e SHA1 1ec916773a2285d2d0f42020a0f7344fab4b7dde SHA256 f1d644462d791053073884b9fdcbaa34b4d870e1a16e67b20d791b0b9d8ebfb1
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-engines/exult/exult-1.2.ebuild b/games-engines/exult/exult-1.2.ebuild
index 3d9a7a66a3e6..a911761463a3 100644
--- a/games-engines/exult/exult-1.2.ebuild
+++ b/games-engines/exult/exult-1.2.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-engines/exult/exult-1.2.ebuild,v 1.21 2010/03/18 18:55:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.2.ebuild,v 1.22 2010/05/17 10:36:19 ssuominen Exp $
 
 EAPI=2
 inherit eutils autotools multilib games
@@ -18,7 +18,8 @@ SLOT="0"
 KEYWORDS="~amd64 ppc ~sparc x86"
 IUSE="timidity zlib"
 
-RDEPEND="media-libs/libsdl[audio,video,X]
+RDEPEND=">=media-libs/libpng-1.2.43-r2:0
+	media-libs/libsdl[audio,video,X]
 	media-libs/sdl-mixer[vorbis,timidity?]
 	timidity? ( >=media-sound/timidity++-2 )
 	zlib? ( sys-libs/zlib )"
@@ -46,7 +47,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-64bits.patch \
 		"${FILESDIR}"/${P}-x11link.patch \
 		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc44.patch
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-libpng14.patch
 	sed -i \
 		-e "s/u7siinstrics.data/u7siintrinsics.data/" \
 		usecode/ucxt/data/Makefile.am \
diff --git a/games-engines/exult/files/exult-1.2-libpng14.patch b/games-engines/exult/files/exult-1.2-libpng14.patch
new file mode 100644
index 000000000000..7617ad6b9a8e
--- /dev/null
+++ b/games-engines/exult/files/exult-1.2-libpng14.patch
@@ -0,0 +1,22 @@
+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);