Version bump.

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

3 files changed, 19 insertions, 126 deletions

diff --git a/media-plugins/gst-plugins-gl/ChangeLog b/media-plugins/gst-plugins-gl/ChangeLog
index b71e4d7185ba..813d5ffca6a2 100644
--- a/media-plugins/gst-plugins-gl/ChangeLog
+++ b/media-plugins/gst-plugins-gl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/gst-plugins-gl
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gl/ChangeLog,v 1.3 2010/11/02 12:09:22 ssuominen Exp $
+
+*gst-plugins-gl-0.10.2 (02 Nov 2010)
+
+  02 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +gst-plugins-gl-0.10.2.ebuild:
+  Version bump.
 
   10 May 2010; Samuli Suominen <ssuominen@gentoo.org>
   gst-plugins-gl-0.10.1.ebuild, +files/gst-plugins-gl-0.10.1-libpng14.patch:
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
deleted file mode 100644
index c753c91cdb95..000000000000
--- a/media-plugins/gst-plugins-gl/files/gst-plugins-gl-0.10.1-libpng14.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-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.2.ebuild
index a9ce0d54211a..6623b8b417cb 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.2.ebuild
@@ -1,37 +1,28 @@
 # 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.2 2010/05/10 16:27:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-gl/gst-plugins-gl-0.10.2.ebuild,v 1.1 2010/11/02 12:09:22 ssuominen Exp $
 
 EAPI=2
-inherit eutils multilib
 
 DESCRIPTION="GStreamer OpenGL plugins"
 HOMEPAGE="http://gstreamer.freedesktop.org/"
 SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2"
 
-LICENSE="GPL-2 LGPL-2"
+LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
-RDEPEND=">=dev-libs/liboil-0.3.8
-	media-libs/mesa
-	>=media-libs/glew-1.4
-	>=media-libs/libpng-1.2
-	>=media-libs/gstreamer-0.10.15.1
-	>=media-libs/gst-plugins-base-0.10.15.1"
+RDEPEND=">=media-libs/glew-1.5
+	>=media-libs/libpng-1.4
+	>=media-libs/gstreamer-0.10.28
+	>=media-libs/gst-plugins-base-0.10.28
+	virtual/glu
+	virtual/opengl"
 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 \
@@ -39,11 +30,12 @@ src_configure() {
 		$(use_enable nls) \
 		--disable-examples \
 		--disable-valgrind \
-		--with-package-origin="http://packages.gentoo.org/package/media-plugins/gst-plugins-gl"
+		--with-package-origin="http://packages.gentoo.org/package/media-plugins/gst-plugins-gl" \
+		--with-html-dir=/usr/share/doc/${PF}/html
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README RELEASE TODO
-	find "${D}"usr/$(get_libdir) -name '*.la' -delete
+	find "${D}" -name '*.la' -exec rm -f '{}' +
 }