Fix building with libpng14 wrt #319159 by Xavier Parizet.

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

4 files changed, 126 insertions, 8 deletions

diff --git a/media-plugins/gst-plugins-gl/ChangeLog b/media-plugins/gst-plugins-gl/ChangeLog
index 65f4f16056bf..b71e4d7185ba 100644
--- a/media-plugins/gst-plugins-gl/ChangeLog
+++ b/media-plugins/gst-plugins-gl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/gst-plugins-gl
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gl/ChangeLog,v 1.1 2009/10/30 18:49:53 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gl/ChangeLog,v 1.2 2010/05/10 16:27:24 ssuominen Exp $
+
+  10 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  gst-plugins-gl-0.10.1.ebuild, +files/gst-plugins-gl-0.10.1-libpng14.patch:
+  Fix building with libpng14 wrt #319159 by Xavier Parizet.
 
 *gst-plugins-gl-0.10.1 (30 Oct 2009)
 
diff --git a/media-plugins/gst-plugins-gl/Manifest b/media-plugins/gst-plugins-gl/Manifest
index f1061a9b4c58..01c020e8c104 100644
--- a/media-plugins/gst-plugins-gl/Manifest
+++ b/media-plugins/gst-plugins-gl/Manifest
@@ -1,4 +1,5 @@
+AUX gst-plugins-gl-0.10.1-libpng14.patch 3948 RMD160 579bc73826f04cc075ca2dc278e782d2630eea99 SHA1 02c907ae0cbb6fc8e3372f7d7718e235f1e8737a SHA256 92c0999b7d24f61b046fa0a103605d14c372b276d2dc8aed583cb1c8f15caa77
 DIST gst-plugins-gl-0.10.1.tar.bz2 630294 RMD160 52c26bcfe5a95e275de525de14c4957a2257621e SHA1 453261930e9c1e8eb53bb2e39e61be30221329cb SHA256 4a88d15267eaf0ad144127bdc64083f109bc6603156813637f21fd5ae09a97b0
-EBUILD gst-plugins-gl-0.10.1.ebuild 1117 RMD160 24c2731ed4f13864eb6a25d049f8daffca0293a8 SHA1 d83db7d6673f5880a4d1de1da5b00194b3759f9b SHA256 04bd7cd0f84da32ec3a59c7c35352e65177c29e5162d88eea4b7778559b57e6e
-MISC ChangeLog 388 RMD160 4d2270f1d3fb119e92247754447bc4fec49cff4a SHA1 322d79f25e117a64a50c36cb1c4c3bd0351e7a26 SHA256 37c96cc4ad87ae934c45c94376ecba99efee6a939a0b317b78052292127c6f60
+EBUILD gst-plugins-gl-0.10.1.ebuild 1287 RMD160 54c4e01b5033e1510fdf91b390a33bc461192d9a SHA1 e393923c1272e4a297342964527d48c0d6299156 SHA256 f34d983e8c44370417ce0e06fb0e877e2179e967518062159bcc33f7f3ef5cac
+MISC ChangeLog 580 RMD160 92f17895106def743b00fca6ad3fb44f066d38ff SHA1 1094d4c0728405544fadd50288fccd5fc95d3433 SHA256 e683509d45a36a584ddb661fd5cd126a7e40a9a0625c56bcb8d6537daef4ff45
 MISC metadata.xml 162 RMD160 c6078d82a9ff46dbb283bc14ade9d117144cca67 SHA1 f46f8ccd62374b17183b5aca523c4dcf60d718f9 SHA256 3ac891ee23de8c6e2bef32e0c7aa3e6607e808de76ed723fbe7a1fb92f6093f1
diff --git a/media-plugins/gst-plugins-gl/files/gst-plugins-gl-0.10.1-libpng14.patch b/media-plugins/gst-plugins-gl/files/gst-plugins-gl-0.10.1-libpng14.patch
new file mode 100644
index 000000000000..c753c91cdb95
--- /dev/null
+++ b/media-plugins/gst-plugins-gl/files/gst-plugins-gl-0.10.1-libpng14.patch
@@ -0,0 +1,105 @@
+diff -ur gst-plugins-gl-0.10.1.orig/gst/gl/gstglbumper.c gst-plugins-gl-0.10.1/gst/gl/gstglbumper.c
+--- gst-plugins-gl-0.10.1.orig/gst/gl/gstglbumper.c	2009-07-13 12:50:06.000000000 +0300
++++ gst-plugins-gl-0.10.1/gst/gl/gstglbumper.c	2010-05-10 19:27:25.000000000 +0300
+@@ -189,7 +189,7 @@
+   info_ptr = png_create_info_struct (png_ptr);
+   if (info_ptr == NULL) {
+     fclose (fp);
+-    png_destroy_read_struct (&png_ptr, png_infopp_NULL, png_infopp_NULL);
++    png_destroy_read_struct (&png_ptr, NULL, NULL);
+     LOAD_ERROR ("failed to initialize the memory for image information");
+   }
+ 
+@@ -200,11 +200,11 @@
+   png_read_info (png_ptr, info_ptr);
+ 
+   png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
+-      &interlace_type, int_p_NULL, int_p_NULL);
++      &interlace_type, NULL, NULL);
+ 
+   if (color_type != PNG_COLOR_TYPE_RGB) {
+     fclose (fp);
+-    png_destroy_read_struct (&png_ptr, png_infopp_NULL, png_infopp_NULL);
++    png_destroy_read_struct (&png_ptr, NULL, NULL);
+     LOAD_ERROR ("color type is not rgb");
+   }
+ 
+@@ -220,7 +220,7 @@
+   free (rows);
+ 
+   png_read_end (png_ptr, info_ptr);
+-  png_destroy_read_struct (&png_ptr, &info_ptr, png_infopp_NULL);
++  png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
+   fclose (fp);
+ 
+   /* END load png image file */
+diff -ur gst-plugins-gl-0.10.1.orig/gst/gl/gstgldifferencematte.c gst-plugins-gl-0.10.1/gst/gl/gstgldifferencematte.c
+--- gst-plugins-gl-0.10.1.orig/gst/gl/gstgldifferencematte.c	2009-07-13 12:50:06.000000000 +0300
++++ gst-plugins-gl-0.10.1/gst/gl/gstgldifferencematte.c	2010-05-10 19:27:25.000000000 +0300
+@@ -562,7 +562,7 @@
+   info_ptr = png_create_info_struct (png_ptr);
+   if (info_ptr == NULL) {
+     fclose (fp);
+-    png_destroy_read_struct (&png_ptr, png_infopp_NULL, png_infopp_NULL);
++    png_destroy_read_struct (&png_ptr, NULL, NULL);
+     LOAD_ERROR ("failed to initialize the memory for image information");
+   }
+ 
+@@ -573,11 +573,11 @@
+   png_read_info (png_ptr, info_ptr);
+ 
+   png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
+-      &interlace_type, int_p_NULL, int_p_NULL);
++      &interlace_type, NULL, NULL);
+ 
+   if (color_type != PNG_COLOR_TYPE_RGB_ALPHA) {
+     fclose (fp);
+-    png_destroy_read_struct (&png_ptr, png_infopp_NULL, png_infopp_NULL);
++    png_destroy_read_struct (&png_ptr, NULL, NULL);
+     LOAD_ERROR ("color type is not rgb");
+   }
+ 
+@@ -597,7 +597,7 @@
+   free (rows);
+ 
+   png_read_end (png_ptr, info_ptr);
+-  png_destroy_read_struct (&png_ptr, &info_ptr, png_infopp_NULL);
++  png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
+   fclose (fp);
+ 
+   return TRUE;
+diff -ur gst-plugins-gl-0.10.1.orig/gst/gl/gstgloverlay.c gst-plugins-gl-0.10.1/gst/gl/gstgloverlay.c
+--- gst-plugins-gl-0.10.1.orig/gst/gl/gstgloverlay.c	2009-07-13 12:50:06.000000000 +0300
++++ gst-plugins-gl-0.10.1/gst/gl/gstgloverlay.c	2010-05-10 19:27:25.000000000 +0300
+@@ -390,7 +390,7 @@
+   info_ptr = png_create_info_struct (png_ptr);
+   if (info_ptr == NULL) {
+     fclose (fp);
+-    png_destroy_read_struct (&png_ptr, png_infopp_NULL, png_infopp_NULL);
++    png_destroy_read_struct (&png_ptr, NULL, NULL);
+     LOAD_ERROR ("failed to initialize the memory for image information");
+   }
+ 
+@@ -401,11 +401,11 @@
+   png_read_info (png_ptr, info_ptr);
+ 
+   png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
+-      &interlace_type, int_p_NULL, int_p_NULL);
++      &interlace_type, NULL, NULL);
+ 
+   if (color_type != PNG_COLOR_TYPE_RGB_ALPHA) {
+     fclose (fp);
+-    png_destroy_read_struct (&png_ptr, png_infopp_NULL, png_infopp_NULL);
++    png_destroy_read_struct (&png_ptr, NULL, NULL);
+     LOAD_ERROR ("color type is not rgb");
+   }
+ 
+@@ -424,7 +424,7 @@
+   free (rows);
+ 
+   png_read_end (png_ptr, info_ptr);
+-  png_destroy_read_struct (&png_ptr, &info_ptr, png_infopp_NULL);
++  png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
+   fclose (fp);
+ 
+   return TRUE;
diff --git a/media-plugins/gst-plugins-gl/gst-plugins-gl-0.10.1.ebuild b/media-plugins/gst-plugins-gl/gst-plugins-gl-0.10.1.ebuild
index 6fff3a6938e0..a9ce0d54211a 100644
--- a/media-plugins/gst-plugins-gl/gst-plugins-gl-0.10.1.ebuild
+++ b/media-plugins/gst-plugins-gl/gst-plugins-gl-0.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gl/gst-plugins-gl-0.10.1.ebuild,v 1.1 2009/10/30 18:49:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gl/gst-plugins-gl-0.10.1.ebuild,v 1.2 2010/05/10 16:27:24 ssuominen Exp $
 
 EAPI=2
-inherit multilib
+inherit eutils multilib
 
 DESCRIPTION="GStreamer OpenGL plugins"
 HOMEPAGE="http://gstreamer.freedesktop.org/"
@@ -17,13 +17,21 @@ IUSE="nls"
 RDEPEND=">=dev-libs/liboil-0.3.8
 	media-libs/mesa
 	>=media-libs/glew-1.4
-	media-libs/libpng
+	>=media-libs/libpng-1.2
 	>=media-libs/gstreamer-0.10.15.1
 	>=media-libs/gst-plugins-base-0.10.15.1"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng14.patch
+	# avoid autoreconf for no good reason
+	sed -i \
+		-e 's:libpng12:libpng:' \
+		configure || die
+}
+
 src_configure() {
 	econf \
 		--disable-static \