diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 19:17:34 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 19:17:34 +0000 |
| commit | 8f2ce6da409a4f8f0ac1dea04cebc5055a788fa0 (patch) | |
| tree | f0bb62c1aad560bd50b3409f67c67c5876f3b3c8 /media-libs/libafterimage | |
| parent | Marked ~x86-macos, bug #382049 (diff) | |
| download | gentoo-2-8f2ce6da409a4f8f0ac1dea04cebc5055a788fa0.tar.gz gentoo-2-8f2ce6da409a4f8f0ac1dea04cebc5055a788fa0.tar.bz2 gentoo-2-8f2ce6da409a4f8f0ac1dea04cebc5055a788fa0.zip | |
Fix building with libpng15 wrt #378523 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libafterimage')
| -rw-r--r-- | media-libs/libafterimage/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libafterimage/files/libafterimage-libpng15.patch | 31 | ||||
| -rw-r--r-- | media-libs/libafterimage/libafterimage-1.20.ebuild | 4 |
3 files changed, 39 insertions, 2 deletions
diff --git a/media-libs/libafterimage/ChangeLog b/media-libs/libafterimage/ChangeLog index 644ea0cdbf6c..cbea8237c97b 100644 --- a/media-libs/libafterimage/ChangeLog +++ b/media-libs/libafterimage/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libafterimage # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/ChangeLog,v 1.32 2011/08/28 17:51:11 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/ChangeLog,v 1.33 2011/09/14 19:17:34 ssuominen Exp $ + + 14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> + +files/libafterimage-libpng15.patch, libafterimage-1.20.ebuild: + Fix building with libpng15 wrt #378523 by Diego Elio Pettenò 28 Aug 2011; Fabian Groffen <grobian@gentoo.org> libafterimage-1.20.ebuild: Fix for Prefix, transfer Prefix keywords diff --git a/media-libs/libafterimage/files/libafterimage-libpng15.patch b/media-libs/libafterimage/files/libafterimage-libpng15.patch new file mode 100644 index 000000000000..44d5b944007c --- /dev/null +++ b/media-libs/libafterimage/files/libafterimage-libpng15.patch @@ -0,0 +1,31 @@ +--- export.c ++++ export.c +@@ -496,7 +496,7 @@ + png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL ); + if ( png_ptr != NULL ) + if( (info_ptr = png_create_info_struct(png_ptr)) != NULL ) +- if( setjmp(png_ptr->jmpbuf) ) ++ if( setjmp(png_jmpbuf(png_ptr)) ) + { + png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr); + info_ptr = NULL ; +--- import.c ++++ import.c +@@ -1251,7 +1251,7 @@ + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if ( !setjmp (png_ptr->jmpbuf)) ++ if ( !setjmp (png_jmpbuf(png_ptr))) + { + ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ; + +@@ -1468,7 +1468,7 @@ + + static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length) + { +- ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr; ++ ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr); + memcpy(data, buf->buffer, length); + buf->buffer += length; + } diff --git a/media-libs/libafterimage/libafterimage-1.20.ebuild b/media-libs/libafterimage/libafterimage-1.20.ebuild index 7460fa378786..1761c6895546 100644 --- a/media-libs/libafterimage/libafterimage-1.20.ebuild +++ b/media-libs/libafterimage/libafterimage-1.20.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/libafterimage-1.20.ebuild,v 1.3 2011/08/28 17:51:11 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/libafterimage-1.20.ebuild,v 1.4 2011/09/14 19:17:34 ssuominen Exp $ EAPI=3 inherit eutils autotools @@ -39,6 +39,8 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-config.patch # fix gif unbundle epatch "${FILESDIR}"/${PN}-gif.patch + # fix for libpng15 compability + epatch "${FILESDIR}"/${PN}-libpng15.patch # remove forced flags sed -i \ -e 's/CFLAGS="-O3"//' \ |