Remove USE gstreamer; moved to http://gstreamer.freedesktop.org/releases/gst-plugins-bad/0.10.14.html.

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

6 files changed, 14 insertions, 168 deletions

diff --git a/media-libs/schroedinger/ChangeLog b/media-libs/schroedinger/ChangeLog
index 8df23d58e693..65c2dc559004 100644
--- a/media-libs/schroedinger/ChangeLog
+++ b/media-libs/schroedinger/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/schroedinger
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/ChangeLog,v 1.34 2009/10/02 22:25:56 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/ChangeLog,v 1.35 2009/10/05 10:12:14 ssuominen Exp $
+
+  05 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+  schroedinger-1.0.7-r2.ebuild:
+  Remove USE gstreamer; moved to
+  http://gstreamer.freedesktop.org/releases/gst-plugins-bad/0.10.14.html.
 
   02 Oct 2009; Mounir Lamouri <volkmar@gentoo.org>
   schroedinger-1.0.7.ebuild:
diff --git a/media-libs/schroedinger/Manifest b/media-libs/schroedinger/Manifest
index 9651f47dd399..994de03bb061 100644
--- a/media-libs/schroedinger/Manifest
+++ b/media-libs/schroedinger/Manifest
@@ -1,10 +1,7 @@
-AUX schroedinger-1.0.7-gst_adapter_get_buffer.patch 2867 RMD160 e8f148d40c9ac398c78535ec37c5a2e44d48a299 SHA1 fe637417744071f220f060aca84280f284ffa4f7 SHA256 df3a5b6c74adef43a3e854c306ba63e21ec1de847bca48b13b4877d226ee9c75
-AUX schroedinger-1.0.7-gst_adapter_masked_scan_uint32.patch 2230 RMD160 8af19661b6e79c743ce0d312430b1a3176b8ecd0 SHA1 c1db22825f709160aec542cab922903a12d40671 SHA256 86213867480a0f20ba8ba4d3bbbb773b84f34bc7fc073c097205c41370f69a1e
 DIST schroedinger-1.0.5.tar.gz 828150 RMD160 a957c8322182b2780a35b6b085b430523332518b SHA1 a2ee0dabfc75b0c53c0c9acf8c6f60d91d279c26 SHA256 bbb73ebc3a22f53e75dfbaa1718eebcc5a3619bb200b50df42d5377b99ebf4d4
 DIST schroedinger-1.0.7.tar.gz 877696 RMD160 07e01d82fec882f66ff4046e69ce83dc2fb65970 SHA1 87da84f942668249f96a42d4b85c13743e8b2c07 SHA256 a1be06dbd7e996ea6034560fe8af5cd30ffdc4a1892d1f79a4262feee1c46b00
 EBUILD schroedinger-1.0.5.ebuild 1000 RMD160 a3728efc73ab484d8e9a47485375132e21cc2b8e SHA1 af5144700b489180f11cf10563e3c42a73dd658f SHA256 d6be3ea1a501c15d151c3a65f5e4cea3d217d9ddb2f7ac496d8b0f4241335b20
-EBUILD schroedinger-1.0.7-r1.ebuild 1077 RMD160 b8c146379d70ad47ea00e731c45f956b07c7c083 SHA1 d109317970f34562370c495c02e8122c86a093f1 SHA256 1981d57a12d80492730f76c249952bf1fd09dc133cb9f31d038ca18d0cae9f89
-EBUILD schroedinger-1.0.7-r2.ebuild 1132 RMD160 bef214a6bccb13eaacb81988e66dbeb0fe8e74a3 SHA1 8c0b020e3b295d4ce41fa0bed2caac5464833af2 SHA256 c6ec4e125512bc25d5ac6ecf15610c72b84e2682eb1d1585d98e8fd160cfbcdf
+EBUILD schroedinger-1.0.7-r2.ebuild 883 RMD160 61397437c1624eac414ef3c9bc5f2f23759a38ea SHA1 821c08121d474c6edaaf07e2513960414604dc74 SHA256 cc6ecabcb863c3dc53695e99a24d500c743cf36cd012eac54809c8b5802fe7e8
 EBUILD schroedinger-1.0.7.ebuild 1147 RMD160 16595deb732f5e609209ceed37daffff5035de33 SHA1 aa91bb30c39f5bf1f3885eaf42008fd15e0b14ca SHA256 25ce000b61507299edfd13b13d99395d6dfc37d9fd9de377efca090601adcf8b
-MISC ChangeLog 5114 RMD160 3359130dacd05dc4f63a25b57ba9f7c57f66a46d SHA1 da0956ea00d200618f8fab8cc9e1f4dd6a4572d4 SHA256 74f0879b927915b52f07e31768ebda405cad38e501e289f77a23d402fa6ddf79
+MISC ChangeLog 5310 RMD160 89f70fa7b11eab941b80f48e2bbf1eb88f6981d9 SHA1 a1fa6559378e48e826db7ce1baf29ee5535ab22b SHA256 9df2d0304629dddb7bbc1ec2b93780e86e4b820b9b77ac313be9c12a73bef99b
 MISC metadata.xml 275 RMD160 42f439fba1a5e257faae1816b9cc0fc18219fed5 SHA1 34ecd51be9f76b4637d91138641106513f18b685 SHA256 3ae7db9576ba39c1c15c3375d308fd166ca5e49a4d59451422bd5b3b20d58184
diff --git a/media-libs/schroedinger/files/schroedinger-1.0.7-gst_adapter_get_buffer.patch b/media-libs/schroedinger/files/schroedinger-1.0.7-gst_adapter_get_buffer.patch
deleted file mode 100644
index b66108262abc..000000000000
--- a/media-libs/schroedinger/files/schroedinger-1.0.7-gst_adapter_get_buffer.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=284071
-
-
-------- Comment #2 From Randall Wald 2009-09-10 08:48:52 0000 [reply] -------
-
-After looking a bit at the code that was breaking, I realized that the problem
-occurred because the developers had created modified versions of some system
-gstreamer header files (notably, adding the gst_adapter_get_buffer function),
-but then used #includes which referred to the system copies, not the new copies
-they wanted. I made a patch to switch which copies of these files are included,
-and this let my build of schroedinger pass QA. I'll attach my patch and the
-modified ebuild which uses it.
-
-------- Comment  #3 From Randall Wald  2009-09-10 08:53:04 0000  [reply] -------
-
-Created an attachment (id=203664) [edit]
-Patch to change which headers are included in a few key files
-
-This patch modifies three files (gstbasevideoparse.h, gstbasevideodecoder.h,
-and gstbasevideocodec.h) to use copies of gstbasevideocodec.h and
-gstbasevideoutils.h included with schroedinger's source tarball, rather than
-using the system copies of these files. This is important because the
-schroedinger copy of gstbasevideoutils.h defines the function
-gst_adapter_get_buffer, while the system copy (at least, on my system) does
-not.
-
-
-diff -ur schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoparse.h.orig schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoparse.h
---- schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoparse.h.orig	2009-09-10 04:37:44.206319157 -0400
-+++ schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoparse.h	2009-09-10 04:38:06.719330934 -0400
-@@ -20,8 +20,8 @@
- #ifndef _GST_BASE_VIDEO_PARSE_H_
- #define _GST_BASE_VIDEO_PARSE_H_
- 
--#include <gst/video/gstbasevideocodec.h>
--#include <gst/video/gstbasevideoutils.h>
-+#include "gstbasevideocodec.h"
-+#include "gstbasevideoutils.h"
- 
- G_BEGIN_DECLS
- 
-diff -ur schroedinger-1.0.7/gst-libs/gst/video/gstbasevideodecoder.h.orig schroedinger-1.0.7/gst-libs/gst/video/gstbasevideodecoder.h
---- schroedinger-1.0.7/gst-libs/gst/video/gstbasevideodecoder.h.orig	2009-09-10 04:38:21.985071525 -0400
-+++ schroedinger-1.0.7/gst-libs/gst/video/gstbasevideodecoder.h	2009-09-10 04:38:49.917081149 -0400
-@@ -20,7 +20,7 @@
- #ifndef _GST_BASE_VIDEO_DECODER_H_
- #define _GST_BASE_VIDEO_DECODER_H_
- 
--#include <gst/video/gstbasevideocodec.h>
-+#include "gstbasevideocodec.h"
- 
- G_BEGIN_DECLS
- 
-diff -ur schroedinger-1.0.7/gst-libs/gst/video/gstbasevideocodec.h.orig schroedinger-1.0.7/gst-libs/gst/video/gstbasevideocodec.h
---- schroedinger-1.0.7/gst-libs/gst/video/gstbasevideocodec.h.orig	2009-09-10 04:39:10.407323883 -0400
-+++ schroedinger-1.0.7/gst-libs/gst/video/gstbasevideocodec.h	2009-09-10 04:39:25.443233871 -0400
-@@ -22,7 +22,7 @@
- 
- #include <gst/gst.h>
- #include <gst/video/gstvideocompat.h>
--#include <gst/video/gstbasevideoutils.h>
-+#include "gstbasevideoutils.h"
- 
- G_BEGIN_DECLS
- 
-
diff --git a/media-libs/schroedinger/files/schroedinger-1.0.7-gst_adapter_masked_scan_uint32.patch b/media-libs/schroedinger/files/schroedinger-1.0.7-gst_adapter_masked_scan_uint32.patch
deleted file mode 100644
index f611a849939d..000000000000
--- a/media-libs/schroedinger/files/schroedinger-1.0.7-gst_adapter_masked_scan_uint32.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ur schroedinger-1.0.7.orig/gst/gstschrodec.c schroedinger-1.0.7/gst/gstschrodec.c
---- schroedinger-1.0.7.orig/gst/gstschrodec.c	2009-04-23 04:32:31.000000000 +0300
-+++ schroedinger-1.0.7/gst/gstschrodec.c	2009-08-16 15:46:45.000000000 +0300
-@@ -547,7 +547,7 @@
- 
-   n_available -= 3;
- 
--  return gst_adapter_masked_scan_uint32 (adapter, 0x42424344, 0xffffffff,
-+  return schro_gst_adapter_masked_scan_uint32 (adapter, 0x42424344, 0xffffffff,
-       offset, MIN (n, n_available - 3));
- }
- 
-diff -ur schroedinger-1.0.7.orig/gst/gstschroparse.c schroedinger-1.0.7/gst/gstschroparse.c
---- schroedinger-1.0.7.orig/gst/gstschroparse.c	2009-04-22 21:33:38.000000000 +0300
-+++ schroedinger-1.0.7/gst/gstschroparse.c	2009-08-16 15:46:45.000000000 +0300
-@@ -305,7 +305,7 @@
- 
-   n_available -= 3;
- 
--  return gst_adapter_masked_scan_uint32 (adapter, 0x42424344, 0xffffffff,
-+  return schro_gst_adapter_masked_scan_uint32 (adapter, 0x42424344, 0xffffffff,
-       offset, MIN (n, n_available - 3));
- }
- 
-diff -ur schroedinger-1.0.7.orig/gst-libs/gst/video/gstbasevideoutils.c schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoutils.c
---- schroedinger-1.0.7.orig/gst-libs/gst/video/gstbasevideoutils.c	2009-04-22 20:55:58.000000000 +0300
-+++ schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoutils.c	2009-08-16 15:46:45.000000000 +0300
-@@ -231,7 +231,7 @@
- 
- 
- int
--gst_adapter_masked_scan_uint32 (GstAdapter *adapter,
-+schro_gst_adapter_masked_scan_uint32 (GstAdapter *adapter,
-     guint32 pattern, guint32 mask, int offset, int n)
- {
-   GSList *g;
-diff -ur schroedinger-1.0.7.orig/gst-libs/gst/video/gstbasevideoutils.h schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoutils.h
---- schroedinger-1.0.7.orig/gst-libs/gst/video/gstbasevideoutils.h	2009-04-22 20:56:06.000000000 +0300
-+++ schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoutils.h	2009-08-16 15:46:45.000000000 +0300
-@@ -84,7 +84,7 @@
- GstClockTime gst_video_state_get_timestamp (const GstVideoState *state,
-     int frame_number);
- 
--int gst_adapter_masked_scan_uint32 (GstAdapter *adapter,
-+int schro_gst_adapter_masked_scan_uint32 (GstAdapter *adapter,
-     guint32 pattern, guint32 mask, int offset, int n);
- GstBuffer *gst_adapter_get_buffer (GstAdapter *adapter);
- 
diff --git a/media-libs/schroedinger/schroedinger-1.0.7-r1.ebuild b/media-libs/schroedinger/schroedinger-1.0.7-r1.ebuild
deleted file mode 100644
index 7d3d8dcd2449..000000000000
--- a/media-libs/schroedinger/schroedinger-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/schroedinger-1.0.7-r1.ebuild,v 1.1 2009/08/16 12:49:50 ssuominen Exp $
-
-EAPI=2
-inherit eutils libtool
-
-DESCRIPTION="C-based libraries and GStreamer plugins for the Dirac video codec"
-HOMEPAGE="http://www.diracvideo.org"
-SRC_URI="http://www.diracvideo.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( MPL-1.1 LGPL-2.1 GPL-2 MIT )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="gstreamer"
-
-RDEPEND=">=dev-libs/liboil-0.3.16
-	gstreamer? ( >=media-libs/gstreamer-0.10.24
-		>=media-libs/gst-plugins-base-0.10.24 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gst_adapter_masked_scan_uint32.patch
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-gtk-doc \
-		$(use_enable gstreamer)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS NEWS TODO
-}
diff --git a/media-libs/schroedinger/schroedinger-1.0.7-r2.ebuild b/media-libs/schroedinger/schroedinger-1.0.7-r2.ebuild
index b93e3d89caec..09c9c9a23d23 100644
--- a/media-libs/schroedinger/schroedinger-1.0.7-r2.ebuild
+++ b/media-libs/schroedinger/schroedinger-1.0.7-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/schroedinger-1.0.7-r2.ebuild,v 1.1 2009/09/10 09:41:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/schroedinger-1.0.7-r2.ebuild,v 1.2 2009/10/05 10:12:14 ssuominen Exp $
 
 EAPI=2
-inherit eutils libtool
+inherit libtool
 
 DESCRIPTION="C-based libraries and GStreamer plugins for the Dirac video codec"
 HOMEPAGE="http://www.diracvideo.org"
@@ -12,17 +12,13 @@ SRC_URI="http://www.diracvideo.org/download/${PN}/${P}.tar.gz"
 LICENSE="|| ( MPL-1.1 LGPL-2.1 GPL-2 MIT )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="gstreamer"
+IUSE=""
 
-RDEPEND=">=dev-libs/liboil-0.3.16
-	gstreamer? ( >=media-libs/gstreamer-0.10.24
-		>=media-libs/gst-plugins-base-0.10.24 )"
+RDEPEND=">=dev-libs/liboil-0.3.16"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gst_adapter_masked_scan_uint32.patch
-	epatch "${FILESDIR}"/${P}-gst_adapter_get_buffer.patch
 	elibtoolize
 }
 
@@ -30,10 +26,10 @@ src_configure() {
 	econf \
 		--disable-dependency-tracking \
 		--disable-gtk-doc \
-		$(use_enable gstreamer)
+		--disable-gstreamer
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS NEWS TODO
 }