From 44b08f2dffbcee1fcc573adabcd2d3201cf9a8db Mon Sep 17 00:00:00 2001 From: "Peter A. Bigot" Date: Mon, 16 Feb 2015 17:06:18 +0200 Subject: gstreamer1.0-plugins-bad: select distro preference for bluez provider (From OE-Core rev: c8063dd66369dfc2fcb3e2dc27929a8aa5e4c74a) Signed-off-by: Peter A. Bigot Signed-off-by: Cristian Iorga Signed-off-by: Richard Purdie --- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc | 4 ++-- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'meta/recipes-multimedia/gstreamer') 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}" SRC_URI += "file://configure-allow-to-disable-libssh2.patch \ " -inherit gettext +inherit gettext bluetooth # opengl packageconfig factored out to make it easy for distros # and BSP layers to pick either (desktop) opengl, gles2, or no GL @@ -49,7 +49,7 @@ PACKAGECONFIG[bz2] = "--enable-bz2,--disable-bz2,bzip2" PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth" PACKAGECONFIG[schroedinger] = "--enable-schro,--disable-schro,schroedinger" PACKAGECONFIG[smoothstreaming] = "--enable-smoothstreaming,--disable-smoothstreaming,libxml2" -PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4" +PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,${BLUEZ}" PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg" PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1" PACKAGECONFIG[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" SRCREV = "6e5db57d2446a753aaa76bee268e1f95600b14ce" -PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4" PACKAGECONFIG[sbc] = "--enable-sbc,--disable-sbc,sbc" PACKAGECONFIG[hls] = "--enable-hls,--disable-hls,gnutls" -- cgit v1.2.3-54-g00ecf