Fix building with libpng14 wrt #308739 by Rafał Mużyło.

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

4 files changed, 30 insertions, 4 deletions

diff --git a/games-fps/prboom/ChangeLog b/games-fps/prboom/ChangeLog
index 021881d79818..464414077418 100644
--- a/games-fps/prboom/ChangeLog
+++ b/games-fps/prboom/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/prboom
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.29 2010/03/09 05:30:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.30 2010/03/09 21:51:20 ssuominen Exp $
+
+  09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> prboom-2.5.0.ebuild,
+  +files/prboom-2.5.0-libpng14.patch:
+  Fix building with libpng14 wrt #308739 by Rafał Mużyło.
 
   09 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org> prboom-2.5.0.ebuild:
   add use deps for libsdl
diff --git a/games-fps/prboom/Manifest b/games-fps/prboom/Manifest
index fa1161d54dc8..1aed2544e74d 100644
--- a/games-fps/prboom/Manifest
+++ b/games-fps/prboom/Manifest
@@ -1,11 +1,12 @@
 AUX 2.4.7-nvidia-test.c 90 RMD160 423a4874c8c9c92482b7df72cb88f5140ebbbd5c SHA1 dc9d0930e6f0ca7826554101e4d54a3405bb6f34 SHA256 5df0930928328c700cafba8ac3367dc799118dddcd16d71d2bb0d65eb3a2d185
 AUX 2.4.7-nvidia.patch 1734 RMD160 89aeec2e42cc8dc29d1dd79f17fd91abe77ceb44 SHA1 5cd90ca85012d2d1ffb703861dcb9d9ff92b2388 SHA256 db77ce8107f97f2886d89c53777b2f9c7ef5e2559dcdd4ea455f3cf0ae2491fe
+AUX prboom-2.5.0-libpng14.patch 495 RMD160 c42e5bacee5719087e85f0b255c75915a58021d8 SHA1 7f0c88e59152adeb27173277eb0c805fb42fedf5 SHA256 73570c04a504359fa597423c00e151fc96975b83ae2c44edc9ff3462c068d52b
 AUX prboom-2.5.0-nvidia-test.c 90 RMD160 423a4874c8c9c92482b7df72cb88f5140ebbbd5c SHA1 dc9d0930e6f0ca7826554101e4d54a3405bb6f34 SHA256 5df0930928328c700cafba8ac3367dc799118dddcd16d71d2bb0d65eb3a2d185
 AUX prboom-2.5.0-nvidia.patch 1734 RMD160 89aeec2e42cc8dc29d1dd79f17fd91abe77ceb44 SHA1 5cd90ca85012d2d1ffb703861dcb9d9ff92b2388 SHA256 db77ce8107f97f2886d89c53777b2f9c7ef5e2559dcdd4ea455f3cf0ae2491fe
 DIST prboom-2.4.7.tar.gz 999524 RMD160 78c8548954dd95469f8099bc8fa697f62a69c17e SHA1 52aeb933db770b48331317dc357f6cbad3085600 SHA256 de22dbaacd25a0f0b16c507aa2326a90b7f5dcfcf862c3dc7076996c6187cd2f
 DIST prboom-2.5.0.tar.gz 1049505 RMD160 cc695ca0ceb9f9b9ca2ace7267a064799c61ffba SHA1 f17dc6ed4e72d07b85429177b00b8709ea36f5a0 SHA256 226c1c470f8cc983327536404f405a1d026cf0a5188c694a1243cc8630014bae
 DIST prboom.png 4254 RMD160 a673654eab9d87d34537e3d42c9274245be9e45f SHA1 c8e6a60b76ae93c44c5508ce5cb1308831c474a7 SHA256 ed79c4712b57b0c5e8ef975412e22d6936fa4b62657707e8f1cda63302008542
 EBUILD prboom-2.4.7.ebuild 1765 RMD160 3eb141462d744eadc24cb215835fc3035fc9cf43 SHA1 09c6e87b53a80c517d80e441662fc7de07dc8d61 SHA256 4113d8dd819fca77e19f050090b645cee6d0bca65b1dba70f55623c542e51f35
-EBUILD prboom-2.5.0.ebuild 1728 RMD160 f382fcf01b522eb6a1e7755f9d6b6b129dc25421 SHA1 a1dcd49bdb01c27ee07b8aa908cd693493495e7f SHA256 4f018e20e3cf08f68bbf4972ef20bc692d8b99f29c1292d82af52dd7d253dab8
-MISC ChangeLog 5155 RMD160 2cc56daadf17dcfaab71f1b7d4f47df678be554a SHA1 328ba527170d5e727cc2b37af683373cda2842ce SHA256 643a432c7f0c3bd68ead3796317305f790e380d01b903a4945a65a22825c1e3f
+EBUILD prboom-2.5.0.ebuild 1770 RMD160 2f6740ef0044aa6a8d8183e0691ceccf50aaca95 SHA1 4ce2bbb4f3f72f65328821c320efccb329f78bf2 SHA256 46ce7fe6cf94c7cd722d4adc5ee4e32212c4190cc02181859bc8426b313d862f
+MISC ChangeLog 5330 RMD160 a0105dcd42be18d09cf713757f6e935844e8ce63 SHA1 b8783668be6649f8de493f1f5d740b9a1eeae2bb SHA256 31b8104eea53e80d35dedef566016e18194619ab17e37b2c89c7b1630f3129cb
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-fps/prboom/files/prboom-2.5.0-libpng14.patch b/games-fps/prboom/files/prboom-2.5.0-libpng14.patch
new file mode 100644
index 000000000000..151c9e58ff85
--- /dev/null
+++ b/games-fps/prboom/files/prboom-2.5.0-libpng14.patch
@@ -0,0 +1,20 @@
+--- src/SDL/i_sshot.c
++++ src/SDL/i_sshot.c
+@@ -231,7 +231,7 @@
+   if (fp)
+   {
+     png_struct *png_ptr = png_create_write_struct(
+-        PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn);
++        PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn);
+ 
+     if (png_ptr)
+     {
+@@ -279,7 +279,7 @@
+             break;
+         }
+       }
+-      png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
++      png_destroy_write_struct(&png_ptr,  NULL);
+     }
+     fclose(fp);
+   }
diff --git a/games-fps/prboom/prboom-2.5.0.ebuild b/games-fps/prboom/prboom-2.5.0.ebuild
index 47a4bb34563d..e90482178692 100644
--- a/games-fps/prboom/prboom-2.5.0.ebuild
+++ b/games-fps/prboom/prboom-2.5.0.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-fps/prboom/prboom-2.5.0.ebuild,v 1.2 2010/03/09 05:30:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/prboom-2.5.0.ebuild,v 1.3 2010/03/09 21:51:20 ssuominen Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs games
@@ -28,6 +28,7 @@ src_prepare() {
 	local ret=$?
 	eend ${ret} "NVidia GL/prboom bug found ;("
 	[ ${ret} -eq 0 ] || epatch "${FILESDIR}"/${P}-nvidia.patch
+	epatch "${FILESDIR}"/${P}-libpng14.patch
 	sed -i \
 		-e '/^gamesdir/ s/\/games/\/bin/' \
 		src/Makefile.in \