Fix building with libpng14 wrt #308867 by Locke Shinseiko.

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

4 files changed, 52 insertions, 7 deletions

diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index ed5d45c6e99a..d11e0d9e4213 100644
--- a/games-strategy/scorched3d/ChangeLog
+++ b/games-strategy/scorched3d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/scorched3d
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.66 2009/12/22 04:22:38 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.67 2010/03/10 20:19:11 ssuominen Exp $
+
+  10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  scorched3d-42.1.ebuild, +files/scorched3d-42.1-libpng14.patch:
+  Fix building with libpng14 wrt #308867 by Locke Shinseiko.
 
   22 Dec 2009; Michael Sterrett <mr_bones_@gentoo.org>
   +files/scorched3d-42.1-win32.patch:
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
index d566dbd185b6..11836dfb75d7 100644
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@@ -1,8 +1,9 @@
 AUX scorched3d-42.1-fixups.patch 1967 RMD160 d06d0c20c5e65907a680ba39ebbbc57ee14a25cb SHA1 d13d821bca8c342bf04d5de0f5925649890c18c4 SHA256 7487d6708bfe250925cd7b425e200e5f566920c4fbb0376e3a5922bd60828934
 AUX scorched3d-42.1-gcc43.patch 875 RMD160 b52c37c3210c5ea0629f5f00283a4a63fa5c3561 SHA1 6be351b7b56206d8540c0938e06759cc6ee0c0e2 SHA256 f139415a4deca70dc0ad087ce6714359d4076df89228e7ea1e61aa100e0558c8
+AUX scorched3d-42.1-libpng14.patch 1381 RMD160 3f167ed7f5438f86cd338247e445fcb52e86542e SHA1 00bf971ef71f082cff58462b8d0a71a533f9068a SHA256 7b259663f640c19189cc5b845bb4cf27389cc56cb1c9f55300e14ff3738e1846
 AUX scorched3d-42.1-odbc.patch 665 RMD160 00d9966808a9b61a45223cce0ba50116774f243e SHA1 71b0f9308e743dd1630977467c12b3caf89bb446 SHA256 27e8af602e38579f87b83bc67afc7c3fde012e058f73dab7b5e63f22752bb1be
 AUX scorched3d-42.1-win32.patch 625 RMD160 6170762627bb1094479eece1e07591e6e9703abf SHA1 9622d3d756999780da4385bd48a2cd12290d7aab SHA256 50c8cadae0476071f580983f8287e95ac15c45e865e4837b567493a97fcd4c5f
 DIST Scorched3D-42.1-src.tar.gz 64491145 RMD160 ed8a621875d19eb4d7314293439f4c2a0b5a5276 SHA1 041e3b3dd47a7881738eb5d66885d7f339eb01ce SHA256 884eccfed5fda58c140c4a593806c0c366a695660c47cdd4ea8d96189189106e
-EBUILD scorched3d-42.1.ebuild 1519 RMD160 288ec09b2b3406d110e24233b095bc95ef5af948 SHA1 6c925fcffb319c074cba23ce9f97ab3ca6288dad SHA256 fca681abb4bd7c5e9fa30bf1961ce67daa1671b5e1c9766ec3314f4b4d17a4ca
-MISC ChangeLog 9271 RMD160 49c9be0bbbaabedfc38dd2a1bd29368fc7a69f90 SHA1 5941dfca9b62cb73f787d80d9888f249d3ae4398 SHA256 59297e2004c80d80e200efccd86aafcadee488de1568fac1ed32b9059d406ad2
+EBUILD scorched3d-42.1.ebuild 1523 RMD160 dfd44428061a03bea6ce65443d8b09917d572fc8 SHA1 dbaec2007aa3f673ee9f407697ce46b10070dd48 SHA256 391ae1dd9998a3e24a8fd31cc40463099ae27d570cf3c7b8609b968a49c944e8
+MISC ChangeLog 9452 RMD160 e0aa51dce69ce960bee3490863ef9a508ab0cc68 SHA1 4f91446247209ce797b6eeaf535c768cbc0569dd SHA256 c4043ad3404f07b13ddae134f012e9f28e7a87c114c2a57dba26a776446a1bde
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-strategy/scorched3d/files/scorched3d-42.1-libpng14.patch b/games-strategy/scorched3d/files/scorched3d-42.1-libpng14.patch
new file mode 100644
index 000000000000..d61a2b6ac485
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-42.1-libpng14.patch
@@ -0,0 +1,40 @@
+http://bugs.gentoo.org/show_bug.cgi?id=308867
+
+--- src/common/image/ImagePng.cpp
++++ src/common/image/ImagePng.cpp
+@@ -189,7 +189,7 @@ bool ImagePng::loadFromBuffer(NetBuffer
+ 	info_ptr = png_create_info_struct(png_ptr);

+ 	if (info_ptr == NULL)

+ 	{

+-	  png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);

++	  png_destroy_read_struct(&png_ptr, NULL, NULL);

+ 	  return false;

+ 	}

+ 

+@@ -200,7 +200,7 @@ bool ImagePng::loadFromBuffer(NetBuffer
+ 	if (setjmp(png_jmpbuf(png_ptr)))

+ 	{

+ 	  /* Free all of the memory associated with the png_ptr and info_ptr */

+-	  png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);

++	  png_destroy_read_struct(&png_ptr, &info_ptr, NULL);

+ 	  /* If we get here, we had a problem reading the file */

+ 	  return false;

+ 	}

+@@ -258,7 +258,7 @@ bool ImagePng::loadFromBuffer(NetBuffer
+ 	}

+ 	else

+ 	{

+-		png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);

++		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);

+ 

+ 		Logger::log(S3D::formatStringBuffer(

+ 			"Invalid PNG format.\n"

+@@ -272,7 +272,7 @@ bool ImagePng::loadFromBuffer(NetBuffer
+ 	// END NEW CODE

+ 

+ 	/* clean up after the read, and free any memory allocated - REQUIRED */

+-	png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);

++	png_destroy_read_struct(&png_ptr, &info_ptr, NULL);

+ 

+ 	/* that's it */

+ 	return true;

diff --git a/games-strategy/scorched3d/scorched3d-42.1.ebuild b/games-strategy/scorched3d/scorched3d-42.1.ebuild
index e161bd390845..3319d0ef634d 100644
--- a/games-strategy/scorched3d/scorched3d-42.1.ebuild
+++ b/games-strategy/scorched3d/scorched3d-42.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-42.1.ebuild,v 1.5 2009/11/12 17:40:53 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-42.1.ebuild,v 1.6 2010/03/10 20:19:11 ssuominen Exp $
 
 EAPI=2
 WX_GTK_VER=2.8
@@ -18,7 +18,7 @@ IUSE="dedicated mysql"
 DEPEND="media-libs/libsdl
 	media-libs/sdl-net
 	media-libs/libpng
-	media-libs/jpeg
+	media-libs/jpeg:0
 	dev-libs/expat
 	!dedicated? (
 		virtual/opengl