summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/pulseaudio
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2020-12-17 21:27:37 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-20 00:03:04 +0000
commitb381e01a667b769ebe245b75194c5ef4038cb7b0 (patch)
treeb3de8485f77e85c5c8395d540df88c9987ac5003 /meta/recipes-multimedia/pulseaudio
parent94e565c64914dd53de3cd6f0e600a9250eb066b8 (diff)
downloadpoky-b381e01a667b769ebe245b75194c5ef4038cb7b0.tar.gz
pulseaudio: disable GConf support
The GConf module is only needed for older versions of paprefs, other applications shouldn't be interacting with PulseAudio's GConf settings. Paprefs isn't packaged in OpenEmbedded, so there probably aren't any users of the GConf functionality. My immediate motivation for doing this is that I'm converting the pulseaudio recipe to use Meson, and the GConf module isn't supported by the Meson build system. Adding support for it would be possible, but pretty pointless. The GConf module will be removed in PulseAudio 15.0. (From OE-Core rev: 6e06eb987002031c43f76f908caef240b556e6a1) Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio')
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index ad059404f8..48759bca62 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -80,6 +80,7 @@ EXTRA_OECONF = "\
80 --disable-tests \ 80 --disable-tests \
81 --disable-running-from-build-tree \ 81 --disable-running-from-build-tree \
82 --disable-esound \ 82 --disable-esound \
83 --disable-gconf \
83" 84"
84 85
85# soxr (the SoX Resampler library) doesn't seem to be currently packaged in 86# soxr (the SoX Resampler library) doesn't seem to be currently packaged in
@@ -108,7 +109,6 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5'
108 109
109PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" 110PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
110PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc" 111PACKAGECONFIG[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" 112PACKAGECONFIG[gsettings] = "--enable-gsettings,--disable-gsettings,glib-2.0-native glib-2.0"
113PACKAGECONFIG[ofono] = "--enable-bluez5-ofono-headset,--disable-bluez5-ofono-headset,ofono" 113PACKAGECONFIG[ofono] = "--enable-bluez5-ofono-headset,--disable-bluez5-ofono-headset,ofono"
114PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" 114PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3"
@@ -265,7 +265,6 @@ RDEPENDS_pulseaudio-module-console-kit =+ "${@bb.utils.contains('DISTRO_FEATURES
265RDEPENDS_pulseaudio-misc += "pulseaudio-module-cli-protocol-unix" 265RDEPENDS_pulseaudio-misc += "pulseaudio-module-cli-protocol-unix"
266 266
267FILES_${PN}-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer" 267FILES_${PN}-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer"
268FILES_${PN}-module-gconf += "${libexecdir}/pulse/gconf-helper"
269 268
270GSETTINGS_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'gsettings', '${PN}-module-gsettings', '', d)}" 269GSETTINGS_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'gsettings', '${PN}-module-gsettings', '', d)}"
271FILES_${PN}-module-gsettings += "${libexecdir}/pulse/gsettings-helper ${datadir}/GConf/gsettings ${datadir}/glib-2.0/schemas" 270FILES_${PN}-module-gsettings += "${libexecdir}/pulse/gsettings-helper ${datadir}/GConf/gsettings ${datadir}/glib-2.0/schemas"