Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--media-libs/gst-plugins-good/Manifest16
-rw-r--r--media-libs/gst-plugins-good/gst-plugins-good-0.10.11.ebuild65
-rw-r--r--media-libs/gst-plugins-good/gst-plugins-good-0.10.6.ebuild66
-rw-r--r--media-libs/gst-plugins-good/metadata.xml3
-rw-r--r--media-libs/gstreamer/Manifest22
-rw-r--r--media-libs/gstreamer/files/gstreamer-0.10.14-gstcaps.patch12
-rw-r--r--media-libs/gstreamer/files/gstreamer-0.10.21-b.g.o-555631.patch100
-rw-r--r--media-libs/gstreamer/files/gstreamer-0.10.21-bison241.patch14
-rw-r--r--media-libs/gstreamer/files/gstreamer-0.10.21-gtkdoc.patch15
-rw-r--r--media-libs/gstreamer/gstreamer-0.10.14.ebuild72
-rw-r--r--media-libs/gstreamer/gstreamer-0.10.21-r10.ebuild66
-rw-r--r--media-libs/gstreamer/gstreamer-0.10.21-r3.ebuild63
-rw-r--r--media-libs/gstreamer/gstreamer-0.10.21.ebuild61
-rw-r--r--media-libs/gstreamer/metadata.xml4
14 files changed, 6 insertions, 573 deletions
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index 6e5fcaa1d20c..3f864aa34c67 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,20 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST gst-plugins-good-0.10.11.tar.bz2 2081796 RMD160 7ae2a8c0a2fa5f2703b7238c26bde5b092c6eb92 SHA1 91379437060d893f4c06aae7db7f5e53a600f62f SHA256 05323f065080e3df5f5c9cadceca977598ba106b3eebf2bbec46099becf796b1
DIST gst-plugins-good-0.10.14.tar.bz2 2228076 RMD160 7832c2087c2a5d6c354f5a931dcc49f24c547ee9 SHA1 49dbcfcbbab9bd6a1e54d9e548184016c20f3aba SHA256 12205d01cb99900ed6f936a09ac31b5849f8a7ff3c9a93e5857a76dc3e30788a
-DIST gst-plugins-good-0.10.6.tar.bz2 1576121 RMD160 fd0102617759611f9b6e9e490101b95f4369f4e8 SHA1 eb918b6876e90f4ac803d209a14b32c1b3e26695 SHA256 9e9cd6a5e134c29400b9dc302e523684dca55d0f7f11eb4b06535b24e5032d66
DIST gst-plugins-good-0.10.8.tar.bz2 1917366 RMD160 00766eafafc000a407dc244ed5b9f33f9eee56f7 SHA1 bcba3aae2893e3d598f9890a5c7bcd0ae366e5c6 SHA256 7723728b5fa771f06078c32e9e315e161b8eebc460d1fb6fcbf4b60df5c057ee
-EBUILD gst-plugins-good-0.10.11.ebuild 1797 RMD160 f773a312a7b16322952cb63bcbd8dcefbe3feefd SHA1 505a05c9dbbcfbc4fac4a298f1d481f4127ac26b SHA256 f5487f9a362d30ea8c36f88287f372b14d2c67673748db72e7ea75a81752391b
EBUILD gst-plugins-good-0.10.14.ebuild 1793 RMD160 e1521eeca83fea624b8b9af274759658b8d43a03 SHA1 e1b3408b069ddf8c8a3010ec61e24d7de98d88fc SHA256 3a56a4bc8d81df3fce08089ee1b93e758240a516c8951949c5ff772825421025
-EBUILD gst-plugins-good-0.10.6.ebuild 1740 RMD160 cc7a42a2ca509b100914f2629796f356ad554c68 SHA1 0060eb0a80fe717bccda96ce56c1fc3266c847e8 SHA256 b5c817e973d2172d758639721a1530141fb1bd58b6b13b2dc2bbf384b12db2ae
EBUILD gst-plugins-good-0.10.8-r1.ebuild 1787 RMD160 5fe5fdc5ed073643369ee8421bdf3080ab72d4d2 SHA1 649e4280401fa3ca4333e25b4738d78ebdd96ee6 SHA256 bf08e9dcb77e4c5510f081be76435cd7bcfc1a309860e70e0e59de4475f7fca7
MISC ChangeLog 8420 RMD160 d772ee8234107a812995aed0ce4d088990e85977 SHA1 f712230c8afb306226dc031205bcb5da4bf9c674 SHA256 d18b5ea4e321cc360b33912af61c342a38c5c875e5bd9f9fd97dc146f5bd5da6
-MISC metadata.xml 162 RMD160 c6078d82a9ff46dbb283bc14ade9d117144cca67 SHA1 f46f8ccd62374b17183b5aca523c4dcf60d718f9 SHA256 3ac891ee23de8c6e2bef32e0c7aa3e6607e808de76ed723fbe7a1fb92f6093f1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoMbQ0ACgkQkKaRLQcq0GKPFQCgpE0CE3KWWDfFfdM9lVAyt8Ui
-IRcAnR6Cwu8zNVQspukGh06aN1A9GVa8
-=8cQn
------END PGP SIGNATURE-----
+MISC metadata.xml 183 RMD160 1ff3457acfc2fe0f859b9cc5879b3093b2979fe9 SHA1 829dff00498fcdadd7e4f172770790cf601450b2 SHA256 d204aaee1ef1b7f278926aeadf0958d8b6a81affb746a3924a565263a97022fc
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-0.10.11.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-0.10.11.ebuild
deleted file mode 100644
index 6d92e233fa7b..000000000000
--- a/media-libs/gst-plugins-good/gst-plugins-good-0.10.11.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-good/gst-plugins-good-0.10.11.ebuild,v 1.2 2008/12/05 23:05:12 ssuominen Exp $
-
-# order is important, gnome2 after gst-plugins
-inherit gst-plugins-good gst-plugins10 gnome2 eutils flag-o-matic libtool
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="http://gstreamer.net/"
-SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/gst-plugins-base-0.10.21
- >=media-libs/gstreamer-0.10.21
- >=dev-libs/liboil-0.3.8"
-DEPEND="${RDEPEND}
- >=sys-devel/gettext-0.11.5
- dev-util/pkgconfig
- !<media-libs/gst-plugins-bad-0.10.9"
-
-# overrides the eclass
-src_unpack() {
- unpack ${A}
- # Required for FreeBSD sane .so versioning
- elibtoolize
-}
-
-src_compile() {
- # gst doesnt handle optimisations well
- strip-flags
- replace-flags "-O3" "-O2"
- filter-flags "-fprefetch-loop-arrays" # see bug 22249
-
- gst-plugins-good_src_configure \
- --with-default-audiosink=autoaudiosink \
- --with-default-visualizer=goom
-
- emake || die "emake failed."
-}
-
-# override eclass
-src_install() {
- gnome2_src_install
-}
-
-DOCS="AUTHORS README RELEASE"
-
-pkg_postinst () {
- gnome2_pkg_postinst
-
- echo
- elog "The Gstreamer plugins setup has changed quite a bit on Gentoo,"
- elog "applications now should provide the basic plugins needed."
- echo
- elog "The new seperate plugins are all named 'gst-plugins-<plugin>'."
- elog "To get a listing of currently available plugins execute 'emerge -s gst-plugins-'."
- elog "In most cases it shouldn't be needed though to emerge extra plugins."
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-}
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-0.10.6.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-0.10.6.ebuild
deleted file mode 100644
index 0a06aa59ae67..000000000000
--- a/media-libs/gst-plugins-good/gst-plugins-good-0.10.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-good/gst-plugins-good-0.10.6.ebuild,v 1.13 2008/08/29 08:40:34 hanno Exp $
-
-# order is important, gnome2 after gst-plugins
-inherit gst-plugins-good gst-plugins10 gnome2 eutils flag-o-matic libtool
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="http://gstreamer.net/"
-SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=media-libs/gst-plugins-base-0.10.13
- >=media-libs/gstreamer-0.10.13
- >=dev-libs/liboil-0.3.6"
-DEPEND="${RDEPEND}
- >=sys-devel/gettext-0.11.5
- >=dev-util/pkgconfig-0.9
- !<media-libs/gst-plugins-bad-0.10.5"
-
-# overrides the eclass
-src_unpack() {
- unpack ${A}
-}
-
-src_compile() {
- elibtoolize
-
- # gst doesnt handle optimisations well
- strip-flags
- replace-flags "-O3" "-O2"
- filter-flags "-fprefetch-loop-arrays" # see bug 22249
- if use alpha || use amd64 || use ia64 || use hppa; then
- append-flags -fPIC
- fi
-
- gst-plugins-good_src_configure
-
- emake || die
-}
-
-# override eclass
-src_install() {
- gnome2_src_install
-}
-
-DOCS="AUTHORS README RELEASE"
-
-pkg_postinst () {
- gnome2_pkg_postinst
-
- echo ""
- elog "The Gstreamer plugins setup has changed quite a bit on Gentoo,"
- elog "applications now should provide the basic plugins needed."
- elog ""
- elog "The new seperate plugins are all named 'gst-plugins-<plugin>'."
- elog "To get a listing of currently available plugins execute 'emerge -s gst-plugins-'."
- elog "In most cases it shouldn't be needed though to emerge extra plugins."
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-}
diff --git a/media-libs/gst-plugins-good/metadata.xml b/media-libs/gst-plugins-good/metadata.xml
index 9e260ceca3e3..6cb5dfb547c2 100644
--- a/media-libs/gst-plugins-good/metadata.xml
+++ b/media-libs/gst-plugins-good/metadata.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gstreamer</herd>
+ <herd>gstreamer</herd>
+ <herd>gnome</herd>
</pkgmetadata>
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 6c75ded093cf..773b8734ce16 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,28 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX gstreamer-0.10.14-gstcaps.patch 506 RMD160 7d77743a78dfae975c025f659c7f3036a6de306f SHA1 05c590413953105fcbb0e071ed1b38c6103a7802 SHA256 d77061a547f4a658548b14f2de9579989ed1190381c41bbe9a4da578c734d57e
-AUX gstreamer-0.10.21-b.g.o-555631.patch 3719 RMD160 0fda33acf5113ad9e9c1333fff791cea485f01d2 SHA1 85ccb9ac759b0ed1349a052e6df1904f1a10a7b6 SHA256 419373c261dac2443ec850e96a9939fd55f4e0d7c5587cd0a6793d4768c81594
-AUX gstreamer-0.10.21-bison241.patch 547 RMD160 257a17ee81688e3c86eb3a62e8f4146d85dc793a SHA1 8da50114a524a12695835379ee6564c769cd3a79 SHA256 136f74dab6bd8233b3ae5be771474758e7aaca06ae7b0e6a6904bda841984d55
-AUX gstreamer-0.10.21-gtkdoc.patch 816 RMD160 70b89d12357dcf8fa063ead4f337ad39b3494db9 SHA1 7b6080f563afd9e31ae28f38bcbfcab3e4bc6564 SHA256 592d2257a038aa267b4e01a0dbdc3625ab55a00f763f85b75c573e413872a0b3
-DIST gstreamer-0.10.14.tar.bz2 2004318 RMD160 6e6f75c89da223ac42a0ab3cc1642b24007a9181 SHA1 29e02be4dbf50272086e436f3fab2dcfadaaff2b SHA256 e684179e63262c7271dbc50e64ead205cae013daac7264d8effbf60fed3f2438
DIST gstreamer-0.10.20.tar.bz2 2253801 RMD160 8b3fa0ebdd30071c820bd3a9f7fec2104ff51bff SHA1 a95e731ee2d377c80eecd61a700cfa1090aaae92 SHA256 c839c3872510890bdbdfb43a79fd8b5646f3b9164b637127fb550351dc147eba
-DIST gstreamer-0.10.21.tar.bz2 2662621 RMD160 d801ff66390ef41880cf0be1fee6f7aebf177876 SHA1 892daa9517dd7603e80b009dc059e20f4daea66f SHA256 94c185a0452b5fcddb538f6b686ff959b7afca8340c48fdbe47c87a2a459c3d3
DIST gstreamer-0.10.22.tar.bz2 2763761 RMD160 4d052b533b17eb05d2927ea2944c2f0f513a9179 SHA1 8be3e00cafefd8bbb402b77f0c19fbe359bde998 SHA256 61489e0192b1362e6dc760154204c73c1edd9ad9d8c754535483ec00ad7e389e
DIST gstreamer-0.10.23.tar.bz2 2871267 RMD160 7491281501adca311fd0d2cb8c92cd278e095fd2 SHA1 861af545b51be56b5782a636844f2e888ea7c90c SHA256 cf750821040102d2c9fbfed56472a86fd0d8c24ada37901c41867c88438a776d
-EBUILD gstreamer-0.10.14.ebuild 2216 RMD160 cb317baf6a9067db2168bef6651b44dec393cbc0 SHA1 cda76a7b901d36bdcae18bfec4b059aaf21d6c5e SHA256 1efc0053fc3c9ee53a55d0c3488bb2bc3cd4e0e5e4664ff6516be9aa65f3dee3
EBUILD gstreamer-0.10.20.ebuild 1608 RMD160 eed1b104aa85c05d04f6dac80c7d84d92ee91c3b SHA1 76f0dc328be209e55f5ebbe11ca761add175b6ba SHA256 5d84839f3b4a9f6dd8cee5ff5b4dbbec2f17149d8f0f802d1e1f0073ada62996
-EBUILD gstreamer-0.10.21-r10.ebuild 1976 RMD160 5553b5d161afe277c696c2405cf3a356929583ac SHA1 aef400ffc92bb2462d7f1a317313e4317c7ce054 SHA256 f97da256b67f0bc1e4880df51ea0d1171c2f5af7403eb50f4069039c58fdfa71
-EBUILD gstreamer-0.10.21-r3.ebuild 1852 RMD160 659eb9ff60496395e830f35dae95efd4709b9390 SHA1 e8a69f6f74d4c4aa5e61ce2fa11c606572bda523 SHA256 e3933355d0eafb4363e96b85a84f98325872aae0cc86cbde353e4f8924c35e97
-EBUILD gstreamer-0.10.21.ebuild 1734 RMD160 297a0b864b20c938f45b49cd26f5368c90bdbf8d SHA1 e75dde85f3808ff79b26e18b2c179424b1a80ba6 SHA256 9fdd963c15ca509e2f9f8576ed2eb8e33789ad619164fe7e32d9bb1a8062fabf
EBUILD gstreamer-0.10.22.ebuild 1539 RMD160 f44e70ed2dd290afbfe9d10f8b36a6670b116cc3 SHA1 64c9787100ded22f0e4fcbdf04357fdb68abedf4 SHA256 d7cc2cdb6b5de7217e9e4d5893e859fe96c91641ebc1c7a35e037b1e19be309e
EBUILD gstreamer-0.10.23.ebuild 1542 RMD160 657c00b5dde91feffc29b44974992661a4db14ca SHA1 2ed5a228bddb2092f15cb72219036e55d880f261 SHA256 6ae47cc7f01952c7755166bdbf942ac73969c4a84d0b15aa98d30e039b36f638
MISC ChangeLog 29541 RMD160 af531e56ae83469b974a6d114a83c4f56d3ef1c9 SHA1 176dabed5c44f60c87dbc9d1ae979eb59e4250db SHA256 20d8a38b86dab6300db171695ec0fd9d47a0f0278c97c31d7521197d340c5781
-MISC metadata.xml 181 RMD160 51814fbdcf7f32cfe70018b3af7fc798e41ff90d SHA1 faf40c45bd66b0072b95556cf7ab097d3be19511 SHA256 22c215902ccdc7fd8cdb765750fb23ea9d9b6c9d3edb1b45325c3469f8f6ffc5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoMbJsACgkQkKaRLQcq0GI5IgCgsmpj0eNG4PulycrmM9RXnYx2
-llMAoIiGl4V7p3s302xPQaPc7PZP6iJc
-=/sDY
------END PGP SIGNATURE-----
+MISC metadata.xml 183 RMD160 1ff3457acfc2fe0f859b9cc5879b3093b2979fe9 SHA1 829dff00498fcdadd7e4f172770790cf601450b2 SHA256 d204aaee1ef1b7f278926aeadf0958d8b6a81affb746a3924a565263a97022fc
diff --git a/media-libs/gstreamer/files/gstreamer-0.10.14-gstcaps.patch b/media-libs/gstreamer/files/gstreamer-0.10.14-gstcaps.patch
deleted file mode 100644
index f2eae496de45..000000000000
--- a/media-libs/gstreamer/files/gstreamer-0.10.14-gstcaps.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/files/gstreamer-0.10.21-b.g.o-555631.patch b/media-libs/gstreamer/files/gstreamer-0.10.21-b.g.o-555631.patch
deleted file mode 100644
index 922d8beb3cfa..000000000000
--- a/media-libs/gstreamer/files/gstreamer-0.10.21-b.g.o-555631.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-
-* libs/gst/base/gstbasetransform.c:
-(gst_base_transform_prepare_output_buffer),
-(gst_base_transform_buffer_alloc), (gst_base_transform_suggest):
-Protect sink_alloc caps with the sinkpad lock to avoid nasty caps
-refcount problems as seen in banshee and maybe also in farsight2.
-Remove atomic int now that we need to take the lock anyways.
-
-http://bugzilla.gnome.org/show_bug.cgi?id=555631
-http://bugs.gentoo.org/show_bug.cgi?id=250704
-http://webcvs.freedesktop.org/gstreamer/gstreamer/libs/gst/base/gstbasetransform.c?r1=1.126&r2=1.127
-
---- gstreamer/libs/gst/base/gstbasetransform.c 2008/10/20 13:29:06 1.126
-+++ gstreamer/libs/gst/base/gstbasetransform.c 2008/10/21 16:30:41 1.127
-@@ -251,7 +251,7 @@
- /* upstream caps and size suggestions */
- GstCaps *sink_suggest;
- guint size_suggest;
-- gint suggest_pending;
-+ gboolean suggest_pending;
-
- gboolean reconfigure;
- };
-@@ -1224,7 +1224,7 @@
- gst_caps_unref (priv->sink_suggest);
- priv->sink_suggest = gst_caps_ref (othercaps);
- priv->size_suggest = size_suggest;
-- g_atomic_int_set (&trans->priv->suggest_pending, 1);
-+ trans->priv->suggest_pending = TRUE;
- GST_OBJECT_UNLOCK (trans->sinkpad);
- }
- gst_caps_unref (othercaps);
-@@ -1366,7 +1366,7 @@
- GstBaseTransform *trans;
- GstBaseTransformPrivate *priv;
- GstFlowReturn res;
-- gboolean proxy, suggest;
-+ gboolean proxy, suggest, same_caps;
- GstCaps *sink_suggest;
- guint size_suggest;
-
-@@ -1384,8 +1384,12 @@
-
- /* we remember our previous alloc request to quickly see if we can proxy or
- * not. We skip this check if we have a pending suggestion. */
-- if (g_atomic_int_get (&priv->suggest_pending) == 0 && caps &&
-- gst_caps_is_equal (priv->sink_alloc, caps)) {
-+ GST_OBJECT_LOCK (pad);
-+ same_caps = !priv->suggest_pending && caps &&
-+ gst_caps_is_equal (priv->sink_alloc, caps);
-+ GST_OBJECT_UNLOCK (pad);
-+
-+ if (same_caps) {
- /* we have seen this before, see below if we need to proxy */
- GST_DEBUG_OBJECT (trans, "have old caps");
- sink_suggest = caps;
-@@ -1414,7 +1418,7 @@
- size_suggest = size;
- suggest = FALSE;
- }
-- g_atomic_int_set (&priv->suggest_pending, 0);
-+ priv->suggest_pending = FALSE;
- GST_OBJECT_UNLOCK (pad);
-
- /* check if we actually handle this format on the sinkpad */
-@@ -1462,7 +1466,10 @@
- }
- }
- /* remember the new caps */
-+ GST_OBJECT_LOCK (pad);
- gst_caps_replace (&priv->sink_alloc, sink_suggest);
-+ GST_OBJECT_UNLOCK (pad);
-+
- proxy = priv->proxy_alloc;
- GST_DEBUG_OBJECT (trans, "doing default alloc, proxy %d", proxy);
-
-@@ -1487,11 +1494,13 @@
- if (!gst_caps_is_equal (newcaps, caps)) {
- GST_DEBUG_OBJECT (trans, "caps are new");
- /* we have new caps, see if we can proxy downstream */
-- if (gst_pad_peer_accept_caps (trans->sinkpad, newcaps)) {
-+ if (gst_pad_peer_accept_caps (pad, newcaps)) {
- /* peer accepts the caps, return a buffer in this format */
- GST_DEBUG_OBJECT (trans, "peer accepted new caps");
- /* remember the format */
-+ GST_OBJECT_LOCK (pad);
- gst_caps_replace (&priv->sink_alloc, newcaps);
-+ GST_OBJECT_UNLOCK (pad);
- } else {
- GST_DEBUG_OBJECT (trans, "peer did not accept new caps");
- /* peer does not accept the caps, free the buffer we received and
-@@ -2306,7 +2315,7 @@
- caps = gst_caps_copy (caps);
- trans->priv->sink_suggest = caps;
- trans->priv->size_suggest = size;
-- g_atomic_int_set (&trans->priv->suggest_pending, 1);
-+ trans->priv->suggest_pending = TRUE;
- GST_DEBUG_OBJECT (trans, "new suggest %" GST_PTR_FORMAT, caps);
- GST_OBJECT_UNLOCK (trans->sinkpad);
- }
diff --git a/media-libs/gstreamer/files/gstreamer-0.10.21-bison241.patch b/media-libs/gstreamer/files/gstreamer-0.10.21-bison241.patch
deleted file mode 100644
index 1a941a66386c..000000000000
--- a/media-libs/gstreamer/files/gstreamer-0.10.21-bison241.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- common/m4/gst-parser.m4 2008/07/20 19:55:14 1.12
-+++ common/m4/gst-parser.m4 2008/12/15 07:06:26 1.13
-@@ -15,10 +15,7 @@
- bison_version=`$BISON_PATH --version | head -n 1 | sed 's/^[[^0-9]]*//' | sed 's/[[^0-9]]*$//' | cut -d' ' -f1`
- AC_MSG_CHECKING([bison version $bison_version >= $bison_min_version])
-
-- if perl -w <<EOF
-- exit ($bison_version < $bison_min_version) ? 0 : 1;
--EOF
-- then
-+ if perl -we "exit ((v$bison_version ge v$bison_min_version) ? 0 : 1)"; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_ERROR([no])
diff --git a/media-libs/gstreamer/files/gstreamer-0.10.21-gtkdoc.patch b/media-libs/gstreamer/files/gstreamer-0.10.21-gtkdoc.patch
deleted file mode 100644
index 12e9874e2670..000000000000
--- a/media-libs/gstreamer/files/gstreamer-0.10.21-gtkdoc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur gstreamer-0.10.21.orig/common/gtk-doc.mak gstreamer-0.10.21/common/gtk-doc.mak
---- gstreamer-0.10.21.orig/common/gtk-doc.mak 2008-09-10 12:13:16.000000000 +0300
-+++ gstreamer-0.10.21/common/gtk-doc.mak 2008-12-05 21:09:04.000000000 +0200
-@@ -200,8 +200,8 @@
- $(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp2 \
- $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \
- fi; \
-- which gtkdoc-rebase >/dev/null && \
-- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+ (which gtkdoc-rebase >/dev/null && \
-+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || true ; \
- fi)
- uninstall-local:
- (installfiles=`echo ./html/*.html`; \
-Only in gstreamer-0.10.21.orig: gstreamer-0.10.21
diff --git a/media-libs/gstreamer/gstreamer-0.10.14.ebuild b/media-libs/gstreamer/gstreamer-0.10.14.ebuild
deleted file mode 100644
index d64a9446f5d6..000000000000
--- a/media-libs/gstreamer/gstreamer-0.10.14.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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.12 2007/12/29 11:31:48 vapier Exp $
-
-inherit eutils libtool
-
-# Create a major/minor combo for our SLOT and executables suffix
-PVP=(${PV//[-\._]/ })
-PV_MAJ_MIN=${PVP[0]}.${PVP[1]}
-#PV_MAJ_MIN=0.10
-
-DESCRIPTION="Streaming media framework"
-HOMEPAGE="http://gstreamer.sourceforge.net"
-SRC_URI="http://gstreamer.freedesktop.org/src/gstreamer/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT=${PV_MAJ_MIN}
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.8
- >=dev-libs/libxml2-2.4.9"
-DEPEND="${RDEPEND}
- >=sys-devel/gettext-0.11.5
- dev-util/pkgconfig"
-# dev-util/gtk-doc
-# =app-text/docbook-xml-dtd-4.2*"
-
-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
-}
-
-src_compile() {
- econf --disable-docs-build --with-package-name="Gentoo GStreamer Ebuild" --with-package-origin="http://www.gentoo.org" || die
- emake -j1 || die "compile failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die
-
- # remove the unversioned binaries gstreamer provide
- # this is to prevent these binaries to be owned by several SLOTs
- cd "${D}"/usr/bin
- local gst_bins
- for gst_bins in $(ls *-${PV_MAJ_MIN}) ; do
- rm ${gst_bins/-${PV_MAJ_MIN}/}
- einfo "Removed ${gst_bins/-${PV_MAJ_MIN}/}"
- done
-
- cd "${S}"
- dodoc AUTHORS ChangeLog NEWS README RELEASE TODO
-
- echo "PRELINK_PATH_MASK=/usr/lib/${PN}-${PV_MAJ_MIN}" > 60${PN}-${PV_MAJ_MIN}
- doenvd 60${PN}-${PV_MAJ_MIN}
-}
-
-pkg_postinst() {
- elog "Gstreamer has known problems with prelinking, as a workaround"
- elog "this ebuild adds the gstreamer plugins to the prelink mask"
- elog "path to stop them from being prelinked. It is imperative"
- elog "that you undo & redo prelinking after building this pack for"
- elog "this to take effect. Make sure the gstreamer lib path is indeed"
- elog "added to the PRELINK_PATH_MASK environment variable."
- elog "For more information see http://bugs.gentoo.org/81512"
-}
diff --git a/media-libs/gstreamer/gstreamer-0.10.21-r10.ebuild b/media-libs/gstreamer/gstreamer-0.10.21-r10.ebuild
deleted file mode 100644
index e8b6723a4895..000000000000
--- a/media-libs/gstreamer/gstreamer-0.10.21-r10.ebuild
+++ /dev/null
@@ -1,66 +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/gstreamer/gstreamer-0.10.21-r10.ebuild,v 1.1 2009/01/09 12:54:19 loki_val Exp $
-
-EAPI=2
-
-inherit autotools eutils multilib versionator
-#inherit libtool versionator
-
-# Create a major/minor combo for our SLOT and executables suffix
-PV_MAJ_MIN=$(get_version_component_range '1-2')
-
-DESCRIPTION="Streaming media framework"
-HOMEPAGE="http://gstreamer.sourceforge.net"
-SRC_URI="http://${PN}.freedesktop.org/src/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT=${PV_MAJ_MIN}
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug nls test"
-
-RDEPEND=">=dev-libs/glib-2.12:2
- dev-libs/libxml2
- >=dev-libs/check-0.9.2"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- # Needed for sane .so versioning on Gentoo/FreeBSD
- #elibtoolize
- epatch "${FILESDIR}"/${P}-gtkdoc.patch \
- "${FILESDIR}"/${P}-bison241.patch \
- "${FILESDIR}"/${P}-b.g.o-555631.patch
- AT_M4DIR="common/m4" eautoreconf
-}
-
-src_configure() {
- # Disable static archives, dependency tracking and examples
- # to speed up build time
- econf \
- --disable-static \
- --disable-dependency-tracking \
- $(use_enable nls) \
- $(use_enable debug) \
- --disable-valgrind \
- --disable-examples \
- $(use_enable test tests) \
- --with-package-name="GStreamer ebuild for Gentoo" \
- --with-package-origin="http://packages.gentoo.org/package/media-libs/gstreamer"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
- dodoc AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE
-
- # Remove unversioned binaries to allow SLOT installations in future
- cd "${D}"/usr/bin
- local gst_bins
- for gst_bins in $(ls *-${PV_MAJ_MIN}); do
- rm -f ${gst_bins/-${PV_MAJ_MIN}/}
- done
-
- # Drop unnecessary libtool files
- find "${D}"/usr/$(get_libdir) -name '*.la' -delete || die "find and delete failed."
-}
diff --git a/media-libs/gstreamer/gstreamer-0.10.21-r3.ebuild b/media-libs/gstreamer/gstreamer-0.10.21-r3.ebuild
deleted file mode 100644
index 7908f18dce18..000000000000
--- a/media-libs/gstreamer/gstreamer-0.10.21-r3.ebuild
+++ /dev/null
@@ -1,63 +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/gstreamer/gstreamer-0.10.21-r3.ebuild,v 1.1 2009/01/09 12:54:19 loki_val Exp $
-
-EAPI=2
-
-inherit autotools eutils multilib versionator
-#inherit libtool versionator
-
-# Create a major/minor combo for our SLOT and executables suffix
-PV_MAJ_MIN=$(get_version_component_range '1-2')
-
-DESCRIPTION="Streaming media framework"
-HOMEPAGE="http://gstreamer.sourceforge.net"
-SRC_URI="http://${PN}.freedesktop.org/src/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT=${PV_MAJ_MIN}
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug nls test"
-
-RDEPEND=">=dev-libs/glib-2.12:2
- dev-libs/libxml2
- >=dev-libs/check-0.9.2"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- # Needed for sane .so versioning on Gentoo/FreeBSD
- #elibtoolize
- epatch "${FILESDIR}"/${P}-gtkdoc.patch \
- "${FILESDIR}"/${P}-bison241.patch \
- "${FILESDIR}"/${P}-b.g.o-555631.patch
- AT_M4DIR="common/m4" eautoreconf
-}
-
-src_configure() {
- # Disable static archives, dependency tracking and examples
- # to speed up build time
- econf \
- --disable-static \
- --disable-dependency-tracking \
- $(use_enable nls) \
- $(use_enable debug) \
- --disable-valgrind \
- --disable-examples \
- $(use_enable test tests) \
- --with-package-name="GStreamer ebuild for Gentoo" \
- --with-package-origin="http://packages.gentoo.org/package/media-libs/gstreamer"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
- dodoc AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE
-
- # Remove unversioned binaries to allow SLOT installations in future
- cd "${D}"/usr/bin
- local gst_bins
- for gst_bins in $(ls *-${PV_MAJ_MIN}); do
- rm ${gst_bins/-${PV_MAJ_MIN}/}
- done
-}
diff --git a/media-libs/gstreamer/gstreamer-0.10.21.ebuild b/media-libs/gstreamer/gstreamer-0.10.21.ebuild
deleted file mode 100644
index 1a42b3d51f59..000000000000
--- a/media-libs/gstreamer/gstreamer-0.10.21.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.10.21.ebuild,v 1.2 2008/12/06 06:46:42 ssuominen Exp $
-
-# inherit libtool
-inherit autotools eutils
-
-# Create a major/minor combo for our SLOT and executables suffix
-PVP=(${PV//[-\._]/ })
-PV_MAJ_MIN=${PVP[0]}.${PVP[1]}
-
-DESCRIPTION="Streaming media framework"
-HOMEPAGE="http://gstreamer.sourceforge.net"
-SRC_URI="http://${PN}.freedesktop.org/src/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT=${PV_MAJ_MIN}
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug nls test"
-
-RDEPEND=">=dev-libs/glib-2.12
- >=dev-libs/libxml2-2.4.9
- >=dev-libs/check-0.9.2"
-DEPEND="${RDEPEND}
- nls? ( >=sys-devel/gettext-0.11.5 )
- dev-util/pkgconfig
- !<media-libs/gst-plugins-ugly-0.10.6-r1
- !=media-libs/gst-plugins-good-0.10.8"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- # Needed for sane .so versioning on Gentoo/FreeBSD
- # elibtoolize
- epatch "${FILESDIR}"/${P}-gtkdoc.patch
- AT_M4DIR="common/m4" eautoreconf
-}
-
-src_compile() {
- econf --disable-dependency-tracking \
- --with-package-name="Gentoo GStreamer ebuild" \
- --with-package-origin="http://www.gentoo.org" \
- $(use_enable test tests) \
- $(use_enable debug) \
- $(use_enable nls)
-
- emake || die "emake failed."
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
- dodoc AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE
-
- # Remove unversioned binaries to allow SLOT installations in future.
- cd "${D}"/usr/bin
- local gst_bins
- for gst_bins in $(ls *-${PV_MAJ_MIN}) ; do
- rm ${gst_bins/-${PV_MAJ_MIN}/}
- einfo "Removed ${gst_bins/-${PV_MAJ_MIN}/}"
- done
-}
diff --git a/media-libs/gstreamer/metadata.xml b/media-libs/gstreamer/metadata.xml
index 3abe2ca2733e..6cb5dfb547c2 100644
--- a/media-libs/gstreamer/metadata.xml
+++ b/media-libs/gstreamer/metadata.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gstreamer</herd>
-<herd>gnome</herd>
+ <herd>gstreamer</herd>
+ <herd>gnome</herd>
</pkgmetadata>