summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2012-12-02 17:49:12 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2012-12-02 17:49:12 +0000
commit38e136b719895d114e52f55b59aabab651b0d36e (patch)
tree7ca127201ed737289ced54a3dfbdb613765f077f /media-plugins
parentUpdate with ebuild from gnome overlay. (diff)
downloadgentoo-2-38e136b719895d114e52f55b59aabab651b0d36e.tar.gz
gentoo-2-38e136b719895d114e52f55b59aabab651b0d36e.tar.bz2
gentoo-2-38e136b719895d114e52f55b59aabab651b0d36e.zip
Update with ebuild from gnome overlay.
(Portage version: 2.2.0_alpha143/cvs/Linux x86_64, signed Manifest commit with key C6085806)
Diffstat (limited to 'media-plugins')
-rw-r--r--media-plugins/gst-plugins-x/ChangeLog6
-rw-r--r--media-plugins/gst-plugins-x/gst-plugins-x-0.10.36.ebuild12
2 files changed, 12 insertions, 6 deletions
diff --git a/media-plugins/gst-plugins-x/ChangeLog b/media-plugins/gst-plugins-x/ChangeLog
index 7e83495b6ce4..693f934a9f3f 100644
--- a/media-plugins/gst-plugins-x/ChangeLog
+++ b/media-plugins/gst-plugins-x/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-plugins/gst-plugins-x
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/ChangeLog,v 1.128 2012/12/02 16:41:59 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/ChangeLog,v 1.129 2012/12/02 17:49:12 eva Exp $
+
+ 02 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+ gst-plugins-x-0.10.36.ebuild:
+ Update with ebuild from gnome overlay.
02 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
-gst-plugins-x-0.10.32.ebuild, gst-plugins-x-0.10.35.ebuild:
diff --git a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36.ebuild b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36.ebuild
index 5df07081202b..1bd0c135114e 100644
--- a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36.ebuild
+++ b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36.ebuild,v 1.1 2012/10/21 08:02:19 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36.ebuild,v 1.2 2012/12/02 17:49:12 eva Exp $
-EAPI=4
+EAPI="5"
-inherit gst-plugins-base
+inherit gst-plugins-base gst-plugins10
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE=""
@@ -20,10 +20,12 @@ GST_PLUGINS_BUILD="x xshm"
GST_PLUGINS_BUILD_DIR="ximage"
src_prepare() {
- gst-plugins-base_src_prepare
-
# The AC_PATH_XTRA macro unnecessarily pulls in libSM and libICE even
# though they are not actually used. This needs to be fixed upstream by
# replacing AC_PATH_XTRA with PKG_CONFIG calls.
sed -i -e 's:X_PRE_LIBS -lSM -lICE:X_PRE_LIBS:' "${S}"/configure
+
+ gst-plugins10_system_link \
+ gst-libs/gst/video:gstreamer-video \
+ gst-libs/gst/interfaces:gstreamer-interfaces
}