Fix building with libpng14 wrt #307695 by Lars Wendler.

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

4 files changed, 32 insertions, 4 deletions

diff --git a/dev-games/openscenegraph/ChangeLog b/dev-games/openscenegraph/ChangeLog
index 79e1fcb5e25e..8ff69a350c1d 100644
--- a/dev-games/openscenegraph/ChangeLog
+++ b/dev-games/openscenegraph/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/openscenegraph
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.21 2010/02/10 14:10:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.22 2010/03/11 15:08:10 ssuominen Exp $
+
+  11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  openscenegraph-2.8.2.ebuild, +files/openscenegraph-2.8.2-libpng14.patch:
+  Fix building with libpng14 wrt #307695 by Lars Wendler.
 
   10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
   openscenegraph-2.8.2.ebuild:
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index d8788aa8e190..cbafd36452f7 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -1,5 +1,6 @@
+AUX openscenegraph-2.8.2-libpng14.patch 1076 RMD160 f4f5351da534df37e6279416ad31133226f16fe7 SHA1 6a2ab90a528ccd1ecac4da850632c08ca48371c8 SHA256 632d18877b39e731c4800475431a673e06f5d16e66c149dc74abc04c4f115b37
 AUX openscenegraph-2.8.2-magicoff.patch 2947 RMD160 1356636b0cda89bf30c2430d2c2b45ec6abc8431 SHA1 29a086b58934285f2a327490aeab1bac7f83ef6c SHA256 e0aa057cfad117fc209f309b5bb0e8a225ad312cc4b5a3154c2386abfaf0d9c6
 DIST OpenSceneGraph-2.8.2.zip 6472487 RMD160 3933b2395e36950c870f32db2fcddc7cc220e228 SHA1 f2f0a3285a022640345a81f536459f37f3f38d01 SHA256 0903e3a29eba07856c563d1b313f6b803bee702e9145a27677d8dcab57db98ab
-EBUILD openscenegraph-2.8.2.ebuild 1860 RMD160 0d7bcdb76a91e8dfd1f6827bdeae51fb77406862 SHA1 ab710705039649b07c9e4ca9613139145e350e2a SHA256 38161f37ba30f52bf0a0264be30ab776a878d0db4b90c995fc706ef829fc7800
-MISC ChangeLog 3256 RMD160 c4d18919647002e43b814a27aed8eeb2406ac3c0 SHA1 e91e2fec53309498cf09a2121f8dc4de5e39f906 SHA256 c79c7c3d99b94c7c3a536785ae361af3cd209018a5aed55775eba1201584ede5
+EBUILD openscenegraph-2.8.2.ebuild 1895 RMD160 f848344bed7f45bf43a0b77a412674660941cb9c SHA1 d46fca8cbfed9d675e3d9e45b1945f772300aa22 SHA256 9624b8b112fe63284f8ff227cb2fcf6b92e2dd3c455e663d4b0e103a6e56a6f1
+MISC ChangeLog 3444 RMD160 63b832ecd582ef6cc2b7746fe40b178711836156 SHA1 09b0cc2130f43b51ef7c597dfaacebecef36bd92 SHA256 497d20a74f257cc77778f9581457f3c42e594e105610fc6d0b925e3a76312e1a
 MISC metadata.xml 990 RMD160 091b926c8d1090d525aa8b2ad17dbc0e4c26dbc3 SHA1 de97430589e954944ddcc304083b384daf072bcf SHA256 4f0618471f177284a088d8c4b4d8b87a434552a491a50ee261dd2887945072e5
diff --git a/dev-games/openscenegraph/files/openscenegraph-2.8.2-libpng14.patch b/dev-games/openscenegraph/files/openscenegraph-2.8.2-libpng14.patch
new file mode 100644
index 000000000000..98b90dbaa206
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-2.8.2-libpng14.patch
@@ -0,0 +1,22 @@
+http://repos.archlinux.org/wsvn/community/openscenegraph/trunk/libpng14
+
+--- src/osgPlugins/png/ReaderWriterPNG.cpp
++++ src/osgPlugins/png/ReaderWriterPNG.cpp
+@@ -173,7 +173,7 @@ class ReaderWriterPNG : public osgDB::Re
+                 endinfo = png_create_info_struct(png);
+ 
+                 fin.read((char*)header,8);
+-                if (fin.gcount() == 8 && png_check_sig(header, 8))
++                if (fin.gcount() == 8 && !png_sig_cmp(header, 0, 8))
+                     png_set_read_fn(png,&fin,png_read_istream); //Use custom read function that will get data from istream
+                 else
+                 {
+@@ -224,7 +224,7 @@ class ReaderWriterPNG : public osgDB::Re
+                 if (color == PNG_COLOR_TYPE_PALETTE)
+                     png_set_palette_to_rgb(png);
+                 if (color == PNG_COLOR_TYPE_GRAY && depth < 8)
+-                    png_set_gray_1_2_4_to_8(png);
++                    png_set_expand_gray_1_2_4_to_8(png);
+                 if (png_get_valid(png, info, PNG_INFO_tRNS))
+                     png_set_tRNS_to_alpha(png);
+ 
diff --git a/dev-games/openscenegraph/openscenegraph-2.8.2.ebuild b/dev-games/openscenegraph/openscenegraph-2.8.2.ebuild
index ed8d96104bc9..c030a321bba0 100644
--- a/dev-games/openscenegraph/openscenegraph-2.8.2.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-2.8.2.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/openscenegraph/openscenegraph-2.8.2.ebuild,v 1.8 2010/02/10 14:10:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-2.8.2.ebuild,v 1.9 2010/03/11 15:08:10 ssuominen Exp $
 
 EAPI=2
 inherit eutils versionator base cmake-utils
@@ -43,6 +43,7 @@ DOCS="AUTHORS.txt ChangeLog NEWS.txt"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-magicoff.patch
+	"${FILESDIR}"/${P}-libpng14.patch
 )
 
 src_configure() {