Fix building with libpng14.

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

4 files changed, 63 insertions, 6 deletions

diff --git a/media-gfx/k3d/ChangeLog b/media-gfx/k3d/ChangeLog
index 22641c95c533..7db363425eb5 100644
--- a/media-gfx/k3d/ChangeLog
+++ b/media-gfx/k3d/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for media-gfx/k3d
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.49 2010/05/12 09:04:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.50 2010/05/12 09:42:59 ssuominen Exp $
 
   12 May 2010; Samuli Suominen <ssuominen@gentoo.org>
-  k3d-0.7.11.0-r1.ebuild:
-  Fix libpng detection wrt #319339 by Vladimir <v_2e AT ukr.net>.
+  k3d-0.7.11.0-r1.ebuild, +files/k3d-0.7.11.0-libpng14.patch:
+  Fix building with libpng14 wrt #319339 by Vladimir <v_2e AT ukr.net>.
 
   01 Jan 2010; Raúl Porcel <armin76@gentoo.org> k3d-0.6.7.0-r1.ebuild:
   Drop sparc keywords
diff --git a/media-gfx/k3d/Manifest b/media-gfx/k3d/Manifest
index 1572a9ec2589..eb79b352f62d 100644
--- a/media-gfx/k3d/Manifest
+++ b/media-gfx/k3d/Manifest
@@ -1,7 +1,8 @@
 AUX k3d-0.7.11.0-cuda.patch 1854 RMD160 084495d805cb368123c3c280e037e0a9e581aaa5 SHA1 4ef74b687b4a3d39c7db94e6fe3734680db2e650 SHA256 710a359506280d6f30c366923327ef0eee02646271f85d83e31acaa9b21fcecc
 AUX k3d-0.7.11.0-fix-potfiles.patch 640 RMD160 44508c7968befaced78d52d4e06e211adc83a754 SHA1 c9d50079825db508deb612dd416223c5b98fe705 SHA256 b86359e5597f8794cbad3f0ee6837bfbf3440ddc435eaed16487f79a3c20a244
 AUX k3d-0.7.11.0-gcc44.patch 2599 RMD160 c4951b932c1b3595acec30fe443fefb47d9cab4f SHA1 30a406600c59becb6b7513fc99abda390ae82143 SHA256 5e1f43a468bb3fd2d7f3e6d67323921df447b7b1d6538347cbc524d835a11df3
+AUX k3d-0.7.11.0-libpng14.patch 3080 RMD160 673fb089c8f12d30e2c1228d1533536f02f5bd48 SHA1 068bb0671d608cdc59f556011491685725a56360 SHA256 fd734bc3d83fef51170bf9ae00110c00c831c516ad210bbc2265a5d7f76a87ee
 DIST k3d-source-0.7.11.0.tar.gz 7692200 RMD160 41c31d12fe82e92be75a309660ed3811d1aa02df SHA1 cef63043c7bd8d7a130689e9b53d1023280e2978 SHA256 c6364cb9e989f2ac2412541c2a4368279b23e728822ab7e6b5390d579dd49008
-EBUILD k3d-0.7.11.0-r1.ebuild 2775 RMD160 8feff20d350391d7c3e922b01b48a11457d06903 SHA1 5a3053a58ae26aa55490c90e81b32729c860ddd6 SHA256 83145b5036bf9a42c8882ee9a6938c876b4e0ccdf19d52962aa54f3b6d28e472
-MISC ChangeLog 7432 RMD160 a2e1345a25982a276cc58217e7887814ffd2d97f SHA1 ece25b16addf6e19d83db039059760cb45f344af SHA256 7927e9e41e4808959c817c75f5e7495d3c6e7f60dc405180fc1245dbf733187d
+EBUILD k3d-0.7.11.0-r1.ebuild 2818 RMD160 159adb7688c655652cde292e774c54e8ab04443b SHA1 11d8b7319d4473310571e8d47746ce673fc33ef5 SHA256 0cbfb8d5589e68fffc43ccd20b52c6a8ef718158e7958cbc79fe9c9766346571
+MISC ChangeLog 7474 RMD160 58a464eb8c5fceb0afead8e07b0664b8ae08152c SHA1 85043042e218a817d3aa07726c978b16d87a92b8 SHA256 5f61dbfe0720574d9bcb86526a9d0b16485d2a3f782b168b705a251292667466
 MISC metadata.xml 418 RMD160 470739aba6d65cd70036df8262a1857af1fa8225 SHA1 5b2334bb5974077964501f07b7573096bdc322c5 SHA256 6c1e740795f5df8ebf35934c124b430673b33f723a162492889c9c4494baacc1
diff --git a/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch b/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch
new file mode 100644
index 000000000000..6396ffc156ee
--- /dev/null
+++ b/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch
@@ -0,0 +1,54 @@
+diff -ur k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp
+--- k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp	2009-03-19 22:28:53.000000000 +0200
++++ k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp	2010-05-12 12:21:50.000000000 +0300
+@@ -148,12 +148,12 @@
+         // allocate/initialize the image information data

+         _info_ptr = png_create_info_struct(_png_ptr);

+         if (_info_ptr == NULL) {

+-            png_destroy_read_struct(&_png_ptr,png_infopp_NULL,png_infopp_NULL);

++            png_destroy_read_struct(&_png_ptr,NULL,NULL);

+             io_error("png_get_file_size: fail to call png_create_info_struct()");

+         }

+         if (setjmp(png_jmpbuf(_png_ptr))) {

+             //free all of the memory associated with the png_ptr and info_ptr

+-            png_destroy_read_struct(&_png_ptr, &_info_ptr, png_infopp_NULL);

++            png_destroy_read_struct(&_png_ptr, &_info_ptr, NULL);

+             io_error("png_get_file_size: fail to call setjmp()");

+         }

+         png_init_io(_png_ptr, get());

+@@ -165,7 +165,7 @@
+     png_reader(const char* filename) : file_mgr(filename, "rb") { init(); }

+ 

+     ~png_reader() {

+-        png_destroy_read_struct(&_png_ptr,&_info_ptr,png_infopp_NULL);

++        png_destroy_read_struct(&_png_ptr,&_info_ptr,NULL);

+     }

+     point2<std::ptrdiff_t> get_dimensions() {

+         return point2<std::ptrdiff_t>(png_get_image_width(_png_ptr,_info_ptr),

+@@ -177,7 +177,7 @@
+         int bit_depth, color_type, interlace_type;

+         png_get_IHDR(_png_ptr, _info_ptr,

+                      &width, &height,&bit_depth,&color_type,&interlace_type,

+-                     int_p_NULL, int_p_NULL);

++                     (int *) NULL, (int *) NULL);

+         io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),

+                     "png_read_view: input view size does not match PNG file size");

+         

+@@ -219,7 +219,7 @@
+         int bit_depth, color_type, interlace_type;

+         png_get_IHDR(_png_ptr, _info_ptr,

+                      &width, &height,&bit_depth,&color_type,&interlace_type,

+-                     int_p_NULL, int_p_NULL);

++                     (int *) NULL, (int *) NULL);

+         io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),

+                     "png_reader_color_convert::apply(): input view size does not match PNG file size");

+         switch (color_type) {

+@@ -308,7 +308,7 @@
+         io_error_if(!_png_ptr,"png_write_initialize: fail to call png_create_write_struct()");

+         _info_ptr = png_create_info_struct(_png_ptr);

+         if (!_info_ptr) {

+-            png_destroy_write_struct(&_png_ptr,png_infopp_NULL);

++            png_destroy_write_struct(&_png_ptr,NULL);

+             io_error("png_write_initialize: fail to call png_create_info_struct()");

+         }

+         if (setjmp(png_jmpbuf(_png_ptr))) {

diff --git a/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild b/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild
index 6ab2d4748ef8..796a538aaebc 100644
--- a/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild
+++ b/media-gfx/k3d/k3d-0.7.11.0-r1.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/k3d/k3d-0.7.11.0-r1.ebuild,v 1.4 2010/05/12 09:04:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild,v 1.5 2010/05/12 09:42:59 ssuominen Exp $
 
 EAPI="2"
 
@@ -72,6 +72,8 @@ src_prepare() {
 		-e '/PKG_CHECK_MODULES/s:libpng12:libpng:' \
 		cmake/modules/K3DFindPNG.cmake || die
 
+	epatch "${FILESDIR}"/${P}-libpng14.patch
+
 	epatch "${FILESDIR}"/${P}-fix-potfiles.patch \
 		"${FILESDIR}"/${P}-cuda.patch \
 		"${FILESDIR}"/${P}-gcc44.patch