summaryrefslogtreecommitdiffstats
path: root/meta/packages/gstreamer
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-09-26 08:55:15 +0000
committerRoss Burton <ross@openedhand.com>2008-09-26 08:55:15 +0000
commit75f3f9bb6d823faec884569400f9dcb6c28ef732 (patch)
treed5d5ba3b7b351c091d771a5ce9ee4df65abc77da /meta/packages/gstreamer
parent148459e611bd67fc99f29146f95403ecacbd3793 (diff)
downloadpoky-75f3f9bb6d823faec884569400f9dcb6c28ef732.tar.gz
Merged revisions 5177-5178,5181,5183,5185,5187 via svnmerge from
https://svn.o-hand.com/repos/poky/trunk ........ r5177 | richard | 2008-09-10 23:29:43 +0100 (Wed, 10 Sep 2008) | 1 line package.bbclass: Adjust to handle split packages already being present in PACKAGES ........ r5178 | richard | 2008-09-10 23:32:22 +0100 (Wed, 10 Sep 2008) | 1 line gst-plugins-good: Remove bogus RPROVIDES and add to PACKAGES instead now the package class can handle this ........ r5181 | richard | 2008-09-11 12:00:49 +0100 (Thu, 11 Sep 2008) | 1 line poky-eabi.inc/poky-fixed-revisions.inc: Bump the matchbox-wm-2 revision and remove from the asneeded blacklist ........ r5183 | richard | 2008-09-11 16:43:25 +0100 (Thu, 11 Sep 2008) | 1 line eds-dbus: Add missing DEPENDS on libglade ........ r5185 | ross | 2008-09-11 17:07:38 +0100 (Thu, 11 Sep 2008) | 1 line eds-dbus: package the glade files into libedataserverui ........ r5187 | ross | 2008-09-11 17:57:47 +0100 (Thu, 11 Sep 2008) | 1 line eds-dbus: add libedataserverui to PACKAGES, fixing the borked packaging ........ git-svn-id: https://svn.o-hand.com/repos/poky/branches/elroy@5283 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gstreamer')
-rw-r--r--meta/packages/gstreamer/gst-plugins-good_0.10.9.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/packages/gstreamer/gst-plugins-good_0.10.9.bb b/meta/packages/gstreamer/gst-plugins-good_0.10.9.bb
index b5aa10b174..3b05ba8e72 100644
--- a/meta/packages/gstreamer/gst-plugins-good_0.10.9.bb
+++ b/meta/packages/gstreamer/gst-plugins-good_0.10.9.bb
@@ -1,11 +1,11 @@
1require gst-plugins.inc 1require gst-plugins.inc
2DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \ 2DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \
3 speex" 3 speex"
4PR = "r3" 4PR = "r4"
5 5
6EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --without-check" 6EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --without-check"
7 7
8RPROVIDES = "gst-plugin-id3demux" 8PACKAGES += "gst-plugin-id3demux"
9 9
10do_configure_prepend() { 10do_configure_prepend() {
11 # This m4 file contains nastiness which conflicts with libtool 2.2.2 11 # This m4 file contains nastiness which conflicts with libtool 2.2.2