Fix build with media-libs/libpng-1.5 Bug #355119

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 61 insertions, 10 deletions

diff --git a/games-arcade/stepmania/ChangeLog b/games-arcade/stepmania/ChangeLog
index 4c5dbec39660..1691861ba054 100644
--- a/games-arcade/stepmania/ChangeLog
+++ b/games-arcade/stepmania/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-arcade/stepmania
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/ChangeLog,v 1.37 2011/04/12 13:29:48 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/ChangeLog,v 1.38 2011/06/28 12:12:00 tupone Exp $
+
+  28 Jun 2011; Tupone Alfredo <tupone@gentoo.org> stepmania-3.9-r2.ebuild,
+  +files/stepmania-3.9-libpng15.patch:
+  Fix build with media-libs/libpng-1.5 Bug #355119 by Lars Wendler
+  (Polynomial-C)
 
   12 Apr 2011; Alfredo Tupone <tupone@gentoo.org> stepmania-3.9-r2.ebuild,
   +files/stepmania-3.9-gcc46.patch:
diff --git a/games-arcade/stepmania/Manifest b/games-arcade/stepmania/Manifest
index b4938e8a0e84..0675d3ee7b91 100644
--- a/games-arcade/stepmania/Manifest
+++ b/games-arcade/stepmania/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX stepmania-3.9-gcc46.patch 372 RMD160 b249c85b66d5ceb3850171d14ac5f2cd151ee4b4 SHA1 7f0f88ccdb0694f60aa01c07eb0f4987fdb4f929 SHA256 90c45402b76068a3dbe60551ec75f94130107452f6ef2658bbaf7c012fbf661a
 AUX stepmania-3.9-gentoo.patch 941 RMD160 d352bf2106973e9a993293d3f1d6f14f7f125a60 SHA1 f8e9d59e85024b4847afe6b6bf164c83475e990a SHA256 eb82b01bcb17d0f09024deb1624e63682a27f49086e43c42b45f85821ba03b2d
+AUX stepmania-3.9-libpng15.patch 1308 RMD160 5bf8310784fe7b42abf0d49c582c4e1b99c8903e SHA1 19d0d9a825ee74729767b747268e3c4bd7cc8ec6 SHA256 a7aa545d1e8846add3833eed456b36073c0c82c63aff9cb1464679fc697a0176
 DIST StepMania-3.9-linux.tar.gz 10174400 RMD160 426b11d652669be85753161f2cd03f2fe81df860 SHA1 100b1a2771fec1d208798ef03ba164259a589bf2 SHA256 ccb6e549e8d026e79de7d6bbfadc7f1ac7f7c05242a90edf56cf652f5ddeaae0
 DIST StepMania-3.9-src.tar.gz 3090223 RMD160 e7451192fe67f53a7a93baf99bf9a20bc3d1f7cf SHA1 b2d2c3a50c23506844ba7e22289e59d270bb8b2e SHA256 31082d388fa64b9764aee4d7628f377bc0fe47b8f157b8bcc66d9e3678479c85
 DIST stepmania-3.9-patches-6.tar.bz2 10577 RMD160 23ed35d8c25f3421bce3da0b3889cb917cb03fc4 SHA1 c39d3e747ecdb563117156d903313f897ec18cf2 SHA256 3ea399d5dd99f0285f9b0c88eb1c60802bd85617a8934bb9810ac8773b854264
-EBUILD stepmania-3.9-r2.ebuild 2155 RMD160 f670b6e6c7fa137bb69104fe1f0851553716bac5 SHA1 c333e9048fe3eae6244b6485f02a1eaf5408ebfc SHA256 e01f407be8348346c8e281ebee4f07c888acb86d89951a321063df74bd8c56b8
-MISC ChangeLog 6305 RMD160 b6b08125ade69f70cf0c112742d013a086e3fbc4 SHA1 835e502f7838d31c6be3c1de5dbe419b7337d966 SHA256 3eac07386c36d190b1babf5db43b65500c5ba842beee289170542c129705be68
+EBUILD stepmania-3.9-r2.ebuild 2056 RMD160 1a59780f9ac68b107763a2a57ba5c58c475dca34 SHA1 a73f60509ca65cf25a28925ca17539aa3156b75b SHA256 b3019004e4bcb064fe4ca434affd577d3da0655e744358524bf6c2a5e6c080f5
+MISC ChangeLog 6504 RMD160 384e9d0e47c5549c180b12640288c2e52cad1548 SHA1 a5010cf421ac67903703ac3a5b91e7ec131545b1 SHA256 7610de30a5f1e5ca0021bc3bfff14c85fe6f7dfa94721865f080f33070033b15
 MISC metadata.xml 227 RMD160 670fe8ba775154b131685071543cebf0fd911f7e SHA1 c523696d7d73d8baa4038b632b4c6648b0b6b519 SHA256 25ef77cd064f81b6399c8275b2d5b10b5eac1ad3ac8a2e203fc1b5254c508e42
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4JxSAACgkQIY77eQFFFC3BTgCgtQoBJj6PtN3pNjCwMhPS3Nml
+vNEAn2LvHRjQLspw5jwUyISqTOAYjTSU
+=t+ba
+-----END PGP SIGNATURE-----
diff --git a/games-arcade/stepmania/files/stepmania-3.9-libpng15.patch b/games-arcade/stepmania/files/stepmania-3.9-libpng15.patch
new file mode 100644
index 000000000000..4c4b0871f404
--- /dev/null
+++ b/games-arcade/stepmania/files/stepmania-3.9-libpng15.patch
@@ -0,0 +1,38 @@
+--- src/RageSurface_Load_PNG.cpp.old	2005-10-01 05:32:44.000000000 +0200
++++ src/RageSurface_Load_PNG.cpp	2011-06-28 12:37:27.542730428 +0200
+@@ -40,7 +40,7 @@
+ void RageFile_png_read( png_struct *png, png_byte *p, png_size_t size )
+ {
+ 	CHECKPOINT;
+-	RageFile *f = (RageFile *) png->io_ptr;
++	RageFile *f = (RageFile *) png_get_io_ptr(png);
+ 
+ 	int got = f->Read( p, size );
+ 	if( got == -1 )
+@@ -66,7 +66,7 @@
+ void PNG_Error( png_struct *png, const char *error )
+ {
+ 	CHECKPOINT;
+-	error_info *info = (error_info *) png->error_ptr;
++	error_info *info = (error_info *) png_get_error_ptr(png);
+ 	strncpy( info->err, error, 1024 );
+ 	info->err[1023] = 0;
+ 	LOG->Trace( "loading \"%s\": err: %s", info->fn, info->err );
+@@ -76,7 +76,7 @@
+ void PNG_Warning( png_struct *png, const char *warning )
+ {
+ 	CHECKPOINT;
+-	error_info *info = (error_info *) png->error_ptr;
++	error_info *info = (error_info *) png_get_error_ptr(png);
+ 	LOG->Trace( "loading \"%s\": warning: %s", info->fn, warning );
+ }
+ 
+@@ -139,7 +139,7 @@
+ 
+ 	/* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
+ 	if( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 )
+-		png_set_gray_1_2_4_to_8( png );
++		png_set_expand_gray_1_2_4_to_8( png );
+ 
+ 	/* These are set for type == PALETTE. */
+ 	RageSurfaceColor colors[256];
diff --git a/games-arcade/stepmania/stepmania-3.9-r2.ebuild b/games-arcade/stepmania/stepmania-3.9-r2.ebuild
index 2bb69c3d6223..986cf5f39413 100644
--- a/games-arcade/stepmania/stepmania-3.9-r2.ebuild
+++ b/games-arcade/stepmania/stepmania-3.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/stepmania-3.9-r2.ebuild,v 1.6 2011/04/12 13:29:48 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/stepmania-3.9-r2.ebuild,v 1.7 2011/06/28 12:12:00 tupone Exp $
 
 EAPI=2
 inherit autotools eutils games
@@ -39,13 +39,10 @@ src_prepare() {
 		"${FILESDIR}"/${P}-gentoo.patch > "${T}"/${P}.patch
 
 	EPATCH_SUFFIX=patch epatch "${T}"/${P}.patch "${WORKDIR}"/patches
-	epatch "${FILESDIR}"/${P}-gcc46.patch
+	epatch "${FILESDIR}"/${P}-gcc46.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
 
-	sed -i \
-		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
-		src/RageSurface_Load_PNG.cpp || die
-
-	AT_M4DIR=autoconf/m4 eautoreconf
+	eautoreconf
 }
 
 src_configure() {