diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-14 14:55:53 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-14 14:55:53 +0000 |
| commit | 41eb5e3cd82d16d7eb35a93531301b39ff780f40 (patch) | |
| tree | 6d443ffcfbca77204f6b9e68c69a80a0f9637324 /dev-libs/DirectFB | |
| parent | Automated update of use.local.desc (diff) | |
| download | gentoo-2-41eb5e3cd82d16d7eb35a93531301b39ff780f40.tar.gz gentoo-2-41eb5e3cd82d16d7eb35a93531301b39ff780f40.tar.bz2 gentoo-2-41eb5e3cd82d16d7eb35a93531301b39ff780f40.zip | |
Fix building with libpng14 wrt #309303 by Peter Alfredsen.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/DirectFB')
| -rw-r--r-- | dev-libs/DirectFB/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/DirectFB/DirectFB-1.4.3.ebuild | 6 | ||||
| -rw-r--r-- | dev-libs/DirectFB/files/DirectFB-1.4.3-libpng14.patch | 42 |
3 files changed, 52 insertions, 2 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/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 ); + |