summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-03-10 18:42:14 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-10 18:45:17 -0800
commit08ae53fb6d3676e6db79cb4f76ce8bad3f18bb47 (patch)
tree8aafa026503315b4bfe9aa5abb29eda2d8d6bd23 /meta/recipes-multimedia
parentb36930096d737245d25de87a79988db63bd99545 (diff)
downloadpoky-08ae53fb6d3676e6db79cb4f76ce8bad3f18bb47.tar.gz
gst-plugins-good: remove dependency on hal
Disable hal usage at configure time to avoid dependency on hal (which is deprecated). Only affects "halelements" which is of no use without hal. Fixes [YOCTO #810] and reverts changes from c6b0c5720fa. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.26.bb4
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins.inc2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.26.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.26.bb
index 78b24fe8d3..ac47ecf915 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.26.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.26.bb
@@ -7,11 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
7 7
8DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \ 8DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \
9 speex" 9 speex"
10PR = "r0" 10PR = "r1"
11 11
12inherit gettext 12inherit gettext
13 13
14EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --without-check" 14EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal --without-check"
15 15
16do_configure_prepend() { 16do_configure_prepend() {
17 # This m4 file contains nastiness which conflicts with libtool 2.2.2 17 # This m4 file contains nastiness which conflicts with libtool 2.2.2
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
index d1abd369d9..4edca95611 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://gstreamer.freedesktop.org/"
3BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer" 3BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer"
4SECTION = "multimedia" 4SECTION = "multimedia"
5PRIORITY = "optional" 5PRIORITY = "optional"
6DEPENDS = "gstreamer hal" 6DEPENDS = "gstreamer"
7 7
8inherit autotools pkgconfig 8inherit autotools pkgconfig
9 9