diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-07-12 10:48:13 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-15 09:29:59 +0100 |
commit | a9bbda96ebebe9b7b57afdb96f0606c207835d7b (patch) | |
tree | 1c21694ad877b6739d676f2be00c37ddfb2192db /meta/recipes-multimedia | |
parent | 7a6b2ce603a44db60a3ba7a4a62ec3c04c1db656 (diff) | |
download | poky-a9bbda96ebebe9b7b57afdb96f0606c207835d7b.tar.gz |
meta: Remove remnants of bluez4 support
bluez4 was removed from meta-oe 2 years ago.
Simplfy the setup of the two level bluetooth and bluez4/bluez5
distro features by removing the bluez4/bluez5 distro features.
This also removes the no longer required bluetooth class.
(From OE-Core rev: dcf889e93401f7c4de0055d53271eacc3882eccc)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.0.bb | 4 | ||||
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.0.bb index 5af01a37ce..f9289e92d2 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.0.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.0.bb | |||
@@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d \ | |||
19 | 19 | ||
20 | DEPENDS += "gstreamer1.0-plugins-base" | 20 | DEPENDS += "gstreamer1.0-plugins-base" |
21 | 21 | ||
22 | inherit gettext bluetooth gobject-introspection | 22 | inherit gettext gobject-introspection |
23 | 23 | ||
24 | PACKAGECONFIG ??= " \ | 24 | PACKAGECONFIG ??= " \ |
25 | ${GSTREAMER_ORC} \ | 25 | ${GSTREAMER_ORC} \ |
@@ -35,7 +35,7 @@ PACKAGECONFIG ??= " \ | |||
35 | # not add GL dependencies here, since these are taken care of in -base. | 35 | # not add GL dependencies here, since these are taken care of in -base. |
36 | 36 | ||
37 | PACKAGECONFIG[assrender] = "--enable-assrender,--disable-assrender,libass" | 37 | PACKAGECONFIG[assrender] = "--enable-assrender,--disable-assrender,libass" |
38 | PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,${BLUEZ}" | 38 | PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez5" |
39 | PACKAGECONFIG[bz2] = "--enable-bz2,--disable-bz2,bzip2" | 39 | PACKAGECONFIG[bz2] = "--enable-bz2,--disable-bz2,bzip2" |
40 | PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" | 40 | PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" |
41 | PACKAGECONFIG[dash] = "--enable-dash,--disable-dash,libxml2" | 41 | PACKAGECONFIG[dash] = "--enable-dash,--disable-dash,libxml2" |
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 9a95e7c65b..e245be7f77 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc | |||
@@ -61,7 +61,7 @@ DEPENDS = "libatomic-ops libsndfile1 libtool intltool-native" | |||
61 | DEPENDS += "udev alsa-lib glib-2.0" | 61 | DEPENDS += "udev alsa-lib glib-2.0" |
62 | DEPENDS += "speexdsp libxml-parser-perl-native libcap" | 62 | DEPENDS += "speexdsp libxml-parser-perl-native libcap" |
63 | 63 | ||
64 | inherit autotools bash-completion pkgconfig useradd gettext perlnative bluetooth systemd manpages gsettings | 64 | inherit autotools bash-completion pkgconfig useradd gettext perlnative systemd manpages gsettings |
65 | 65 | ||
66 | # *.desktop rules wont be generated during configure and build will fail | 66 | # *.desktop rules wont be generated during configure and build will fail |
67 | # if using --disable-nls | 67 | # if using --disable-nls |
@@ -98,7 +98,7 @@ EXTRA_OECONF += "--without-fftw" | |||
98 | # very good anyway, better alternatives exist (such as the webrtc canceller). | 98 | # very good anyway, better alternatives exist (such as the webrtc canceller). |
99 | EXTRA_OECONF += "--disable-adrian-aec" | 99 | EXTRA_OECONF += "--disable-adrian-aec" |
100 | 100 | ||
101 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ | 101 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ |
102 | ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ | 102 | ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ |
103 | ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', d)} \ | 103 | ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', d)} \ |
104 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd x11', d)} \ | 104 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd x11', d)} \ |
@@ -106,7 +106,6 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ | |||
106 | " | 106 | " |
107 | 107 | ||
108 | PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" | 108 | PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" |
109 | PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4 sbc" | ||
110 | PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc" | 109 | PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc" |
111 | PACKAGECONFIG[gconf] = "--enable-gconf,--disable-gconf,gconf" | 110 | PACKAGECONFIG[gconf] = "--enable-gconf,--disable-gconf,gconf" |
112 | PACKAGECONFIG[gsettings] = "--enable-gsettings,--disable-gsettings,glib-2.0-native glib-2.0" | 111 | PACKAGECONFIG[gsettings] = "--enable-gsettings,--disable-gsettings,glib-2.0-native glib-2.0" |