Fix include order problem in tags test. Fixes bug #346169.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

4 files changed, 32 insertions, 4 deletions

diff --git a/media-libs/gst-plugins-base/ChangeLog b/media-libs/gst-plugins-base/ChangeLog
index b575ac835ed7..76d25067ef46 100644
--- a/media-libs/gst-plugins-base/ChangeLog
+++ b/media-libs/gst-plugins-base/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/gst-plugins-base
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/ChangeLog,v 1.148 2010/11/22 04:59:45 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/ChangeLog,v 1.149 2010/11/22 05:37:26 ford_prefect Exp $
+
+  22 Nov 2010; Arun Raghavan <ford_prefect@gentoo.org>
+  gst-plugins-base-0.10.30.ebuild,
+  +files/gst-plugins-base-0.10.30-fix-tag-test-linking.patch:
+  Fix include order problem in tags test. Fixes bug #346169.
 
   22 Nov 2010; Arun Raghavan <ford_prefect@gentoo.org>
   gst-plugins-base-0.10.30.ebuild:
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 1c55a08e8f79..5dd7ffe09d8d 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -1,4 +1,5 @@
 AUX gst-plugins-base-0.10.29-make-382.patch 809 RMD160 7132846d5f443f77bb48492d37857561922dea36 SHA1 2f61489ff083033ed4abc4e05c91293c9cf3a896 SHA256 c0310244fe8532218051f0a670a9729aa7c4b39f68ac908f3469e02f4916b121
+AUX gst-plugins-base-0.10.30-fix-tag-test-linking.patch 595 RMD160 36ab82ec95e0bb30a7bebd87d8f3df29ee279475 SHA1 d02e4885dd3940c5ded49c0481ea09251c5f9cab SHA256 cc614508e47ef766aafafaed74f82491e69cfdf5ef02be33dfcdca46cd74e700
 DIST gst-plugins-base-0.10.24.tar.bz2 2199169 RMD160 3d85ee63e0b0a27eb50b5654dc2bd96c60bcf94f SHA1 01abe0839303923671e79d8448ebfabda5bce799 SHA256 6f566e8ce0911e0fae99dc7435c3fc3a14d0253578a88e87a28c0e2584372761
 DIST gst-plugins-base-0.10.25.tar.bz2 2241145 RMD160 4d57f4c6e42a4bf006c1dff9d69c0bbc9bcde483 SHA1 6057e6552c936f3dbe9ba01269bc0bcf8469ae0a SHA256 0ab2f7e1d818e7af1be99c4eae02ba69d4a1b8f7e3527929a6426f1daa0d4607
 DIST gst-plugins-base-0.10.28.tar.bz2 2343870 RMD160 e013a996af99b6be42ece624f279f3f76fe5a30f SHA1 c32b966e4ec3c81d520f80a03794cb11942df835 SHA256 132b6fd7749fcbfa9ad88c854aada44b6870c4175bda21cdb01a52b59a98e14f
@@ -8,6 +9,6 @@ EBUILD gst-plugins-base-0.10.24.ebuild 1098 RMD160 5fb42a7e2e966c33e1da92fd0d604
 EBUILD gst-plugins-base-0.10.25.ebuild 1248 RMD160 cdf946d55729783d214025102753be99b2ab435e SHA1 a7f9b0be58e9688e4af1d06032e562a06860bf9c SHA256 f4c7abb024c29583c2521834f4945234964c6424cbbfed8edea5a88a36e8340e
 EBUILD gst-plugins-base-0.10.28.ebuild 1290 RMD160 692d4c43be8c3bd2762b6f7e13269dd09e30e5ff SHA1 4f6045acbb864f10a35728c2ffa3f13bcaa094b1 SHA256 8178266c35a12f315cfbe87a87afd82c80410a49f8dd14ba2ab98df21308d8cc
 EBUILD gst-plugins-base-0.10.29.ebuild 1442 RMD160 8682646c8c8bab5be9d396e0521a0e60fea434cb SHA1 8d221f5eb66f41c901a317c927825c5b96c41888 SHA256 56263a94a974b3d0254d4a1235347d5067ab16c915e5f96ea401080b7ae2c72f
-EBUILD gst-plugins-base-0.10.30.ebuild 1526 RMD160 0eef8fe831a75db4b83a0c03ef3bcb2dfe7145da SHA1 6e13da61a54c8f6ef19e92c3fc2834189d1060b3 SHA256 06bac04a9f2b4dd1a5ff6c2af5d79aeddd3d0cb5e51e58c7ff3b8f1a4dc3fcc5
-MISC ChangeLog 20638 RMD160 e2960313a03fcb8b88d47d93cbf3160ea0bb7fac SHA1 46e5b2ca0de2184b72b755b0c38022bd7a3ccf5d SHA256 06736c7281777d65ae7fd86aad37750a3de6f99e99e0b989b225cdaf47bb8794
+EBUILD gst-plugins-base-0.10.30.ebuild 1613 RMD160 1a57e89ddc4004c6a119c5e6b9de597fa3213cdd SHA1 12af6678f5100d793e5664599a7e8fc7ee8d1ae8 SHA256 4c4da3c0255fb9afe3a4c1151b65b0894d9a40d9192c8ff14bc7aa8df75a23c1
+MISC ChangeLog 20852 RMD160 23445523a598518e180851e33e61ff923e12b5b1 SHA1 9c1dabe8bc8c743474c11c171d9be8717801ee2e SHA256 ba4c75de0d30d442013e7a1255eb760a8f58e032b96900472ce90d2eae35b087
 MISC metadata.xml 387 RMD160 317c227ba3fb1b6c3efb9b7e2eda3bc8b3a15d3d SHA1 22e7a8bf1c0fea96175f24186d2da21991f92d57 SHA256 eba3a8e340ab40138d81acf190309b4071059513460cb93109b24574c794e205
diff --git a/media-libs/gst-plugins-base/files/gst-plugins-base-0.10.30-fix-tag-test-linking.patch b/media-libs/gst-plugins-base/files/gst-plugins-base-0.10.30-fix-tag-test-linking.patch
new file mode 100644
index 000000000000..0253dfe9e210
--- /dev/null
+++ b/media-libs/gst-plugins-base/files/gst-plugins-base-0.10.30-fix-tag-test-linking.patch
@@ -0,0 +1,20 @@
+commit 5f5c52cbc5ccbfba662c24619f4ba6ce7ae815a3
+Author: Edward Hervey <bilboed@bilboed.com>
+Date:   Tue Sep 7 16:26:56 2010 +0200
+
+    check: Fix linking order of libs/tag
+
+diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
+index 93542c7..0ed71f2 100644
+--- a/tests/check/Makefile.am
++++ b/tests/check/Makefile.am
+@@ -221,8 +221,8 @@ libs_rtp_LDADD = \
+ 	$(top_builddir)/gst-libs/gst/rtp/libgstrtp-@GST_MAJORMINOR@.la $(LDADD)
+ 
+ libs_tag_CFLAGS = \
+-	$(GST_BASE_CFLAGS) \
+ 	$(GST_PLUGINS_BASE_CFLAGS) \
++	$(GST_BASE_CFLAGS) \
+ 	$(AM_CFLAGS)
+ libs_tag_LDADD = \
+ 	$(GST_BASE_LIBS) \
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-0.10.30.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-0.10.30.ebuild
index c55e35d1285c..bb7b0afeb47e 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-0.10.30.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-0.10.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/gst-plugins-base-0.10.30.ebuild,v 1.2 2010/11/22 04:59:45 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/gst-plugins-base-0.10.30.ebuild,v 1.3 2010/11/22 05:37:26 ford_prefect Exp $
 
 EAPI=1
 
@@ -35,6 +35,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-0.10.29-make-382.patch
+	# From upstream commit 5f5c52cb
+	epatch "${FILESDIR}"/${P}-fix-tag-test-linking.patch
 	eautoreconf
 }