Include a fix from upstream, doesn't fix anything it tree but allows installation of plugins from gst CVS against 0.10.14 core.

Package-Manager: portage-2.1.3.7

4 files changed, 35 insertions, 11 deletions

diff --git a/media-libs/gstreamer/ChangeLog b/media-libs/gstreamer/ChangeLog
index df5615e1b024..93e0e2998403 100644
--- a/media-libs/gstreamer/ChangeLog
+++ b/media-libs/gstreamer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/gstreamer
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.180 2007/09/01 07:16:06 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.181 2007/09/02 19:21:35 drac Exp $
+
+  02 Sep 2007; Samuli Suominen <drac@gentoo.org>
+  +files/gstreamer-0.10.14-gstcaps.patch, gstreamer-0.10.14.ebuild:
+  Include a fix from upstream, doesn't fix anything it tree but allows
+  installation of plugins from gst CVS against 0.10.14 core.
 
   01 Sep 2007; Samuli Suominen <drac@gentoo.org> gstreamer-0.10.14.ebuild:
   Remove invalid files from dodoc wrt #189538.
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 3d9c3a39f6c1..3a64a015a101 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -2,6 +2,10 @@ AUX cothreads-gcc4.patch 948 RMD160 4ed4b2bd36b5ec872203f7e8594fbf97c127c433 SHA
 MD5 02f79e03f828f6b8dfa6288a8cabb52e files/cothreads-gcc4.patch 948
 RMD160 4ed4b2bd36b5ec872203f7e8594fbf97c127c433 files/cothreads-gcc4.patch 948
 SHA256 3786e82174a1061845044054ffab75b993265295943b8796829e3b3ab46f75aa files/cothreads-gcc4.patch 948
+AUX gstreamer-0.10.14-gstcaps.patch 506 RMD160 7d77743a78dfae975c025f659c7f3036a6de306f SHA1 05c590413953105fcbb0e071ed1b38c6103a7802 SHA256 d77061a547f4a658548b14f2de9579989ed1190381c41bbe9a4da578c734d57e
+MD5 58a13bbaaae884e441859084d13782e4 files/gstreamer-0.10.14-gstcaps.patch 506
+RMD160 7d77743a78dfae975c025f659c7f3036a6de306f files/gstreamer-0.10.14-gstcaps.patch 506
+SHA256 d77061a547f4a658548b14f2de9579989ed1190381c41bbe9a4da578c734d57e files/gstreamer-0.10.14-gstcaps.patch 506
 AUX gstreamer-0.8.3-jade_fix.patch 1713 RMD160 e52cf7b4fb0e7d0a4043365dd1abaab5a121897f SHA1 e5bedff5c5a432391836f397a8a8524b959527f6 SHA256 852eb5828e8c5e270e8b32323e37dcf266308b5b5e5aa1f26d08bbb1be4fc51d
 MD5 465e9b8e2f33205128b7a69eca2e2c02 files/gstreamer-0.8.3-jade_fix.patch 1713
 RMD160 e52cf7b4fb0e7d0a4043365dd1abaab5a121897f files/gstreamer-0.8.3-jade_fix.patch 1713
@@ -25,10 +29,10 @@ EBUILD gstreamer-0.10.13.ebuild 2020 RMD160 974b9bd4041fd52dd20a8076d25819b38e22
 MD5 e96c79d7cc2b50676302a82de17e199d gstreamer-0.10.13.ebuild 2020
 RMD160 974b9bd4041fd52dd20a8076d25819b38e2221e2 gstreamer-0.10.13.ebuild 2020
 SHA256 5da50d62d7717351d64b1b38b8d7ab58123b023bf22724b1271fb8c775c0694f gstreamer-0.10.13.ebuild 2020
-EBUILD gstreamer-0.10.14.ebuild 2123 RMD160 bea9d43a226697d0b6e7dcd18c56a546c131a5e9 SHA1 08713caeb6648bf61999082df72ef42e8d6aaeb1 SHA256 809b55832f7f0028bc832bdad02c5b60312125a7f998b49a7425e050fd45177b
-MD5 4ffc58efde1d8099c70d616dac20f0c3 gstreamer-0.10.14.ebuild 2123
-RMD160 bea9d43a226697d0b6e7dcd18c56a546c131a5e9 gstreamer-0.10.14.ebuild 2123
-SHA256 809b55832f7f0028bc832bdad02c5b60312125a7f998b49a7425e050fd45177b gstreamer-0.10.14.ebuild 2123
+EBUILD gstreamer-0.10.14.ebuild 2223 RMD160 2b58e861dc9d44622310f3bd1bcc1219ac50ecf6 SHA1 3536a6cb820d18d3821fb514d507d0ee0ec82c06 SHA256 66ceeed975ac15532d1bd5cc4298663f06a205318848add42e3bd56f903c857c
+MD5 a902dc213940ccd368c79c301815240f gstreamer-0.10.14.ebuild 2223
+RMD160 2b58e861dc9d44622310f3bd1bcc1219ac50ecf6 gstreamer-0.10.14.ebuild 2223
+SHA256 66ceeed975ac15532d1bd5cc4298663f06a205318848add42e3bd56f903c857c gstreamer-0.10.14.ebuild 2223
 EBUILD gstreamer-0.10.8.ebuild 1952 RMD160 911008ada6a883bb5d9fb60f978b8a4ea323cd37 SHA1 5473f4f0b2e24cac12bc5debba187b7d7b05cff6 SHA256 d1528f6504efe435deb821ec9ee24d0014e865900136a6d4c7ef08f459410582
 MD5 902b1a8e89a8b1ab372dc66dd2a9c7be gstreamer-0.10.8.ebuild 1952
 RMD160 911008ada6a883bb5d9fb60f978b8a4ea323cd37 gstreamer-0.10.8.ebuild 1952
@@ -41,10 +45,10 @@ EBUILD gstreamer-0.8.12.ebuild 2958 RMD160 98879ed28b281bfbe9317c8a17f1bbafb0add
 MD5 513d3f3d0ac88a7ae8a45e1617594f35 gstreamer-0.8.12.ebuild 2958
 RMD160 98879ed28b281bfbe9317c8a17f1bbafb0add2e4 gstreamer-0.8.12.ebuild 2958
 SHA256 d8fca3e36c6bc6a42f14dc77fe196942b748c6aacc2faf43008bfc9c50865f52 gstreamer-0.8.12.ebuild 2958
-MISC ChangeLog 23604 RMD160 e542080ae62c29890e4a6ac24905ff4a98ab69ce SHA1 340803c196c7c8dc61358f996e1af1f5cadf355e SHA256 de317563370ff5411341129218bc97567145b4c08fbe6e42f81e9483c82cf7eb
-MD5 ab6920341a72405e27ac0927e65d54ee ChangeLog 23604
-RMD160 e542080ae62c29890e4a6ac24905ff4a98ab69ce ChangeLog 23604
-SHA256 de317563370ff5411341129218bc97567145b4c08fbe6e42f81e9483c82cf7eb ChangeLog 23604
+MISC ChangeLog 23854 RMD160 7ec89c86e82a61a59c894ecfe0720bf2fa07e6c9 SHA1 a0e06b0e19c7bbf27a01c7348707dea7b2f5cbbb SHA256 efd25034f56713af163dbffd69e864045690a1034380fb54ee1ff98b2acacfd7
+MD5 5a54106a13621afc8612fdb5b3f83de5 ChangeLog 23854
+RMD160 7ec89c86e82a61a59c894ecfe0720bf2fa07e6c9 ChangeLog 23854
+SHA256 efd25034f56713af163dbffd69e864045690a1034380fb54ee1ff98b2acacfd7 ChangeLog 23854
 MISC metadata.xml 181 RMD160 51814fbdcf7f32cfe70018b3af7fc798e41ff90d SHA1 faf40c45bd66b0072b95556cf7ab097d3be19511 SHA256 22c215902ccdc7fd8cdb765750fb23ea9d9b6c9d3edb1b45325c3469f8f6ffc5
 MD5 6cf6f97e79b43eaf70fa938c431342a3 metadata.xml 181
 RMD160 51814fbdcf7f32cfe70018b3af7fc798e41ff90d metadata.xml 181
diff --git a/media-libs/gstreamer/files/gstreamer-0.10.14-gstcaps.patch b/media-libs/gstreamer/files/gstreamer-0.10.14-gstcaps.patch
new file mode 100644
index 000000000000..f2eae496de45
--- /dev/null
+++ b/media-libs/gstreamer/files/gstreamer-0.10.14-gstcaps.patch
@@ -0,0 +1,12 @@
+diff -ur gstreamer-0.10.14.orig/gst/gstcaps.c gstreamer-0.10.14/gst/gstcaps.c
+--- gstreamer-0.10.14.orig/gst/gstcaps.c	2007-02-28 16:42:41.000000000 +0200
++++ gstreamer-0.10.14/gst/gstcaps.c	2007-09-02 22:08:26.000000000 +0300
+@@ -895,7 +895,7 @@
+   GstStructure *structure;
+ 
+   g_return_if_fail (GST_IS_CAPS (caps));
+-  g_return_if_fail (caps->structs->len != 1);
++  g_return_if_fail (caps->structs->len == 1);
+   g_return_if_fail (IS_WRITABLE (caps));
+ 
+   structure = gst_caps_get_structure (caps, 0);
diff --git a/media-libs/gstreamer/gstreamer-0.10.14.ebuild b/media-libs/gstreamer/gstreamer-0.10.14.ebuild
index 1d136ed09c4a..1c14f8cc7c47 100644
--- a/media-libs/gstreamer/gstreamer-0.10.14.ebuild
+++ b/media-libs/gstreamer/gstreamer-0.10.14.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.10.14.ebuild,v 1.3 2007/09/01 07:16:06 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.10.14.ebuild,v 1.4 2007/09/02 19:21:35 drac Exp $
 
-inherit libtool
+inherit eutils libtool
 
 # Create a major/minor combo for our SLOT and executables suffix
 PVP=(${PV//[-\._]/ })
@@ -30,6 +30,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	# Fix from upstream. Is included in next release.
+	epatch "${FILESDIR}"/${P}-gstcaps.patch
+
 	# Needed for sane .so versioning on Gentoo/FreeBSD
 	elibtoolize
 }