summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter A. Bigot <pab@pabigot.com>2015-02-16 17:06:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-17 13:43:39 +0000
commit44b08f2dffbcee1fcc573adabcd2d3201cf9a8db (patch)
tree65ffa713e008471cc0d64b07cec2f53a91e2f64f
parent4e2642e4490b49ab6cceb313e448b967a43b77a6 (diff)
downloadpoky-44b08f2dffbcee1fcc573adabcd2d3201cf9a8db.tar.gz
gstreamer1.0-plugins-bad: select distro preference for bluez provider
(From OE-Core rev: c8063dd66369dfc2fcb3e2dc27929a8aa5e4c74a) Signed-off-by: Peter A. Bigot <pab@pabigot.com> Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc4
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb1
2 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index 9c15f2b1ed..69a15a2ccf 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -9,7 +9,7 @@ S = "${WORKDIR}/gst-plugins-bad-${PV}"
9SRC_URI += "file://configure-allow-to-disable-libssh2.patch \ 9SRC_URI += "file://configure-allow-to-disable-libssh2.patch \
10 " 10 "
11 11
12inherit gettext 12inherit gettext bluetooth
13 13
14# opengl packageconfig factored out to make it easy for distros 14# opengl packageconfig factored out to make it easy for distros
15# and BSP layers to pick either (desktop) opengl, gles2, or no GL 15# and BSP layers to pick either (desktop) opengl, gles2, or no GL
@@ -49,7 +49,7 @@ PACKAGECONFIG[bz2] = "--enable-bz2,--disable-bz2,bzip2"
49PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth" 49PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth"
50PACKAGECONFIG[schroedinger] = "--enable-schro,--disable-schro,schroedinger" 50PACKAGECONFIG[schroedinger] = "--enable-schro,--disable-schro,schroedinger"
51PACKAGECONFIG[smoothstreaming] = "--enable-smoothstreaming,--disable-smoothstreaming,libxml2" 51PACKAGECONFIG[smoothstreaming] = "--enable-smoothstreaming,--disable-smoothstreaming,libxml2"
52PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4" 52PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,${BLUEZ}"
53PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg" 53PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg"
54PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1" 54PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1"
55PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" 55PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
index 75859f9a89..309505f7db 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
@@ -11,7 +11,6 @@ S = "${WORKDIR}/git"
11 11
12SRCREV = "6e5db57d2446a753aaa76bee268e1f95600b14ce" 12SRCREV = "6e5db57d2446a753aaa76bee268e1f95600b14ce"
13 13
14PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4"
15PACKAGECONFIG[sbc] = "--enable-sbc,--disable-sbc,sbc" 14PACKAGECONFIG[sbc] = "--enable-sbc,--disable-sbc,sbc"
16PACKAGECONFIG[hls] = "--enable-hls,--disable-hls,gnutls" 15PACKAGECONFIG[hls] = "--enable-hls,--disable-hls,gnutls"
17 16