summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-01-07 17:42:40 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-11 10:39:10 +0000
commit5649ccaa12e06dfec0414acd1cbb3eada9df0163 (patch)
tree236571301757f4c40590756d00c399c7782c47ee
parentc62ad6939fb798abf346e49f696b5ebbfc9ab4e9 (diff)
downloadpoky-5649ccaa12e06dfec0414acd1cbb3eada9df0163.tar.gz
pulseaudio: add PACKAGECONFIGs for GConf and GSettings
Behaviour is kept the same. (From OE-Core rev: 649b8a517fd43293b8f7c5f3671887bc4703063a) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc17
1 files changed, 9 insertions, 8 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index bb3064eb9c..f50569dbb7 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -58,10 +58,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0e5cd938de1a7a53ea5adac38cc10c39 \
58 58
59DEPENDS = "libatomic-ops libsndfile1 libtool intltool-native" 59DEPENDS = "libatomic-ops libsndfile1 libtool intltool-native"
60# optional 60# optional
61DEPENDS += "udev alsa-lib glib-2.0 gconf" 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 64inherit autotools bash-completion pkgconfig useradd gettext perlnative bluetooth 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,20 +98,18 @@ 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
101# FIXME: The gsettings module is temporarily disabled, because adding support
102# for it is a bit complicated.
103EXTRA_OECONF += "--disable-gsettings"
104
105PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ 101PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
106 ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ 102 ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \
107 ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', d)} \ 103 ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', d)} \
108 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd x11', d)} \ 104 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd x11', d)} \
109 dbus \ 105 dbus gconf \
110 " 106 "
111 107
112PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" 108PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
113PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4 sbc" 109PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4 sbc"
114PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc" 110PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc"
111PACKAGECONFIG[gconf] = "--enable-gconf,--disable-gconf,gconf"
112PACKAGECONFIG[gsettings] = "--enable-gsettings,--disable-gsettings,glib-2.0-native glib-2.0"
115PACKAGECONFIG[ofono] = "--enable-bluez5-ofono-headset,--disable-bluez5-ofono-headset,ofono" 113PACKAGECONFIG[ofono] = "--enable-bluez5-ofono-headset,--disable-bluez5-ofono-headset,ofono"
116PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" 114PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3"
117PACKAGECONFIG[systemd] = "--enable-systemd-daemon --enable-systemd-login --enable-systemd-journal --with-systemduserunitdir=${systemd_user_unitdir},--disable-systemd-daemon --disable-systemd-login --disable-systemd-journal,systemd" 115PACKAGECONFIG[systemd] = "--enable-systemd-daemon --enable-systemd-login --enable-systemd-journal --with-systemduserunitdir=${systemd_user_unitdir},--disable-systemd-daemon --disable-systemd-login --disable-systemd-journal,systemd"
@@ -250,8 +248,11 @@ RDEPENDS_pulseaudio-server += "alsa-plugins-pulseaudio-conf"
250RDEPENDS_pulseaudio-module-console-kit =+ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}" 248RDEPENDS_pulseaudio-module-console-kit =+ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}"
251RDEPENDS_pulseaudio-misc += "pulseaudio-module-cli-protocol-unix" 249RDEPENDS_pulseaudio-misc += "pulseaudio-module-cli-protocol-unix"
252 250
253FILES_${PN}-module-gconf += "${libexecdir}/pulse/gconf-helper"
254FILES_${PN}-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer" 251FILES_${PN}-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer"
252FILES_${PN}-module-gconf += "${libexecdir}/pulse/gconf-helper"
253
254GSETTINGS_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'gsettings', '${PN}-module-gsettings', '', d)}"
255FILES_${PN}-module-gsettings += "${libexecdir}/pulse/gsettings-helper ${datadir}/GConf/gsettings ${datadir}/glib-2.0/schemas"
255 256
256# The console-kit module is good to have on X11 systems (it keeps PulseAudio 257# The console-kit module is good to have on X11 systems (it keeps PulseAudio
257# running for the duration of the user login session). The device-manager and 258# running for the duration of the user login session). The device-manager and