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

(Portage version: 2.2.0_alpha50/cvs/Linux x86_64)

3 files changed, 50 insertions, 5 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/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
 }