Fix build with libpng-1.5; thanks a lot to Samuli

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

5 files changed, 78 insertions, 24 deletions

diff --git a/sci-misc/gcam/ChangeLog b/sci-misc/gcam/ChangeLog
index 3414d7d5f737..e476d1561005 100644
--- a/sci-misc/gcam/ChangeLog
+++ b/sci-misc/gcam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-misc/gcam
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/gcam/ChangeLog,v 1.4 2012/01/08 18:38:00 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/gcam/ChangeLog,v 1.5 2012/01/08 19:17:32 dilfridge Exp $
+
+  08 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  gcam-2010.07.27.ebuild, +files/gcam-2010.07.27-libpng15.patch,
+  gcam-9999.ebuild:
+  Fix build with libpng-1.5; thanks a lot to Samuli
 
 *gcam-9999 (08 Jan 2012)
 
diff --git a/sci-misc/gcam/Manifest b/sci-misc/gcam/Manifest
index a250d8f332fb..213979c700f5 100644
--- a/sci-misc/gcam/Manifest
+++ b/sci-misc/gcam/Manifest
@@ -1,25 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX gcam-2010.07.27-libpng15.patch 1334 RMD160 dc3be28746ac5c97dd44e062414fc626af332e4d SHA1 2f4d304a5b2f51afe83e9d4abb74c2c4166e28a7 SHA256 ebade43b9934b73761c235d5141153637d0a7bc376351aa95b28a220865fb40c
 DIST gcam-2010.07.27.tar.gz 554771 RMD160 a2f412b3b09803963f2d74a5f828b0029369a596 SHA1 a007a1a5d528ec7f3513504242991fe399f0ba65 SHA256 9e4eaf1933aed72316c162b5fff86e00d5df1478fcebd65b9621e552a0a42ccf
-EBUILD gcam-2010.07.27.ebuild 489 RMD160 a2c93cc189830e320d01db5be1594e80ccde5b01 SHA1 e77c7ed3c0eff650da6e344d5b093c22d131a951 SHA256 a81810b5dcfb3e2f0fcce27686721fbc36c8d6db2555f2a957d06f554ef17d13
-EBUILD gcam-9999.ebuild 579 RMD160 57c73bd7b37b8cde3636f75ea67816a9390dddbe SHA1 29f9808d285dad23fe7c0f966517666962473ad9 SHA256 5e218f44eac5cdfc6feee471d54edb3e2eb490f8f3475134daf269da5521913c
-MISC ChangeLog 981 RMD160 1386019e330ba476dc5aebe8c5e20ecd59de2441 SHA1 64ec5910a2c7c87bc2239951d4d164b301578560 SHA256 943842737b88101ead02fe9d07237dee769c0f81f238a227f7a1a998803ec112
+EBUILD gcam-2010.07.27.ebuild 565 RMD160 8e4b469b8340d0831471515f4695ebeea39b0317 SHA1 fb94f4a379fcba5084cc923624c3ce10e4aeeb88 SHA256 4515f6f3533adf47eb0974c7434bdbd704b57fd04be14ca270a691dac128e5ef
+EBUILD gcam-9999.ebuild 667 RMD160 fa652d06ca55ab4cfb2d3ab7fd9448a2788cd770 SHA1 ff2cd915dbbcfdcf40198c2bd8affec84fd010fa SHA256 97293d084d513501a52ac2b56b847143495444dfd526ea0a5c7fd92a1a91ec2a
+MISC ChangeLog 1176 RMD160 65e2d03ad2c6d89aed6f22b40ac2b0db58b993eb SHA1 b962f12dca8906e53dfb6ba9c0b2d44240d835df SHA256 3f379c3273142695fd4e9cdaef09c3a3433bd5f9e4a4b3634eebe30cf4278cf1
 MISC metadata.xml 240 RMD160 df56d1c390e1beabf1737dce5d25d70f3985bf7e SHA1 d36ef1405e7e41455763d59862689b1c9face592 SHA256 ec9b410ee8cf3a1c2c3c615af2676e3894e70d92493f5ec128417e6439748277
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPCeLLAAoJENwGBM22xffewYUP/3JqSN1gDKBBfDW6joERr0+3
-sLk7CFkngwzZYk9jxTUJIpVmHIpdo7HasUV2n61y4JMUKHB72UTm3zYXrQ0qkQm/
-V1ZrMawn2qpg4hgn9L8v4/SYWkVQ/ZhaoSP4Okc3qGZNnbRDBHL+z7CMBz/74aTD
-rosAks1P8D+zGTVpWWEf/L7MHSMAsRniAIFWDQtilokBP2mCbMw9wcU3Wa5HraKp
-TExSvydAsGXS1A0kNmqyWD1pbfzIAKP0Tp6RMUf7irpFaHH2bWZwI1FiO4M1PqJ1
-HwMw/Sga9/JjkGeJQjJAOl15URdy6J69ccq+0KFn/BCe/SU9WBS+0DW57qRjt7h7
-Ful4rxvkp1f4Yz9/jZpXFgz7fsqGNl1qqjW6rNzGu6iQXVaL/Tjxe10L9j723pfH
-9L9BvaxjQjhBPIDPnSsdUXc+VNcbk+iQpQySRUPx5M7g87LPatsVVitr7We8+vRL
-Sc2GTGIcJRIMW+aN+HNTRF2jFRcvQbkbYn3MvAOMdJ/RQ8I1XOUdkWEBQJFwhoqr
-331jJemwlN8WUvFWqq6Wk1N+itEtdLBD4HCXmcQLNYBefvoJseHmRbUvkMdtH9Hn
-qYqJfEKTsa3UMb5cZpjgGBCYJW4WjLyGAIXr0Sa74dwNdNYPZmX+UWGRigeQxGYZ
-5DgN5k+rn9lgidvCdz6d
-=2B5U
+iQIcBAEBCgAGBQJPCewJAAoJENwGBM22xffeeF0P/jeoR+wLGvlvyXKG29LdKAAp
+NQqIgsOvnrAtpzJBFGRY5zRz/Z5K3pQ4trV6sAt5viTWYRy19+GZRej6HI0b9PN3
+ZlbRcpq2yFOpJBN3Uqyi3j3PKKszX+3T8YOV4IqmlSlbjZeVctkn+nNwu6Vu8ZA/
+gQ/5k8eHADoBpmS08m1fgc0ypIOl9aRGXoohGUcZD6wmRWfyyWzaAPDVaCL47lpq
+ujfyjcCKXAPLAeoLC6UbrilM4Fa9rfgGWthDgRv0P6w7jeiLbeSbf1wdmi4IHW3P
+ufUxV/tAsGzUv98cnRy/bSTCRdDk3gbe2aRf1X6kuHZf0zfL/ZcwuyxH9KETQ5Nb
+y88YQ70Pru5XtuEOr6MnWjk99hxtZJRFmUpMpQTU76/OVInyu1P6K4K7RJOMeNfW
+wFnK6dcsXemGepAjmPYpoU6WsCO3L9Dd3KmYHQMeWz9N3V8ESKuxeEdelufMx9y2
+2iLdudyF8zBNXa/MNsZdChslPupSanmFPHCiwGUIJnGXYI5XHWq+0PVm/XI4EoSi
+BYhdEqCoaCTBQh2zUkvWIsKtZPLqtJeLq7u8kimpFcz5f+WRFAXg+Bmoum5arUq4
+VzWZ3e+EFVd4CZ+cmoQl36cyKj/5IA7vmNgG9YzwftdBlbo6oTRnWZEDklT15oRR
+WfaaG5eIIEs1WsEEuQ/5
+=bisP
 -----END PGP SIGNATURE-----
diff --git a/sci-misc/gcam/files/gcam-2010.07.27-libpng15.patch b/sci-misc/gcam/files/gcam-2010.07.27-libpng15.patch
new file mode 100644
index 000000000000..92b117a377a9
--- /dev/null
+++ b/sci-misc/gcam/files/gcam-2010.07.27-libpng15.patch
@@ -0,0 +1,34 @@
+diff -ruN gcam-2010.07.27.orig/libgcode/gcode_image.c gcam-2010.07.27/libgcode/gcode_image.c
+--- gcam-2010.07.27.orig/libgcode/gcode_image.c	2010-07-23 17:15:13.000000000 +0200
++++ gcam-2010.07.27/libgcode/gcode_image.c	2012-01-08 20:07:35.000000000 +0100
+@@ -260,8 +260,8 @@
+ 
+   png_read_info (png_ptr, info_ptr);
+ 
+-  image->res[0] = info_ptr->width;
+-  image->res[1] = info_ptr->height;
++  image->res[0] = png_get_image_width(png_ptr, info_ptr);
++  image->res[1] = png_get_image_height(png_ptr, info_ptr);
+ 
+ /*  printf ("image size: %dx%d\n", image->res[0], image->res[1]); */
+ 
+@@ -274,16 +274,16 @@
+ 
+   row_pointers = (png_bytep *) malloc (sizeof (png_bytep) * image->res[1]);
+   for (y = 0; y < image->res[1]; y++)
+-    row_pointers[y] = (png_byte*) malloc (info_ptr->rowbytes);
++    row_pointers[y] = (png_byte*) malloc (png_get_rowbytes(png_ptr, info_ptr));
+ 
+   png_read_image (png_ptr, row_pointers);
+ 
+   image->dmap = (gfloat_t *) malloc (sizeof (gfloat_t) * image->res[0] * image->res[1]);
+ 
+   incr = 1;
+-  if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
++  if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_COLOR)
+     incr = 3;
+-  if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
++  if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA)
+     incr = 4;
+ 
+   for (y = 0; y < image->res[1]; y++)
diff --git a/sci-misc/gcam/gcam-2010.07.27.ebuild b/sci-misc/gcam/gcam-2010.07.27.ebuild
index 20dc44571736..ee30e8f62646 100644
--- a/sci-misc/gcam/gcam-2010.07.27.ebuild
+++ b/sci-misc/gcam/gcam-2010.07.27.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/gcam/gcam-2010.07.27.ebuild,v 1.3 2010/10/23 06:52:42 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/gcam/gcam-2010.07.27.ebuild,v 1.4 2012/01/08 19:17:32 dilfridge Exp $
 
 EAPI="1"
 
@@ -15,6 +15,13 @@ SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE=""
 
-DEPEND="x11-libs/gtk+:2
-	x11-libs/gtkglext"
+DEPEND="
+	>=media-libs/libpng-1.5
+	x11-libs/gtk+:2
+	x11-libs/gtkglext
+"
 RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-libpng15.patch"
+)
diff --git a/sci-misc/gcam/gcam-9999.ebuild b/sci-misc/gcam/gcam-9999.ebuild
index 9198116c953c..ff5b6142e5be 100644
--- a/sci-misc/gcam/gcam-9999.ebuild
+++ b/sci-misc/gcam/gcam-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/gcam/gcam-9999.ebuild,v 1.1 2012/01/08 18:38:00 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/gcam/gcam-9999.ebuild,v 1.2 2012/01/08 19:17:32 dilfridge Exp $
 
 EAPI=4
 
@@ -17,10 +17,17 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="x11-libs/gtk+:2
-	x11-libs/gtkglext"
+DEPEND="
+	>=media-libs/libpng-1.5
+	x11-libs/gtk+:2
+	x11-libs/gtkglext
+"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2010.07.27-libpng15.patch"
+)
+
 src_prepare() {
 	base_src_prepare
 	eautoreconf