Fix building with libpng14 wrt #309303 by Peter Alfredsen.

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

4 files changed, 55 insertions, 14 deletions

diff --git a/dev-libs/DirectFB/ChangeLog b/dev-libs/DirectFB/ChangeLog
index cd18c946dcb3..64e6df938284 100644
--- a/dev-libs/DirectFB/ChangeLog
+++ b/dev-libs/DirectFB/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/DirectFB
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.97 2010/01/16 05:21:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.98 2010/03/14 14:55:52 ssuominen Exp $
+
+  14 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> DirectFB-1.4.3.ebuild,
+  +files/DirectFB-1.4.3-libpng14.patch:
+  Fix building with libpng14 wrt #309303 by Peter Alfredsen.
 
 *DirectFB-1.4.3 (16 Jan 2010)
 
diff --git a/dev-libs/DirectFB/DirectFB-1.4.3.ebuild b/dev-libs/DirectFB/DirectFB-1.4.3.ebuild
index 96a106b63472..e5f17a6cd7cc 100644
--- a/dev-libs/DirectFB/DirectFB-1.4.3.ebuild
+++ b/dev-libs/DirectFB/DirectFB-1.4.3.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-libs/DirectFB/DirectFB-1.4.3.ebuild,v 1.1 2010/01/16 05:21:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-1.4.3.ebuild,v 1.2 2010/03/14 14:55:52 ssuominen Exp $
 
 inherit eutils toolchain-funcs
 
@@ -52,6 +52,10 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-1.2.0-headers.patch
 	epatch "${FILESDIR}"/${PN}-1.1.1-pkgconfig.patch
 
+	# info_ptr->trans_alpha might be no-go with libpng12
+	has_version ">=media-libs/libpng-1.4" && epatch \
+		"${FILESDIR}"/${P}-libpng14.patch
+
 	# Avoid invoking `ld` directly #300779
 	find -name Makefile.in -exec sed -i \
 		'/[$](LD)/s:$(LD) -o $@ -r:$(CC) $(CFLAGS) -Wl,-r -nostdlib -o $@:' {} +
diff --git a/dev-libs/DirectFB/Manifest b/dev-libs/DirectFB/Manifest
index 7ece29ad98e3..484a21433399 100644
--- a/dev-libs/DirectFB/Manifest
+++ b/dev-libs/DirectFB/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX DirectFB-1.1.1-pkgconfig.patch 637 RMD160 b560f0cb45ab3e8938bce474f1331562ba3a96a1 SHA1 aa202a8452f48f1a8ce087201bcc26ef17c97faa SHA256 f824293e1ae8ed2e632ba0196cf760459006a1e110abac348476b3982a0db036
 AUX DirectFB-1.2.0-headers.patch 430 RMD160 a783b9d0169241d92504ceb9a41545afa986384a SHA1 78f0b76da583702e730fed19288eb5b94be996f2 SHA256 f1c3c6f420ca7864435d8c69a80c239c4ff9ed6d46ac9ba14b59c6ffa6970b45
 AUX DirectFB-1.2.7-CFLAGS.patch 430 RMD160 814bb14c60732dab762303e8a6d356bc59950424 SHA1 5b9e3220493f182ceb0b13747e8199cf0f82c319 SHA256 8b1520f87b5ece3d3694cc1fd5b7bb943ab746a55d423b4593213be2b3bd13e7
+AUX DirectFB-1.4.3-libpng14.patch 1904 RMD160 c42b7be4ad69f5f3cccfb0517455df43b63a0365 SHA1 c2afe436c3d974a62922348e70647fa087a15991 SHA256 ed36a732e87686bcc0b326aa5bf3effdd2068bfc6856a5f701140578a7eaa49b
 DIST DirectFB-1.4.2.tar.gz 2900292 RMD160 44ead9b32a2583b79690b1cc1536a4df17361078 SHA1 29a5e5a82b1a9e2cbfe31af127a54767fffae975 SHA256 051847e21e88a9c32ee78f8920014602d8b21928602075c5266433cd58addbc6
 DIST DirectFB-1.4.3.tar.gz 2898215 RMD160 9dfedcebe7fa59a821754a51308d8927269b5276 SHA1 935ef75b4a9f682e41fc68c887d72dca1fe32875 SHA256 1435aae4f0eb70252dc25ee50e51aecfdc4527f2651db5f35b34eb833fa7e978
 EBUILD DirectFB-1.4.2.ebuild 4435 RMD160 86fad639857600cc317f225c09051a9e1b61b273 SHA1 51ea60c820a81b11c175cbaa5b98cebb04e8a5af SHA256 c3857b4865622a9198a441b726ac6d9abc2783e987ee37f54b13d7d21ab8aff4
-EBUILD DirectFB-1.4.3.ebuild 4643 RMD160 734f59046e16dfb2c92b9522268bf8abd5ef1d50 SHA1 028f46ac8bb0db1197261985905124f63ab2317c SHA256 8b2c7ea51fed57c844a81e1c05a93c3f214ac7c0cad65e2ff64e2eaa2949cb44
-MISC ChangeLog 13926 RMD160 d1179c9e0ed10fdaee1b661ec1f94042f6beb30b SHA1 9eb92f47129a3cd1025a3c1933abb13af1fd4657 SHA256 57b76387b730339d22e083d561e05ceae9b8ab55c7b907c900a69865e05e8150
+EBUILD DirectFB-1.4.3.ebuild 4788 RMD160 3115edc0dc0f000a813f957f81f384769f147c9f SHA1 47060e60042047ced06950f5a9117faff6fd5e6f SHA256 4ea0a56d828d7e69df9a66f1372e655b3d618cce2bba43f64bae9bad93dbdb09
+MISC ChangeLog 14108 RMD160 554d74f82332055eaf6d4ab8609c929c2b8eaedb SHA1 99197caaff8d00b7bcedce0037725ff7e2af27e1 SHA256 f1609ed7e191f8ec03aa64a24eadd0bc4257e8308501a38f8a7619429780eec2
 MISC metadata.xml 874 RMD160 602100ad1d1d3d5882f64144024636eea56a89a9 SHA1 35a43722612b96313f79c7d431c00068eef6cc95 SHA256 81a0a55f0059aa1f51089edadd145016aa6f2c0dfd986bea718afb4e9900860f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iF4EAREIAAYFAktRTNUACgkQTwhj9JtAlp6s/wD/SYD+DgSiamDRwPOUB+XKuvm+
-ZMW0jwoHqrrtu4rSAsMA/0WZl5nbrGAdsDQLlzs8IjKWsQxQh5HY6JgFxKeQBd9t
-=JCaW
------END PGP SIGNATURE-----
diff --git a/dev-libs/DirectFB/files/DirectFB-1.4.3-libpng14.patch b/dev-libs/DirectFB/files/DirectFB-1.4.3-libpng14.patch
new file mode 100644
index 000000000000..97f28b6be1ae
--- /dev/null
+++ b/dev-libs/DirectFB/files/DirectFB-1.4.3-libpng14.patch
@@ -0,0 +1,42 @@
+http://repos.archlinux.org/wsvn/community/directfb/trunk/libpng-1.4.patch
+
+--- interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
++++ interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
+@@ -168,7 +168,7 @@
+ static DFBResult
+ Probe( IDirectFBImageProvider_ProbeContext *ctx )
+ {
+-     if (png_check_sig( ctx->header, 8 ))
++     if (!png_sig_cmp( ctx->header, 0, 8 ))
+           return DFB_OK;
+ 
+      return DFB_UNSUPPORTED;
+--- interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
++++ interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
+@@ -653,7 +653,7 @@
+           if (data->color_type == PNG_COLOR_TYPE_PALETTE) {
+                u32        key;
+                png_colorp palette    = data->info_ptr->palette;
+-               png_bytep  trans      = data->info_ptr->trans;
++               png_bytep  trans      = data->info_ptr->trans_alpha;
+                int        num_colors = MIN( MAXCOLORMAPSIZE,
+                                             data->info_ptr->num_palette );
+                u8         cmap[3][num_colors];
+@@ -678,7 +678,7 @@
+           }
+           else {
+                /* ...or based on trans rgb value */
+-               png_color_16p trans = &data->info_ptr->trans_values;
++               png_color_16p trans = &data->info_ptr->trans_color;
+ 
+                data->color_key = (((trans->red & 0xff00) << 8) |
+                                   ((trans->green & 0xff00)) |
+@@ -689,7 +689,7 @@
+      switch (data->color_type) {
+           case PNG_COLOR_TYPE_PALETTE: {
+                png_colorp palette    = data->info_ptr->palette;
+-               png_bytep  trans      = data->info_ptr->trans;
++               png_bytep  trans      = data->info_ptr->trans_alpha;
+                int        num_trans  = data->info_ptr->num_trans;
+                int        num_colors = MIN( MAXCOLORMAPSIZE, data->info_ptr->num_palette );
+