summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-07-12 07:48:13 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-15 08:29:59 (GMT)
commita9bbda96ebebe9b7b57afdb96f0606c207835d7b (patch)
tree1c21694ad877b6739d676f2be00c37ddfb2192db /meta
parent7a6b2ce603a44db60a3ba7a4a62ec3c04c1db656 (diff)
downloadpoky-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')
-rw-r--r--meta/classes/bluetooth.bbclass14
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/conf/distro/include/default-providers.inc1
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5_5.50.bb2
-rw-r--r--meta/recipes-connectivity/connman/connman.inc4
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb4
-rw-r--r--meta/recipes-connectivity/neard/neard_0.16.bb4
-rw-r--r--meta/recipes-connectivity/ofono/ofono.inc4
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-base.bb4
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc4
-rw-r--r--meta/recipes-devtools/strace/strace_4.26.bb4
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.0.bb4
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc5
13 files changed, 18 insertions, 38 deletions
diff --git a/meta/classes/bluetooth.bbclass b/meta/classes/bluetooth.bbclass
deleted file mode 100644
index f88b4ae..0000000
--- a/meta/classes/bluetooth.bbclass
+++ /dev/null
@@ -1,14 +0,0 @@
1# Avoid code duplication in bluetooth-dependent recipes.
2
3# Define a variable that expands to the recipe (package) providing core
4# bluetooth support on the platform:
5# "" if bluetooth is not in DISTRO_FEATURES
6# else "bluez5" if bluez5 is in DISTRO_FEATURES
7# else "bluez4"
8
9# Use this with:
10# inherit bluetooth
11# PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}
12# PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4"
13
14BLUEZ ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5', 'bluez4', d), '', d)}"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 5e93f5c..140f45b 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -839,7 +839,7 @@ DISTRO_FEATURES_NATIVESDK ?= "x11"
839DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation" 839DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation"
840DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation" 840DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation"
841 841
842DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit bluez5 gobject-introspection-data ldconfig" 842DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data ldconfig"
843MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode" 843MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"
844 844
845COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES', 'MACHINE_FEATURES', d)}" 845COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES', 'MACHINE_FEATURES', d)}"
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index 2be3378..8f4d44d 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -44,7 +44,6 @@ PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg"
44PREFERRED_PROVIDER_console-tools ?= "kbd" 44PREFERRED_PROVIDER_console-tools ?= "kbd"
45PREFERRED_PROVIDER_gzip-native ?= "pigz-native" 45PREFERRED_PROVIDER_gzip-native ?= "pigz-native"
46PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}" 46PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}"
47PREFERRED_RPROVIDER_bluez-hcidump ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez-hcidump',d)}"
48# Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb 47# Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb
49PREFERRED_PROVIDER_ltp ?= "ltp" 48PREFERRED_PROVIDER_ltp ?= "ltp"
50PREFERRED_PROVIDER_getopt ?= "util-linux-getopt" 49PREFERRED_PROVIDER_getopt ?= "util-linux-getopt"
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.50.bb b/meta/recipes-connectivity/bluez5/bluez5_5.50.bb
index 6627143..4e443e5 100644
--- a/meta/recipes-connectivity/bluez5/bluez5_5.50.bb
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.50.bb
@@ -1,7 +1,5 @@
1require bluez5.inc 1require bluez5.inc
2 2
3REQUIRED_DISTRO_FEATURES = "bluez5"
4
5SRC_URI[md5sum] = "8e35c67c81a55d3ad4c9f22280dae178" 3SRC_URI[md5sum] = "8e35c67c81a55d3ad4c9f22280dae178"
6SRC_URI[sha256sum] = "5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911" 4SRC_URI[sha256sum] = "5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911"
7 5
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index ae67079..ee00479 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -13,7 +13,7 @@ LICENSE = "GPLv2"
13LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ 13LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
14 file://src/main.c;beginline=1;endline=20;md5=486a279a6ab0c8d152bcda3a5b5edc36" 14 file://src/main.c;beginline=1;endline=20;md5=486a279a6ab0c8d152bcda3a5b5edc36"
15 15
16inherit autotools pkgconfig systemd update-rc.d bluetooth update-alternatives 16inherit autotools pkgconfig systemd update-rc.d update-alternatives
17 17
18DEPENDS = "dbus glib-2.0 ppp readline" 18DEPENDS = "dbus glib-2.0 ppp readline"
19 19
@@ -42,7 +42,7 @@ PACKAGECONFIG ??= "wispr \
42 42
43PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/ --with-tmpfilesdir=${sysconfdir}/tmpfiles.d/,--with-systemdunitdir='' --with-tmpfilesdir=''" 43PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/ --with-tmpfilesdir=${sysconfdir}/tmpfiles.d/,--with-systemdunitdir='' --with-tmpfilesdir=''"
44PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant, wpa-supplicant" 44PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant, wpa-supplicant"
45PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}, ${BLUEZ}" 45PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, bluez5, bluez5"
46PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono, ofono" 46PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono, ofono"
47PACKAGECONFIG[tist] = "--enable-tist,--disable-tist," 47PACKAGECONFIG[tist] = "--enable-tist,--disable-tist,"
48PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn" 48PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn"
diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb b/meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb
index 7836156..77bc31a 100644
--- a/meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb
+++ b/meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb
@@ -16,7 +16,7 @@ SRC_URI = "https://www.tcpdump.org/release/${BP}.tar.gz \
16SRC_URI[md5sum] = "dffd65cb14406ab9841f421732eb0f33" 16SRC_URI[md5sum] = "dffd65cb14406ab9841f421732eb0f33"
17SRC_URI[sha256sum] = "2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019" 17SRC_URI[sha256sum] = "2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019"
18 18
19inherit autotools binconfig-disabled pkgconfig bluetooth 19inherit autotools binconfig-disabled pkgconfig
20 20
21BINCONFIG = "${bindir}/pcap-config" 21BINCONFIG = "${bindir}/pcap-config"
22 22
@@ -29,7 +29,7 @@ EXTRA_OECONF = " \
29 " 29 "
30EXTRA_AUTORECONF += "--exclude=aclocal" 30EXTRA_AUTORECONF += "--exclude=aclocal"
31 31
32PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ 32PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \
33 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ 33 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
34" 34"
35PACKAGECONFIG[bluez5] = "--enable-bluetooth,--disable-bluetooth,bluez5" 35PACKAGECONFIG[bluez5] = "--enable-bluetooth,--disable-bluetooth,bluez5"
diff --git a/meta/recipes-connectivity/neard/neard_0.16.bb b/meta/recipes-connectivity/neard/neard_0.16.bb
index cc6af4e..7c124a3 100644
--- a/meta/recipes-connectivity/neard/neard_0.16.bb
+++ b/meta/recipes-connectivity/neard/neard_0.16.bb
@@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
18 file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ 18 file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \
19 " 19 "
20 20
21inherit autotools pkgconfig systemd update-rc.d bluetooth 21inherit autotools pkgconfig systemd update-rc.d
22 22
23PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" 23PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
24 24
@@ -40,7 +40,7 @@ RDEPENDS_${PN} = "dbus"
40 40
41# Bluez & Wifi are not mandatory except for handover 41# Bluez & Wifi are not mandatory except for handover
42RRECOMMENDS_${PN} = "\ 42RRECOMMENDS_${PN} = "\
43 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ 43 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \
44 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \ 44 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
45 " 45 "
46 46
diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index e1185c6..03d0fd5 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
6 file://src/ofono.h;beginline=1;endline=20;md5=3ce17d5978ef3445def265b98899c2ee" 6 file://src/ofono.h;beginline=1;endline=20;md5=3ce17d5978ef3445def265b98899c2ee"
7 7
8inherit autotools pkgconfig update-rc.d systemd bluetooth gobject-introspection-data 8inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data
9 9
10DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ell" 10DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ell"
11 11
@@ -17,7 +17,7 @@ PACKAGECONFIG ??= "\
17 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ 17 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
18 " 18 "
19PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" 19PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir="
20PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}" 20PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, bluez5"
21 21
22EXTRA_OECONF += "--enable-test --enable-external-ell" 22EXTRA_OECONF += "--enable-test --enable-external-ell"
23 23
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
index d054036..1f802da 100644
--- a/meta/recipes-core/packagegroups/packagegroup-base.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
@@ -7,7 +7,6 @@ PR = "r83"
7PACKAGE_ARCH = "${MACHINE_ARCH}" 7PACKAGE_ARCH = "${MACHINE_ARCH}"
8 8
9inherit packagegroup 9inherit packagegroup
10inherit bluetooth
11 10
12PROVIDES = "${PACKAGES}" 11PROVIDES = "${PACKAGES}"
13PACKAGES = ' \ 12PACKAGES = ' \
@@ -199,8 +198,7 @@ RRECOMMENDS_packagegroup-base-pcmcia = "\
199 198
200SUMMARY_packagegroup-base-bluetooth = "Bluetooth support" 199SUMMARY_packagegroup-base-bluetooth = "Bluetooth support"
201RDEPENDS_packagegroup-base-bluetooth = "\ 200RDEPENDS_packagegroup-base-bluetooth = "\
202 ${BLUEZ} \ 201 bluez5 \
203 ${@bb.utils.contains('COMBINED_FEATURES', 'alsa', bb.utils.contains('BLUEZ', 'bluez4', 'libasound-module-bluez', '', d), '',d)} \
204 " 202 "
205 203
206RRECOMMENDS_packagegroup-base-bluetooth = "\ 204RRECOMMENDS_packagegroup-base-bluetooth = "\
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index ac475a8..3237970 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -5,7 +5,7 @@ LICENSE = "GPLv2 & LGPLv2.1"
5RDEPENDS_${PN}-ptest = "bash make" 5RDEPENDS_${PN}-ptest = "bash make"
6 6
7require qemu-targets.inc 7require qemu-targets.inc
8inherit pkgconfig bluetooth ptest 8inherit pkgconfig ptest
9 9
10LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ 10LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
11 file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f" 11 file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"
@@ -148,7 +148,7 @@ PACKAGECONFIG[lzo] = "--enable-lzo,--disable-lzo,lzo"
148PACKAGECONFIG[numa] = "--enable-numa,--disable-numa,numactl" 148PACKAGECONFIG[numa] = "--enable-numa,--disable-numa,numactl"
149PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls" 149PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls"
150PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2" 150PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2"
151PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,${BLUEZ}" 151PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez5"
152PACKAGECONFIG[libiscsi] = "--enable-libiscsi,--disable-libiscsi" 152PACKAGECONFIG[libiscsi] = "--enable-libiscsi,--disable-libiscsi"
153PACKAGECONFIG[kvm] = "--enable-kvm,--disable-kvm" 153PACKAGECONFIG[kvm] = "--enable-kvm,--disable-kvm"
154PACKAGECONFIG[virglrenderer] = "--enable-virglrenderer,--disable-virglrenderer,virglrenderer" 154PACKAGECONFIG[virglrenderer] = "--enable-virglrenderer,--disable-virglrenderer,virglrenderer"
diff --git a/meta/recipes-devtools/strace/strace_4.26.bb b/meta/recipes-devtools/strace/strace_4.26.bb
index 3b61fc3..2688724 100644
--- a/meta/recipes-devtools/strace/strace_4.26.bb
+++ b/meta/recipes-devtools/strace/strace_4.26.bb
@@ -20,13 +20,13 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
20SRC_URI[md5sum] = "daa51acc0c7c696221ec03cf0b30a7af" 20SRC_URI[md5sum] = "daa51acc0c7c696221ec03cf0b30a7af"
21SRC_URI[sha256sum] = "7c4d2ffeef4f7d1cdc71062ca78d1130eb52f947c2fca82f59f6a1183bfa1e1c" 21SRC_URI[sha256sum] = "7c4d2ffeef4f7d1cdc71062ca78d1130eb52f947c2fca82f59f6a1183bfa1e1c"
22 22
23inherit autotools ptest bluetooth 23inherit autotools ptest
24 24
25PACKAGECONFIG_class-target ??= "\ 25PACKAGECONFIG_class-target ??= "\
26 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ 26 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
27" 27"
28 28
29PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,${BLUEZ}" 29PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,bluez5"
30PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" 30PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind"
31 31
32EXTRA_OECONF += "--enable-mpers=no" 32EXTRA_OECONF += "--enable-mpers=no"
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 5af01a3..f9289e9 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
20DEPENDS += "gstreamer1.0-plugins-base" 20DEPENDS += "gstreamer1.0-plugins-base"
21 21
22inherit gettext bluetooth gobject-introspection 22inherit gettext gobject-introspection
23 23
24PACKAGECONFIG ??= " \ 24PACKAGECONFIG ??= " \
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
37PACKAGECONFIG[assrender] = "--enable-assrender,--disable-assrender,libass" 37PACKAGECONFIG[assrender] = "--enable-assrender,--disable-assrender,libass"
38PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,${BLUEZ}" 38PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez5"
39PACKAGECONFIG[bz2] = "--enable-bz2,--disable-bz2,bzip2" 39PACKAGECONFIG[bz2] = "--enable-bz2,--disable-bz2,bzip2"
40PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" 40PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
41PACKAGECONFIG[dash] = "--enable-dash,--disable-dash,libxml2" 41PACKAGECONFIG[dash] = "--enable-dash,--disable-dash,libxml2"
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 9a95e7c..e245be7 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"
61DEPENDS += "udev alsa-lib glib-2.0" 61DEPENDS += "udev alsa-lib glib-2.0"
62DEPENDS += "speexdsp libxml-parser-perl-native libcap" 62DEPENDS += "speexdsp libxml-parser-perl-native libcap"
63 63
64inherit autotools bash-completion pkgconfig useradd gettext perlnative bluetooth systemd manpages gsettings 64inherit 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).
99EXTRA_OECONF += "--disable-adrian-aec" 99EXTRA_OECONF += "--disable-adrian-aec"
100 100
101PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ 101PACKAGECONFIG ??= "${@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
108PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" 108PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
109PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4 sbc"
110PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc" 109PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc"
111PACKAGECONFIG[gconf] = "--enable-gconf,--disable-gconf,gconf" 110PACKAGECONFIG[gconf] = "--enable-gconf,--disable-gconf,gconf"
112PACKAGECONFIG[gsettings] = "--enable-gsettings,--disable-gsettings,glib-2.0-native glib-2.0" 111PACKAGECONFIG[gsettings] = "--enable-gsettings,--disable-gsettings,glib-2.0-native glib-2.0"