Fix building with libpng14 wrt #308889 by Locke Shinseiko.

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

diff --git a/games-fps/tenebrae/ChangeLog b/games-fps/tenebrae/ChangeLog
index 9fd5a65ac844d0ada6fe2de75fd296f32fb6542d..2d967f2eafb3ebe988db2645498c5919d2d759bb 100644 (file)
--- a/games-fps/tenebrae/ChangeLog
+++ b/games-fps/tenebrae/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/tenebrae
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/ChangeLog,v 1.10 2007/07/02 17:39:11 nyhm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/ChangeLog,v 1.11 2010/03/10 21:46:59 ssuominen Exp $
+
+  10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> tenebrae-1.04.ebuild:
+  Fix building with libpng14 wrt #308889 by Locke Shinseiko.
 
   02 Jul 2007; Tristan Heaven <nyhm@gentoo.org>
   +files/tenebrae-1.04-exec-stack.patch, tenebrae-1.04.ebuild:

diff --git a/games-fps/tenebrae/Manifest b/games-fps/tenebrae/Manifest
index 30efe8c55969335872860e175fecdfa1f1db84f0..5e8c2c5e1378f87629b90ef3dc9cd50b1de25495 100644 (file)
--- a/games-fps/tenebrae/Manifest
+++ b/games-fps/tenebrae/Manifest
@@ -2,6 +2,6 @@ AUX 1.04-glhax.patch 1091 RMD160 e43743b9172fb2497bba7d463db9fd1b53c2dfbf SHA1 f
 AUX tenebrae-1.04-exec-stack.patch 642 RMD160 ddb22f84e2daf1f2eee27ad13e30b7175aab2e4f SHA1 3df0fd513eb05e63ac83e897aef0cff51b7dcbb5 SHA256 d04cbf31f16929b27040ea9f4e599db2ea4e14b696708034ae523ff406de011c
 DIST tenebrae-1.04.tbz2 625988 RMD160 bc1c10a607619c5a6849e51dcd15f130b45fee87 SHA1 bc6ee34bb583d16c493a3e88f43bd24598a34907 SHA256 61277ecb41dc7c4adbfbad81cd5bfd69e3d63a8e7b41a4860bd879011a735f6c
 DIST tenebraedata.zip 3989498 RMD160 2524c6b483d52bc2aca97e8c626bf324023442e3 SHA1 9edc109d204e314d344ee982f2e66cc473bb809f SHA256 35db2e1dfe917ec5e62d8ad50fb5ccc73418a7dc3ef1e16cba9eb01f1e1177b8
-EBUILD tenebrae-1.04.ebuild 1641 RMD160 e81a24821842c27443e29b575778dc0263714871 SHA1 38aa300d097c35e6fc5c6ff5afccc7f824b0ba3e SHA256 1b7fc28ea058ab22eb710cf73fd05fec7e26c8d3d0db3b58daf3ebfe2d7c8c09
-MISC ChangeLog 1310 RMD160 8552a31514c58688181dae978d807b277cb9286f SHA1 e099ba7615f1b13a0b3aae1bb8d2305c856327a5 SHA256 d57585b0247bf23d9b49bc4e547a9b846066e10fdc351a172f548dfda98c6ca2
+EBUILD tenebrae-1.04.ebuild 1745 RMD160 844f051509e0f513c29dcf61ce4403c0bd60ed75 SHA1 beb87db86d8b7a9fcce1034a1079e8364e5f3b5e SHA256 2e4cf5dc53db4488fd711bfb9961aa902a8083f773da65d541d6b5d2da33e863
+MISC ChangeLog 1453 RMD160 70f480c9314b467ecb1ff694461320052d1166bc SHA1 43d3fbc6317d4c315f6b63e3297490c830a3dced SHA256 25c6dd0bc1c699a6b10cf75875d2cb0fd955519233bca6bbcdbe87d7ce60de2c
 MISC metadata.xml 535 RMD160 dc577d8e694987191c2dd42bbb40ad2f01452fae SHA1 3cf32fbcba2c238cb84740d6c22fc3e0f5f692c1 SHA256 f67ad81390e2ee2e5582b15bcc878e804028acce9a240f3885e3634a86a4fc1c

diff --git a/games-fps/tenebrae/tenebrae-1.04.ebuild b/games-fps/tenebrae/tenebrae-1.04.ebuild
index a743066bf3e566457c01733aafd2b16927a93391..bc6117226f35f80b4b2e3b4ada874d5372b2cd10 100644 (file)
--- a/games-fps/tenebrae/tenebrae-1.04.ebuild
+++ b/games-fps/tenebrae/tenebrae-1.04.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/tenebrae-1.04.ebuild,v 1.12 2007/07/02 17:39:11 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/tenebrae-1.04.ebuild,v 1.13 2010/03/10 21:46:59 ssuominen Exp $
 
 #ECVS_SERVER="cvs.tenebrae.sourceforge.net:/cvsroot/tenebrae"
 #ECVS_MODULE="tenebrae_0"
@@ -38,6 +38,11 @@ src_unpack() {
                cvs_src_unpack
        fi
        cd tenebrae_0
+
+       sed -i \
+               -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:g' \
+               gl_warp.c || die
+
        epatch \
                "${FILESDIR}"/${PV}-glhax.patch \
                "${FILESDIR}"/${P}-exec-stack.patch