Fix building with libpng14 wrt #326599 by Serhij S. Stasyuk.

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

5 files changed, 26 insertions, 6 deletions

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index 237d2bb3ea60..9dcaaff45866 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-plugins/gnash
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.28 2010/06/27 12:52:11 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.29 2010/07/02 11:01:42 ssuominen Exp $
+
+  02 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +files/gnash-0.8.x-libpng14.patch, gnash-0.8.5.ebuild, gnash-0.8.6.ebuild:
+  Fix building with libpng14 wrt #326599 by Serhij S. Stasyuk.
 
   27 Jun 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   gnash-0.8.7.ebuild:
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index a3e648eb8b62..4b5804fcb4e9 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -9,11 +9,12 @@ AUX gnash-0.8.7-amf-include.patch 1121 RMD160 5e17e26f5033816f011ccee9b943588fd5
 AUX gnash-0.8.7-klash.patch 4224 RMD160 9d988887af247a1810f3afd22ac56ff20b510276 SHA1 5f4991870587351282fabbe853c89fdb03853c54 SHA256 2676ae1d6d3d41937a06ca59c6252b64ece1ec8f5232cf21dbfc0126396101c0
 AUX gnash-0.8.7-moc-qt4.patch 677 RMD160 b24a4421202a75d11ec6d868e3048a78b883abf8 SHA1 7b3af0e10afc9b1600d264b2435a0324effa88f1 SHA256 b510bfb59ad1cfc54e06227f922cafb44816abe0df55765a6884323892016240
 AUX gnash-0.8.7-xpcom-idldir.patch 731 RMD160 5c79c44dd90ce3555e7a32694c2adbf01d8e5493 SHA1 a6230e75ee301831fc24311d41a4691e509f2bc3 SHA256 1b9bcd8c731e8ae49e2f22fa8e1d5da05b50822d77c3758900bb251cfbd3d32c
+AUX gnash-0.8.x-libpng14.patch 359 RMD160 bb8cc909fc652c151da80e788d9968efeef98057 SHA1 aa66528485c4c766e223ae66f4a89aacef75f0cc SHA256 d850693fe9f411552fe6647ec4833cabfba838ce4f02e96cf75634acb46f0b58
 DIST gnash-0.8.5.tar.bz2 3335797 RMD160 8ef599237c3162f9f28459855e4729d400bd4304 SHA1 26304322728d10dda1a0da2951946d981a507ca6 SHA256 16f272214eed2ab50bcd9507d6299b82ed7d20e7e8eb253ab160e594eeb210b3
 DIST gnash-0.8.6.tar.bz2 3571055 RMD160 987342b6cc46e94d5684d917bebbe6f6da6033bf SHA1 11c115f45b3803b157f65f30f1f65d26fea34328 SHA256 05f4b75eb2a5bc543fcd743641825147ce5e1b0bf675896e01401556a85332ea
 DIST gnash-0.8.7.tar.bz2 3617298 RMD160 809e5dcf6f11567f7463d1e772053aa54f7170ed SHA1 bba6245ce251730fd58a59b37609ca4b8898ae01 SHA256 73b8a7c788511e453add26fd68cebd5818b39f9da21cc7c78e9cef8bc837e896
-EBUILD gnash-0.8.5.ebuild 6820 RMD160 2855295a73bfe2c067be9fe848d62babb53e70bd SHA1 8b121486471012c2ad87f239a595b6eb4bd34f1d SHA256 8724bc45eb19527ce8d1cf30d5a938ff732e1cea430a137c6ca6e5fe1b4393a1
-EBUILD gnash-0.8.6.ebuild 7707 RMD160 4dcfc972f1b33bd175b6a5f8992985f2fece3341 SHA1 2250706f45fdaa67314f87d85ba78cdfd8a48659 SHA256 780a3542eb3fdfafc1f97741c6ff6a6abc9ed89b81261306f57242ff633aca2b
+EBUILD gnash-0.8.5.ebuild 6871 RMD160 017a282bd589fd85123a2ae37107282971b06175 SHA1 3233ecaa2e73bd46d5283f2fd6a163dfccc95edc SHA256 d698f8574a34c59d22edb2fc61fcfc98ddd3f29730a6d1147d24b7dbdf069140
+EBUILD gnash-0.8.6.ebuild 7758 RMD160 faf47550370036ad6a05686ec7e0f9fbfa1881a1 SHA1 e89119e26ec0ef2505a16f1498abc25684922da8 SHA256 508e625f649a483c71b42295410ce4a3484b178d53f3757289ef31196e6586fc
 EBUILD gnash-0.8.7.ebuild 8022 RMD160 67267b7cdd02116b119c9354ef7a6fba34b43c3d SHA1 85d4dc67cd0359bb65fc2f7f150ec7e4a8c7dc85 SHA256 c2d4f0a561e66512fc70b0ed2f5d0ca5f7eccacc68532457b616618007a3d43e
-MISC ChangeLog 17479 RMD160 d8045d8937678cf32237a64abac218660abc613e SHA1 8e1782dbd565e478d6d8a356d5a1a804abbba733 SHA256 0bb7d0f3fe3ad8cc835b9c150a2c32dbc126241315872113ca4ab756c5242bb2
+MISC ChangeLog 17675 RMD160 16621325d3a590ff7d24d253a5f5616d44a2004b SHA1 f520e19a7b705b0f63dade2004b8cee219683d04 SHA256 8c4c240248a2a3167bd75276c3a80bd7f18ebb14b37ea821f1af866bd75d6f5f
 MISC metadata.xml 629 RMD160 c09d2f9e4f61ffff0d0a86807f5ae79fc3986474 SHA1 3a7a29e2e3c9d91a0cd1fd61a35eb6e069f3a0e7 SHA256 145ff961a7e0d2e841559d29dd8ab3fc8e448acce4eacb4e8b960209d2a1f41f
diff --git a/www-plugins/gnash/files/gnash-0.8.x-libpng14.patch b/www-plugins/gnash/files/gnash-0.8.x-libpng14.patch
new file mode 100644
index 000000000000..63668da2b3fc
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.x-libpng14.patch
@@ -0,0 +1,11 @@
+--- libbase/GnashImagePng.cpp
++++ libbase/GnashImagePng.cpp
+@@ -164,7 +164,7 @@
+     if (type == PNG_COLOR_TYPE_GRAY && bitDepth < 8)
+     {
+         log_debug("Setting grey bit depth(%d) to 8", bitDepth);
+-        png_set_gray_1_2_4_to_8(_pngPtr);
++        png_set_expand_gray_1_2_4_to_8(_pngPtr);
+     }
+ 
+     // Apply the transparency block if it exists.
diff --git a/www-plugins/gnash/gnash-0.8.5.ebuild b/www-plugins/gnash/gnash-0.8.5.ebuild
index 6cb0a33e8d6e..e00bd101e824 100644
--- a/www-plugins/gnash/gnash-0.8.5.ebuild
+++ b/www-plugins/gnash/gnash-0.8.5.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/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.12 2010/05/01 00:58:17 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.5.ebuild,v 1.13 2010/07/02 11:01:42 ssuominen Exp $
 
 EAPI="2"
 CMAKE_REQUIRED="never"
@@ -113,6 +113,8 @@ src_prepare() {
 	# gentoo bug #283905
 	epatch "${FILESDIR}"/${P}-moc-qt4.patch
 
+	epatch "${FILESDIR}"/${PN}-0.8.x-libpng14.patch
+
 	# Conflict headers with npapi.h from mozilla-sdk embedded stuffs and libxul-unstable header
 	# in case where xpcom (implicitly added with gtk) is enabled, we use the system header
 	if use gtk; then
diff --git a/www-plugins/gnash/gnash-0.8.6.ebuild b/www-plugins/gnash/gnash-0.8.6.ebuild
index e7caaba27109..c660a53b1051 100644
--- a/www-plugins/gnash/gnash-0.8.6.ebuild
+++ b/www-plugins/gnash/gnash-0.8.6.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/www-plugins/gnash/gnash-0.8.6.ebuild,v 1.10 2010/05/01 00:58:17 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.6.ebuild,v 1.11 2010/07/02 11:01:42 ssuominen Exp $
 
 EAPI="2"
 CMAKE_REQUIRED="never"
@@ -131,6 +131,8 @@ src_prepare() {
 	# when AS3 support is enabled (as default)
 	epatch "${FILESDIR}"/${P}-libcore-as3-headers.patch
 
+	epatch "${FILESDIR}"/${PN}-0.8.x-libpng14.patch
+
 	# Conflict headers with npapi.h from mozilla-sdk embedded stuffs and libxul-unstable header
 	# in case where xpcom (implicitly added with gtk) is enabled, we use the system header
 	if use gtk; then