summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-03-09 06:27:40 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-03-09 06:27:40 +0000
commit21e17915633efcdc9ebcac015fd91ba6073efc61 (patch)
tree96ddcfe8cd53dda27c1a40797e5b3f4de16fa451 /dev-games
parentRestrict libpng depend to libpng12.so.0. (diff)
downloadhistorical-21e17915633efcdc9ebcac015fd91ba6073efc61.tar.gz
historical-21e17915633efcdc9ebcac015fd91ba6073efc61.tar.bz2
historical-21e17915633efcdc9ebcac015fd91ba6073efc61.zip
Fix building with libpng14.
Package-Manager: portage-2.2_rc65/cvs/Linux x86_64
Diffstat (limited to 'dev-games')
-rw-r--r--dev-games/irrlicht/ChangeLog5
-rw-r--r--dev-games/irrlicht/Manifest14
-rw-r--r--dev-games/irrlicht/irrlicht-1.6.1.ebuild6
3 files changed, 11 insertions, 14 deletions
diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog
index 6f8c413f3de7..d344ff4279c8 100644
--- a/dev-games/irrlicht/ChangeLog
+++ b/dev-games/irrlicht/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-games/irrlicht
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.36 2010/02/23 06:46:48 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.37 2010/03/09 06:27:40 ssuominen Exp $
+
+ 09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> irrlicht-1.6.1.ebuild:
+ Fix building with libpng14.
23 Feb 2010; Mark Loeser <halcy0n@gentoo.org>
-files/irrlicht-1.6.1-fix-directory.patch:
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index 7367329fc0e6..07bf87f3eb1a 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX irrlicht-1.5.1-config.patch 1308 RMD160 936792e3c36018ab0c77dad5056b420e5a57e50e SHA1 e7e0ad99523576c4667c0fb438d12c8b7d2454b9 SHA256 3e455791e5be5a21ea9e61380389d4b8d18de6d2c1e3e0c1fd2a106206ad3fa9
AUX irrlicht-1.5.1-demoMake.patch 676 RMD160 103f82bf2249b4dc21b170bdaed5289cdb1d7429 SHA1 5c13fff5f8063eb1b666cffc8a7fa390cdcaf1a6 SHA256 7e462b5d561a7ba791d6f39f17b1441763846ec3b8dc0fe59dc246920369f9c8
AUX irrlicht-1.6.1-config.patch 1308 RMD160 936792e3c36018ab0c77dad5056b420e5a57e50e SHA1 e7e0ad99523576c4667c0fb438d12c8b7d2454b9 SHA256 3e455791e5be5a21ea9e61380389d4b8d18de6d2c1e3e0c1fd2a106206ad3fa9
@@ -8,13 +5,6 @@ AUX irrlicht-1.6.1-demoMake.patch 19873 RMD160 61ad654a0824a1bde18a26ff642de4120
DIST irrlicht-1.5.1.zip 22514017 RMD160 2296568336dc9d506b59c1204c137526391fe3e5 SHA1 6110f398f4ed3850e0c5237629aa48050fb95fec SHA256 b5518bdb3fa8098ca92795a4bb03d19596b81103797fbaca199fc546d3c07070
DIST irrlicht-1.6.1.zip 22299175 RMD160 8b342f676cdb867ee6cbe964b939f961b700a704 SHA1 68b19c43e63960c6c94cc57ada879fbcb4b5fc30 SHA256 be26182cc4b9edb6d1e355cb4a6b99508333209b563f393c6dfcf5ca295f4df9
EBUILD irrlicht-1.5.1.ebuild 1372 RMD160 6d39f2f581b8e908ac685212fd7225841640982e SHA1 eb58b8d9ea0b5c3364b0678c0735a3849c4c96da SHA256 fe451866873e0484783ec8dca6ff0bddc856ed6518024a2b7305ac26faa3ac59
-EBUILD irrlicht-1.6.1.ebuild 1492 RMD160 b2302628dc18dc5e1ec539a08d3fc3b596621912 SHA1 0f5cfcf5ca701d9e2bfb5443a6268dcba98dd144 SHA256 0356a4615cbb14225b16de2a9f7816490ba2b28f555125b68b2c2992299cc0e7
-MISC ChangeLog 6162 RMD160 b572f6939b5c93a5be14bf887d80fd166bf467df SHA1 88f7c14338b0080dce38758befd7b6fa49b6dba9 SHA256 93ad3d2387cc0527829e6700f5afeb970605ec90b6af817fbd88bc36b9717e61
+EBUILD irrlicht-1.6.1.ebuild 1599 RMD160 49cf7c8a3ceb52bd204918b84acd99ea93117ca4 SHA1 97aade423d0ca55cfa10e374bcfa4975e8a7e50e SHA256 f42194ee86d993f1dada93c565f99d7b68d783e8ed36a704f7d5cf30baae2d51
+MISC ChangeLog 6272 RMD160 b2401014ae695a920cb3e62db847ef829b96d5a4 SHA1 64be55ab8f2e647401ad39fc18a3d457b898765c SHA256 8240a89bed5ff5ada089b1875c75f0e17f03feb8ba25ef24619418f62b5639d8
MISC metadata.xml 790 RMD160 86dd226d08a73ae77a31e174094cb4bdfeb5426a SHA1 ff4789ffad6e5473e3c2bbd8b0d64a4edc34b651 SHA256 f98d87925d064aebca00d2da850d027f1e2a66586c6715e12151e34a9167fffc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuDeeEACgkQCRZPokWLroTsqQCg0ZufhNezz8uCufMMTTtXjeat
-WS0AoNvRLqU6StvX5XmK+EVHGkZy6leq
-=5Q4K
------END PGP SIGNATURE-----
diff --git a/dev-games/irrlicht/irrlicht-1.6.1.ebuild b/dev-games/irrlicht/irrlicht-1.6.1.ebuild
index c33822f07c0a..706257291a67 100644
--- a/dev-games/irrlicht/irrlicht-1.6.1.ebuild
+++ b/dev-games/irrlicht/irrlicht-1.6.1.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/dev-games/irrlicht/irrlicht-1.6.1.ebuild,v 1.1 2010/01/14 22:17:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.6.1.ebuild,v 1.2 2010/03/09 06:27:40 ssuominen Exp $
EAPI=2
inherit eutils toolchain-funcs
@@ -45,6 +45,10 @@ src_prepare() {
-e '/^JPEGLIBOBJ/d' \
-e '/^LIBPNGOBJ/d' \
Makefile || die "sed failed"
+
+ sed -i \
+ -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
+ CImageLoaderPNG.cpp || die
}
src_compile() {