Fix building with libpng15 wrt #378417 by Diego Elio Pettenò

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

4 files changed, 57 insertions, 11 deletions

diff --git a/media-libs/glpng/ChangeLog b/media-libs/glpng/ChangeLog
index 0b2d36a8e884..3ec8fc696c27 100644
--- a/media-libs/glpng/ChangeLog
+++ b/media-libs/glpng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/glpng
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glpng/ChangeLog,v 1.9 2011/05/31 10:33:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glpng/ChangeLog,v 1.10 2011/08/09 18:02:07 ssuominen Exp $
+
+  09 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> glpng-1.45-r1.ebuild,
+  +files/glpng-1.45-libpng15.patch:
+  Fix building with libpng15 wrt #378417 by Diego Elio Pettenò
 
   31 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> glpng-1.45-r1.ebuild,
   metadata.xml:
diff --git a/media-libs/glpng/Manifest b/media-libs/glpng/Manifest
index f00a9dce70c4..325a8a11de23 100644
--- a/media-libs/glpng/Manifest
+++ b/media-libs/glpng/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX glpng-1.45-libpng15.patch 1239 RMD160 040c7863912e2fc32a9fae2c18580e2b792728a3 SHA1 5fda7d2f585d05b3f93cb413d826ec661e3c35d2 SHA256 50e837797c57864a9069299e95550478f592dc791e5493ca58f9d9a04f05d5ac
 DIST glpng-1.45.tar.bz2 64426 RMD160 994ffa788e3a7ebc314c56160c36496e39a12958 SHA1 7644769957d597032480e2d70d39f44b26c2b512 SHA256 a002aa60f460b0f363267d10c79c730b9dba4c834d0ee43eac15460c2e05f2e8
-EBUILD glpng-1.45-r1.ebuild 737 RMD160 a484fb27b4f362ab3b0086de014c4e0264d4818f SHA1 33b85dad2088cb7e7219e3af12dad8a93c6736c3 SHA256 a0830c2e9a7798009c5741095d3392f491566be3dc23ed9d9a2dc90dc08e3dbb
-MISC ChangeLog 1608 RMD160 1d1a64b9ed38e0a9da1a5108655442bbbe2674ef SHA1 bf4fa0f88f1f7a22e1274c18aee94b19181c9db1 SHA256 8d323a43fe22d75cd5872e1eab526a1fde313ac401cdd3171fdf3d06c2cbe89c
+EBUILD glpng-1.45-r1.ebuild 766 RMD160 6c703859ffad05fa3f6205b176f662e3d491fbb2 SHA1 b4ab63f17ac01cb2c6c6b08414e274548b56c3d0 SHA256 dbf8433d255ed930ba218fb5cd23739943290271537ba3a319850a1567f728fd
+MISC ChangeLog 1786 RMD160 c2571d79d2d95e6cf050d00a906ecafb509f9c5a SHA1 fc207813050c898020b35fa702774da195cd3f05 SHA256 715239c9b62fabd8bb64ef9617637ba00823598674ec2b3bd84f2ecb1a238b5b
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3kw+YACgkQHB6c3gNBRYehlQCcDnl6GbpskZWbR/YP5fBxbzek
-1xAAn07BSw8zuJ20+aMUwqiCDD1tUOWa
-=stvn
+iF4EAREIAAYFAk5BdhYACgkQXkR9YqOcLPGxvgEAh2rGp0PP1hHsQhNNV/iIDdPV
++3OpURiggEB1wpX00QoBAJwj5nNEqYvAsJw00bxdTSjnlQ1t1OETmdM7yUCEfdJH
+=z2iI
 -----END PGP SIGNATURE-----
diff --git a/media-libs/glpng/files/glpng-1.45-libpng15.patch b/media-libs/glpng/files/glpng-1.45-libpng15.patch
new file mode 100644
index 000000000000..06a3e9e0f508
--- /dev/null
+++ b/media-libs/glpng/files/glpng-1.45-libpng15.patch
@@ -0,0 +1,40 @@
+--- include/GL/glpng.h
++++ include/GL/glpng.h
+@@ -57,7 +57,7 @@
+ #define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS

+ 
+ /* Transparency parameters */

+-#define PNG_CALLBACK  -3 /* Call the callback function to generate alpha   */
++#define PNG_CALLBACKT  -3 /* Call the callback function to generate alpha   */
+ #define PNG_ALPHA     -2 /* Use alpha channel in PNG file, if there is one */
+ #define PNG_SOLID     -1 /* No transparency                                */
+ #define PNG_STENCIL    0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise       */
+--- src/glpng.c
++++ src/glpng.c
+@@ -276,7 +276,7 @@
+ 	endinfo = png_create_info_struct(png);
+ 
+ 	// DH: added following lines
+-	if (setjmp(png->jmpbuf))
++	if (setjmp(png_jmpbuf(png)))
+ 	{
+ 		png_destroy_read_struct(&png, &info, &endinfo);
+ 		return 0;
+@@ -380,7 +380,7 @@
+ 	endinfo = png_create_info_struct(png);
+ 
+ 	// DH: added following lines
+-	if (setjmp(png->jmpbuf))
++	if (setjmp(png_jmpbuf(png)))
+ 	{
+ 		png_destroy_read_struct(&png, &info, &endinfo);
+ 		return 0;
+@@ -559,7 +559,7 @@
+ 			#define ALPHA *q
+ 
+ 			switch (trans) {
+-				case PNG_CALLBACK:
++				case PNG_CALLBACKT:
+ 					FORSTART
+ 						ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b);
+ 					FOREND
diff --git a/media-libs/glpng/glpng-1.45-r1.ebuild b/media-libs/glpng/glpng-1.45-r1.ebuild
index 2a2daaf462ea..998f90f9a03c 100644
--- a/media-libs/glpng/glpng-1.45-r1.ebuild
+++ b/media-libs/glpng/glpng-1.45-r1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glpng/glpng-1.45-r1.ebuild,v 1.8 2011/05/31 10:33:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glpng/glpng-1.45-r1.ebuild,v 1.9 2011/08/09 18:02:07 ssuominen Exp $
 
 EAPI=4
-
-inherit cmake-utils multilib
+inherit cmake-utils eutils multilib
 
 DESCRIPTION="An OpenGL png image library"
 HOMEPAGE="http://www.fifi.org/doc/libglpng-dev/glpng.html"
@@ -21,8 +20,10 @@ RDEPEND="virtual/opengl
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+
 	# fix libdir placement
 	sed -i \
 		-e "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR $(get_libdir):g"\
-		"${S}"/CMakeLists.txt || die "sed failed"
+		CMakeLists.txt || die
 }