diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-08 22:10:33 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-08 22:10:33 +0000 |
| commit | 016c01accebcdf9e0cd9a32b768a8a58bd50d6b7 (patch) | |
| tree | d7dcb645eb54f142de4aafc6099a6268e1333a24 /media-gfx/fbida | |
| parent | x11-drivers/xf86-video-nv-2.1.17 version bump (diff) | |
| download | gentoo-2-016c01accebcdf9e0cd9a32b768a8a58bd50d6b7.tar.gz gentoo-2-016c01accebcdf9e0cd9a32b768a8a58bd50d6b7.tar.bz2 gentoo-2-016c01accebcdf9e0cd9a32b768a8a58bd50d6b7.zip | |
Fix building with libpng14.
(Portage version: 2.2_rc65/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/fbida')
| -rw-r--r-- | media-gfx/fbida/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/fbida/fbida-2.07-r2.ebuild | 7 | ||||
| -rw-r--r-- | media-gfx/fbida/files/fbida-2.07-libpng14.patch | 11 |
3 files changed, 20 insertions, 4 deletions
diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog index c85f1b853465..53aa4000f951 100644 --- 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/fbida-2.07-r2.ebuild b/media-gfx/fbida/fbida-2.07-r2.ebuild index cc5149930c92..05d4ea43892c 100644 --- 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 index 000000000000..354dc6e98817 --- /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); |