Fix building with libpng14.

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

diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog
index c85f1b8534658e1adfedb68ff32496859a694ba8..53aa4000f951277050a961788a9ad4d8a7180735 100644 (file)
--- a/media-gfx/fbida/ChangeLog
+++ b/media-gfx/fbida/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fbida
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.69 2010/03/05 19:08:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.70 2010/03/08 22:10:33 ssuominen Exp $
+
+  08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> fbida-2.07-r2.ebuild,
+  +files/fbida-2.07-libpng14.patch:
+  Fix building with libpng14.
 
 *fbida-2.07-r2 (05 Mar 2010)
 

diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index 5648e4990ecde6203f51ea20e07839b28f3611cb..931908e2df51636e1822a7dcf802474ad4cb3c28 100644 (file)
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -1,9 +1,10 @@
+AUX fbida-2.07-libpng14.patch 403 RMD160 b14a55a93a9e2c8b846aa040dbe66b5685799be6 SHA1 b0536b0896c5ec87fb3b57e38631464f85936a95 SHA256 3495f5e3fc640e6f2fd41e6586c80cb958f1c56aeb4b3c4de9906d88ce4e5160
 AUX ida-desktop.patch 453 RMD160 389f2b32fc2154a7c120447a72793a3b748cb59b SHA1 d06b70f2d581a1a3e9e0909b5af7f3f71ed54717 SHA256 51dabac02c6326e7f2d28db304f0b481cbcef7371807eb93618b2b5eb0104907
 AUX ida.png 11458 RMD160 3ebfaba3ae9219c3c840f5aa2a4be04065f28f49 SHA1 97da34d4e72ed004280d8c8416b2be5efb666c66 SHA256 57a21e900eb13c1a2b2d25e1dd78693e4fcf9fb86eef1138bf750f8a45819993
 DIST fbida-2.07-jpeg-7.patch.bz2 14334 RMD160 8dd34aa36ce6e8ba5d22ad93f15f15a049a91b39 SHA1 8745d82349df3c80bc3d3480e186b496fd9ae9c2 SHA256 5d464561f9259885bfcd6e66908283dd764585d13cf6dc378d9e08ffac34b32f
 DIST fbida-2.07-libjpeg-8a.patch.bz2 16001 RMD160 2cbb3c588259b2e41e696ad65ce715034acce92d SHA1 42f36ab3a73dcbc8dc929e4addbf72c81118561c SHA256 51f86a08161b6db7b88000d7c34e3d77d856b07d7b6757cb78161492a11d4d04
 DIST fbida-2.07.tar.gz 213622 RMD160 edd9174468e7c7e43b70b0364ac72655415b0c83 SHA1 4758178299e09d5251b9cf20337a81cc20553d45 SHA256 6510dee7c4f45cb63094d540e66aa39d53215c59f46944b8bb050c26b71bdb44
 EBUILD fbida-2.07-r1.ebuild 2490 RMD160 de038b8b27b6a00704d685bf5946abd4cd9ded09 SHA1 64384bb323f2f1d39ec8664cee3b830e5d139377 SHA256 2db8d30094c78c724d470a7e46ca5e539c0dd194d6107943e9919fecc762b063
-EBUILD fbida-2.07-r2.ebuild 2507 RMD160 ac22d8c422354d81b07fa938f4360619486fd8cd SHA1 4edc1937976148d990f88359485ba56e465088e1 SHA256 bdc4a2388c166f21de3c2273a32881b73c5df0aa4f76a82964ea1b26ec8df500
-MISC ChangeLog 8806 RMD160 1e026ec80eb717baec0ea01eead1ae9790b85779 SHA1 3ae7295c5cc8e70b62d40b3c7ac413c9f68a11f0 SHA256 a673f64ad2fdc767b0d764548da061d012bd249fb0f7c1302357b5587a304bb5
+EBUILD fbida-2.07-r2.ebuild 2535 RMD160 077af35ac6f496cd2ad2af976d8d8aac840a2846 SHA1 5e146b6632e2e4ae8d974f5df7305e4247cd1c1c SHA256 7d89da7b07c679b2a5c7b506019c02e864fec0bce895215285b102982fbf8860
+MISC ChangeLog 8949 RMD160 b5bbb3edcfc822b3c535ac631a663b7be7bfd1ec SHA1 0a54be9fb0d1b035eadbb7fe8ce27a6927ba4a50 SHA256 c1f89df728347d852dd7bcee03e9cbcf3bc815cc9cc96cc021ce9d0c91748a6f
 MISC metadata.xml 221 RMD160 90fef1dff5d0b3945073e90bb7ffec583ff1bbe8 SHA1 f35d1b1858e1223f4dc7b2c03fdf17e50091f1ca SHA256 fd573abb9cf89f320d00d1c107a25a46a5dfba633087d4179d0b8bd9aa539c8e

diff --git a/media-gfx/fbida/fbida-2.07-r2.ebuild b/media-gfx/fbida/fbida-2.07-r2.ebuild
index cc5149930c92c1b9dc574a2bb15bc40d27175184..05d4ea43892c7cd22c806eea13cc09ed1de8798b 100644 (file)
--- a/media-gfx/fbida/fbida-2.07-r2.ebuild
+++ b/media-gfx/fbida/fbida-2.07-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/media-gfx/fbida/fbida-2.07-r2.ebuild,v 1.2 2010/03/07 22:49:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.07-r2.ebuild,v 1.3 2010/03/08 22:10:33 ssuominen Exp $
 
 inherit eutils toolchain-funcs
 
@@ -47,8 +47,9 @@ src_unpack() {
                sed     -e 's/-Wno-pointer-sign//' -i "${S}/GNUmakefile"
        fi
 
-       epatch "${FILESDIR}/ida-desktop.patch"
-       epatch "${WORKDIR}/fbida-2.07-libjpeg-8a.patch"
+       epatch "${FILESDIR}"/ida-desktop.patch \
+               "${FILESDIR}"/${P}-libpng14.patch \
+               "${WORKDIR}"/${P}-libjpeg-8a.patch
 }
 
 src_compile() {

diff --git a/media-gfx/fbida/files/fbida-2.07-libpng14.patch b/media-gfx/fbida/files/fbida-2.07-libpng14.patch
new file mode 100644 (file)
index 0000000..354dc6e
--- /dev/null
+++ b/media-gfx/fbida/files/fbida-2.07-libpng14.patch
@@ -0,0 +1,11 @@
+--- rd/read-png.c
++++ rd/read-png.c
+@@ -69,7 +69,7 @@
+     if (h->color_type == PNG_COLOR_TYPE_PALETTE)
+       png_set_palette_to_rgb(h->png);
+     if (h->color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+-      png_set_gray_1_2_4_to_8(h->png);
++      png_set_expand_gray_1_2_4_to_8(h->png);
+ 
+     if (png_get_bKGD(h->png, h->info, &file_bg)) {
+       png_set_background(h->png,file_bg,PNG_BACKGROUND_GAMMA_FILE,1,1.0);