Fix building with libpng14 by Locke Shinseiko (Wizzleby).

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

diff --git a/games-arcade/stepmania/ChangeLog b/games-arcade/stepmania/ChangeLog
index 1367513ee1c2b0414895141ef674f85ba3d42eaa..cbbfc39bd7153c0977b928a4fb3f5df5a0fbf9a3 100644 (file)
--- a/games-arcade/stepmania/ChangeLog
+++ b/games-arcade/stepmania/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/stepmania
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/ChangeLog,v 1.33 2010/02/24 21:26:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/ChangeLog,v 1.34 2010/03/09 19:25:41 ssuominen Exp $
+
+  09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  stepmania-3.9-r2.ebuild:
+  Fix building with libpng14 by Locke Shinseiko (Wizzleby).
 
 *stepmania-3.9-r2 (24 Feb 2010)
 

diff --git a/games-arcade/stepmania/Manifest b/games-arcade/stepmania/Manifest
index 5e05a9e5bfe297a09c0b9d9cf658fab22863485a..b573b26c35f9a8a6a2eac770f726eb7664abca7e 100644 (file)
--- a/games-arcade/stepmania/Manifest
+++ b/games-arcade/stepmania/Manifest
@@ -2,6 +2,6 @@ AUX stepmania-3.9-gentoo.patch 941 RMD160 d352bf2106973e9a993293d3f1d6f14f7f125a
 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 2015 RMD160 308ee135ed05404ffcf52c387615fb047cff9b3d SHA1 6cb94de17ce156d59e8d19fc674b9ed72872c8ef SHA256 d82ff5878ea14362cac0b1f75331017a006d5df87e94513165128b0295f81157
-MISC ChangeLog 5725 RMD160 19173cb37f88dd7d0d36516df5dea74eed551f4e SHA1 2dab988f5d44ec203e918b304a86ce9e06614f79 SHA256 963f13ef430e718bca45cecc17ef12d3e6a326cd78e33fc9fe13b46917450fca
+EBUILD stepmania-3.9-r2.ebuild 2132 RMD160 df94c1ed3ae148bb1af1d15678e9d71e5e24f712 SHA1 fee84b5993eff4fa3112a3253ed28da7a478f42b SHA256 b0dc69b115783806073595bca400c9cb4a7afa14fe6442ead7e824c89ca965f4
+MISC ChangeLog 5867 RMD160 4766d13fe2fc77491e30a7e3854bcee3c0e36700 SHA1 0c34e0cfd524e305bf8f2ceef303d09e3bff4500 SHA256 817caafb4364089b40498fbb12877109e8e73866845b141efe31ce846bdc90d5
 MISC metadata.xml 328 RMD160 c7bbe6fdc6af00a1d3f76a4cf8033e31a5c020db SHA1 edd8a37f67220289312d3536ff2ab8f0918c57b4 SHA256 276314f486b56b53f4bbaad58741b9ecab165502c877f3aa35977c2cf31e696f

diff --git a/games-arcade/stepmania/stepmania-3.9-r2.ebuild b/games-arcade/stepmania/stepmania-3.9-r2.ebuild
index 8baa2b7ad6b73c0e9040b262172bf6ae28481f92..e5766d86fbdb14bcb71279e68ae4edf747355802 100644 (file)
--- a/games-arcade/stepmania/stepmania-3.9-r2.ebuild
+++ b/games-arcade/stepmania/stepmania-3.9-r2.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-arcade/stepmania/stepmania-3.9-r2.ebuild,v 1.2 2010/03/01 16:50:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/stepmania-3.9-r2.ebuild,v 1.3 2010/03/09 19:25:41 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils games
@@ -39,6 +39,11 @@ src_prepare() {
                "${FILESDIR}"/${P}-gentoo.patch > "${T}"/${P}.patch
 
        EPATCH_SUFFIX=patch epatch "${T}"/${P}.patch "${WORKDIR}"/patches
+
+       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
 }