Fix building with libpng15 wrt #355893 by Mike Frysinger

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

4 files changed, 237 insertions, 12 deletions

diff --git a/media-gfx/enblend/ChangeLog b/media-gfx/enblend/ChangeLog
index 836fe451497a..d1d5ea2b22aa 100644
--- a/media-gfx/enblend/ChangeLog
+++ b/media-gfx/enblend/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/enblend
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.44 2010/11/08 22:05:28 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.45 2011/08/07 15:56:20 ssuominen Exp $
+
+  07 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> enblend-4.0.ebuild,
+  +files/enblend-4.0-libpng15.patch:
+  Fix building with libpng15 wrt #355893 by Mike Frysinger
 
   08 Nov 2010; Markus Meier <maekke@gentoo.org> enblend-4.0.ebuild:
   change jpeg dep to virtual/jpeg
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index e808210f799c..6ecec17b91f1 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX enblend-4.0-libpng14.patch 625 RMD160 3045da81a10c6b5dc87ebe33ba74c5f96d9b11c8 SHA1 84bdbcfb700659ef51774b88d54f753fae56e605 SHA256 814dcb17d2e4d9d246ddeb7d6f477a0dcfa388af73d7fe004d8eb42f044c47c4
+AUX enblend-4.0-libpng15.patch 9442 RMD160 44f4ada76162ffabff5a81988c1c282316ca2080 SHA1 71e961d90be842eafe9d473d8d70b04b29077036 SHA256 05350a8dd5810a2940d65975af4b121375bc49dcb09a9fc36111aaf8ada02a3b
 DIST enblend-enfuse-4.0.tar.gz 1047295 RMD160 2a9968f2060077f6408d86de2d0cf07258f13abb SHA1 6ae102e7d15529168bf8ec3077062fbc87d6712f SHA256 fe42f41dc35bf4abb2a33623976593788717fff66a6ff048b7f8a3cb70b113b2
-EBUILD enblend-4.0.ebuild 1915 RMD160 de4397d0f82b9a4898bae33331402cfeebd32f0c SHA1 80e8253a185a3337498764c453a296e6a1d14fdc SHA256 93bcb74d6f17319771be90a659b56a58902834d5c01644a7971be5f4bee14a5b
-MISC ChangeLog 5863 RMD160 1af3c893cf31d2e47426b8b1373b9f9111eb20f7 SHA1 92cf08eb3927e16ebc9f15ba3daa42bee7d216f9 SHA256 2be8cf010c03b1d1a22a6bf5f210fe03f167b12d67635708dceb33ba5a629fa3
+EBUILD enblend-4.0.ebuild 1922 RMD160 da7a924c169c39384a8bd3c2e4ec42bd06fa3298 SHA1 54f2c537841156396bf88a166e06a3b1a285c264 SHA256 e95fda292b62908e9e2c203bbd50cff360d275e185a7d1313c8029245e2ba3cd
+MISC ChangeLog 6037 RMD160 863822c41cd5106965e9d4624a39827edd73f47c SHA1 52bd071dd73d8ef1c73d9a43b99a2fb561d995f0 SHA256 bfbc7fae7e1df891a0cd8ed452be440d7d463323b43fd298109c4e41bd0f97c7
 MISC metadata.xml 298 RMD160 56230140606e9654db65297324c309b3186b6983 SHA1 193c9e2a2264a47824431aaf9ca43ae225d2ad2c SHA256 5d3fcb04b17733010c038cd4b18d4fff78a7ca252ebf3610ecdf353f7dce76f3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkzYdGcACgkQkKaRLQcq0GIuBgCfUPEPYGGufMW+ZHqokgfk8tSt
-fOcAni6wlmhapKLWILFwh0mkF3XXM412
-=Cepp
+iF4EAREIAAYFAk4+tNwACgkQXkR9YqOcLPGHJwD/ZCgjidLaPYGbVR/lkfOud8hS
+7AK3tK5/MuX3MOCQ9PYA/27KCLqDONc07jX6higVYUZWsGpZ9LdBPc4fH0hisuVL
+=F3GR
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/enblend/enblend-4.0.ebuild b/media-gfx/enblend/enblend-4.0.ebuild
index e989c44429c0..a77f1b810d62 100644
--- a/media-gfx/enblend/enblend-4.0.ebuild
+++ b/media-gfx/enblend/enblend-4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.0.ebuild,v 1.8 2010/11/08 22:05:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.0.ebuild,v 1.9 2011/08/07 15:56:20 ssuominen Exp $
 
 EAPI=2
 
@@ -43,7 +43,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng14.patch
+	epatch "${FILESDIR}"/${P}-libpng1{4,5}.patch
 }
 
 src_configure() {
diff --git a/media-gfx/enblend/files/enblend-4.0-libpng15.patch b/media-gfx/enblend/files/enblend-4.0-libpng15.patch
new file mode 100644
index 000000000000..d4465ccad4a0
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.0-libpng15.patch
@@ -0,0 +1,220 @@
+--- src/vigra_impex/png.cxx
++++ src/vigra_impex/png.cxx
+@@ -81,7 +81,7 @@
+ static void PngError( png_structp png_ptr, png_const_charp error_msg )
+ {
+     png_error_message = std::string(error_msg);
+-    longjmp( png_ptr->jmpbuf, 1 );
++    longjmp( png_jmpbuf( png_ptr ), 1 );
+ }
+ 
+ // called on non-fatal errors
+@@ -213,7 +213,7 @@
+         vigra_postcondition( png != 0, "could not create the read struct." );
+ 
+         // create info struct
+-        if (setjmp(png->jmpbuf)) {
++        if (setjmp(png_jmpbuf( png ))) {
+             png_destroy_read_struct( &png, &info, NULL );
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() );
+         }
+@@ -221,14 +221,14 @@
+         vigra_postcondition( info != 0, "could not create the info struct." );
+ 
+         // init png i/o
+-        if (setjmp(png->jmpbuf)) {
++        if (setjmp(png_jmpbuf( png ))) {
+             png_destroy_read_struct( &png, &info, NULL );
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
+         }
+         png_init_io( png, file.get() );
+ 
+         // specify that the signature was already read
+-        if (setjmp(png->jmpbuf)) {
++        if (setjmp(png_jmpbuf( png ))) {
+             png_destroy_read_struct( &png, &info, NULL );
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() );
+         }
+@@ -244,13 +244,13 @@
+     void PngDecoderImpl::init()
+     {
+         // read all chunks up to the image data
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() );
+         png_read_info( png, info );
+ 
+         // pull over the header fields
+         int interlace_method, compression_method, filter_method;
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() );
+         png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type,
+                       &interlace_method, &compression_method, &filter_method );
+@@ -264,7 +264,7 @@
+ 
+         // transform palette to rgb
+         if ( color_type == PNG_COLOR_TYPE_PALETTE) {
+-            if (setjmp(png->jmpbuf))
++            if (setjmp(png_jmpbuf( png )))
+                 vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() );
+             png_set_palette_to_rgb(png);
+             color_type = PNG_COLOR_TYPE_RGB;
+@@ -273,7 +273,7 @@
+ 
+         // expand gray values to at least one byte size
+         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
+-            if (setjmp(png->jmpbuf))
++            if (setjmp(png_jmpbuf( png )))
+                 vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
+             png_set_expand_gray_1_2_4_to_8(png);
+             bit_depth = 8;
+@@ -283,7 +283,7 @@
+ #if 0
+         // strip alpha channel
+         if ( color_type & PNG_COLOR_MASK_ALPHA ) {
+-            if (setjmp(png->jmpbuf))
++            if (setjmp(png_jmpbuf( png )))
+                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() );
+             png_set_strip_alpha(png);
+             color_type ^= PNG_COLOR_MASK_ALPHA;
+@@ -323,12 +323,12 @@
+ 
+         // read icc profile
+ #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
+-        char * dummyName;
++        png_charpp dummyName;
+         int dummyCompType;
+-        char * profilePtr;
++        png_bytepp profilePtr;
+         png_uint_32 profileLen;
+-        if (info->valid & PNG_INFO_iCCP) {
+-            png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
++        if (png_get_valid(png, info, PNG_INFO_iCCP)) {
++            png_get_iCCP(png, info, dummyName, &dummyCompType, profilePtr, &profileLen) ;
+             iccProfilePtr = (unsigned char *) profilePtr;
+             iccProfileLength = profileLen;
+         }
+@@ -340,7 +340,7 @@
+         // image gamma
+         double image_gamma = 0.45455;
+         if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) {
+-            if (setjmp(png->jmpbuf))
++            if (setjmp(png_jmpbuf( png )))
+                 vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() );
+             png_get_gAMA( png, info, &image_gamma );
+         }
+@@ -349,26 +349,26 @@
+         double screen_gamma = 2.2;
+ 
+         // set gamma correction
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() );
+         png_set_gamma( png, screen_gamma, image_gamma );
+ #endif
+ 
+         // interlace handling, get number of read passes needed
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str());
+         n_interlace_passes = png_set_interlace_handling(png);
+ 
+         // update png library state to reflect any changes that were made
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() );
+         png_read_update_info( png, info );
+ 
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str());
+         n_channels = png_get_channels(png, info);
+ 
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str());
+         rowsize = png_get_rowbytes(png, info);
+ 
+@@ -379,7 +379,7 @@
+     void PngDecoderImpl::nextScanline()
+     {
+         for (int i=0; i < n_interlace_passes; i++) {
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+                 vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
+             png_read_row(png, row_data.begin(), NULL);
+         }
+@@ -545,7 +545,7 @@
+         vigra_postcondition( png != 0, "could not create the write struct." );
+ 
+         // create info struct
+-        if (setjmp(png->jmpbuf)) {
++        if (setjmp(png_jmpbuf( png ))) {
+             png_destroy_write_struct( &png, &info );
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() );
+         }
+@@ -556,7 +556,7 @@
+         }
+ 
+         // init png i/o
+-        if (setjmp(png->jmpbuf)) {
++        if (setjmp(png_jmpbuf( png ))) {
+             png_destroy_write_struct( &png, &info );
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
+         }
+@@ -571,7 +571,7 @@
+     void PngEncoderImpl::finalize()
+     {
+         // write the IHDR
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() );
+         png_set_IHDR( png, info, width, height, bit_depth, color_type,
+                       PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
+@@ -579,7 +579,7 @@
+ 
+         // set resolution
+         if (x_resolution > 0 && y_resolution > 0) {
+-            if (setjmp(png->jmpbuf))
++            if (setjmp(png_jmpbuf( png )))
+                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() );
+             png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5),
+                          (png_uint_32) (y_resolution / 0.0254 + 0.5),
+@@ -588,7 +588,7 @@
+ 
+         // set offset
+         if (position.x > 0 && position.y > 0) {
+-            if (setjmp(png->jmpbuf))
++            if (setjmp(png_jmpbuf( png )))
+                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() );
+             png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL);
+         }
+@@ -597,12 +597,12 @@
+         // set icc profile
+         if (iccProfile.size() > 0) {
+             png_set_iCCP(png, info, "icc", 0,
+-                         (char *)iccProfile.begin(), iccProfile.size());
++                         iccProfile.begin(), iccProfile.size());
+         }
+ #endif
+ 
+         // write the info struct
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() );
+         png_write_info( png, info );
+ 
+@@ -634,10 +634,10 @@
+         }
+ 
+         // write the whole image
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() );
+         png_write_image( png, row_pointers.begin() );
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() );
+         png_write_end(png, info);
+     }