From: Alfredo Tupone <tupone@gentoo.org>
Date: Wed, 14 Sep 2011 12:19:33 +0000 (+0000)
Subject: Build with media-libs/libpng-1.5 Bug #380631
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8c645eb7bab7ced230f07d06131e46899a8dc919;p=gentoo.git

Build with media-libs/libpng-1.5 Bug #380631

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

diff --git a/games-arcade/ssc/ChangeLog b/games-arcade/ssc/ChangeLog
index f64680f879b0..b29da2609562 100644
--- a/games-arcade/ssc/ChangeLog
+++ b/games-arcade/ssc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/ssc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/ssc/ChangeLog,v 1.8 2011/08/25 11:23:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/ssc/ChangeLog,v 1.9 2011/09/14 12:19:32 tupone Exp $
+
+  14 Sep 2011; Tupone Alfredo <tupone@gentoo.org> ssc-0.8.ebuild,
+  +files/ssc-0.8-png15.patch:
+  Build with media-libs/libpng-1.5 Bug #380631 by Diego Elio Pettenò
 
   25 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org> ssc-0.8.ebuild:
   QA: add missing libpng dependency.
diff --git a/games-arcade/ssc/Manifest b/games-arcade/ssc/Manifest
index 2a3b4f96db06..5a0ff7b60d18 100644
--- a/games-arcade/ssc/Manifest
+++ b/games-arcade/ssc/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ssc-0.8-gcc34.patch 1514 RMD160 c2b939b3f7dbbd6bb5c378e3da6103740801597b SHA1 9969e725bffe0faa3280629e8ca319c0a6929eeb SHA256 062c262d5aa8579ca7c83c69fb1a8f4baa0f1bf6431860f544a0b736f2202066
 AUX ssc-0.8-ode.patch 653 RMD160 e2eea068dd1cf8456f32063200b14b93d37d780b SHA1 a17aa2b08ef8cbb52ac1b851d7dc90bb075e0dc4 SHA256 5618177fa98da2e5ae88b00a0328c66469de3e139d134a5ee6b63a9f636c0c55
+AUX ssc-0.8-png15.patch 1372 RMD160 55e8011020e0fa6ac142e4997201710c9d6c5137 SHA1 1742d0651672cd2bb9f1eb790e29226334c92842 SHA256 111a6c0fbeeee352c9b566275f1179a33dee370284aa0f2f2faf58283af6be6e
 DIST ssc-0.8.tar.bz2 810870 RMD160 12b9123b747b352dc595f555cf32dda7e1e67fe1 SHA1 a46584e4aa07a198ea1de8fb7cfd99fa1e7d542b SHA256 2bd29ce23fce9fe1530d2a6f756fe541aae27ebccb6585fdd2240e5c54eee4c7
-EBUILD ssc-0.8.ebuild 1394 RMD160 8d59538aba58e3f98052227f296b59dab9bfebbd SHA1 12c86522c331894398b82b8855653fc84be16644 SHA256 df5c7dbb605e8434bf3b1babb7d7c17c53463814dcdd7110c85e7de50ae5ba27
-MISC ChangeLog 994 RMD160 46c329a56cc0dbb8a6006344f810906b01e30bca SHA1 893b79f51a03f92ac884efd4545b8d62a05dd7e8 SHA256 615bbcb1b381992655d41848edb38873869c01129725b6bfa016017cfe660146
+EBUILD ssc-0.8.ebuild 1410 RMD160 d75c1eb397ad7aa63e25141ee32f8af7aa19adc3 SHA1 d079fff55733b9cf794e8e2814852ac214eb8b58 SHA256 3df12d1ddff48eedc587f724fc85549ce7d9224084a6c6f27a3d28f93efa5f18
+MISC ChangeLog 1158 RMD160 19260be8759bd3157373e44ad2b5a55d19ebada5 SHA1 c03edf6919b6a8999860c22e100631282b5f2665 SHA256 b39e00ed3dad54174f989def213cb2c5d905119d42bcf42a33d936d4c0b3d4ba
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk5wm38ACgkQIY77eQFFFC3hHACg3v87vagOfoVXUtRxf79QGeFk
+pboAniRchNWb1uV6wc6/fue0QNSVSR88
+=rW6M
+-----END PGP SIGNATURE-----
diff --git a/games-arcade/ssc/files/ssc-0.8-png15.patch b/games-arcade/ssc/files/ssc-0.8-png15.patch
new file mode 100644
index 000000000000..2e02e436e0db
--- /dev/null
+++ b/games-arcade/ssc/files/ssc-0.8-png15.patch
@@ -0,0 +1,40 @@
+--- src/glpng.c.old	2011-09-14 13:53:16.020425183 +0200
++++ src/glpng.c	2011-09-14 14:08:52.258314061 +0200
+@@ -278,7 +278,7 @@
+ 	endinfo = png_create_info_struct(png);
+ 
+ 	// DH: added following lines
+-	if (setjmp(png->jmpbuf))
++	if (setjmp(png_jmpbuf(png)))
+ 	{
+ 		png_destroy_read_struct(&png, &info, &endinfo);
+ 		return 0;
+@@ -382,7 +382,7 @@
+ 	endinfo = png_create_info_struct(png);
+ 
+ 	// DH: added following lines
+-	if (setjmp(png->jmpbuf))
++	if (setjmp(png_jmpbuf(png)))
+ 	{
+ 		png_destroy_read_struct(&png, &info, &endinfo);
+ 		return 0;
+@@ -561,7 +561,7 @@
+ 			#define ALPHA *q
+ 
+ 			switch (trans) {
+-				case PNG_CALLBACK:
++				case PNG_CALLBAC:
+ 					FORSTART
+ 						ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b);
+ 					FOREND
+--- src/glpng.h.old	2011-09-14 14:08:09.689319112 +0200
++++ src/glpng.h	2011-09-14 14:08:27.073317049 +0200
+@@ -57,7 +57,7 @@
+ #define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS
+ 
+ /* Transparency parameters */
+-#define PNG_CALLBACK  -3 /* Call the callback function to generate alpha   */
++#define PNG_CALLBAC   -3 /* Call the callback function to generate alpha   */
+ #define PNG_ALPHA     -2 /* Use alpha channel in PNG file, if there is one */
+ #define PNG_SOLID     -1 /* No transparency                                */
+ #define PNG_STENCIL    0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise       */
diff --git a/games-arcade/ssc/ssc-0.8.ebuild b/games-arcade/ssc/ssc-0.8.ebuild
index 600fb5916b03..18c24fc3e437 100644
--- a/games-arcade/ssc/ssc-0.8.ebuild
+++ b/games-arcade/ssc/ssc-0.8.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/ssc/ssc-0.8.ebuild,v 1.11 2011/08/25 11:23:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/ssc/ssc-0.8.ebuild,v 1.12 2011/09/14 12:19:32 tupone Exp $
+EAPI=2
 
 inherit eutils games
 
@@ -21,9 +22,7 @@ DEPEND="virtual/opengl
 	>=media-libs/freetype-2
 	media-libs/libpng"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	sed -i \
 		-e "s:/usr/local/share/:${GAMES_DATADIR}/:" \
 		src/{asteroid.cc,audio.cc,config.cc,menu.cc} \
@@ -34,7 +33,8 @@ src_unpack() {
 		|| die "sed configure failed"
 	epatch \
 		"${FILESDIR}"/${P}-gcc34.patch \
-		"${FILESDIR}"/${P}-ode.patch
+		"${FILESDIR}"/${P}-ode.patch \
+		"${FILESDIR}"/${P}-png15.patch
 }
 
 src_install () {