From: Tanu Kaskinen <tanuk@iki.fi>
Date: Thu, 17 Dec 2020 19:27:37 +0000 (+0200)
Subject: pulseaudio: disable GConf support
X-Git-Tag: uninative-2.10~451
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=6e06eb987002031c43f76f908caef240b556e6a1;p=openembedded-core.git

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.

Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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 = "\
 		--disable-tests \
 		--disable-running-from-build-tree \
 		--disable-esound \
+		--disable-gconf \
 "
 
 # 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'
 
 PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
 PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc"
-PACKAGECONFIG[gconf] = "--enable-gconf,--disable-gconf,gconf"
 PACKAGECONFIG[gsettings] = "--enable-gsettings,--disable-gsettings,glib-2.0-native glib-2.0"
 PACKAGECONFIG[ofono] = "--enable-bluez5-ofono-headset,--disable-bluez5-ofono-headset,ofono"
 PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3"
@@ -265,7 +265,6 @@ RDEPENDS_pulseaudio-module-console-kit =+ "${@bb.utils.contains('DISTRO_FEATURES
 RDEPENDS_pulseaudio-misc += "pulseaudio-module-cli-protocol-unix"
 
 FILES_${PN}-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer"
-FILES_${PN}-module-gconf += "${libexecdir}/pulse/gconf-helper"
 
 GSETTINGS_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'gsettings', '${PN}-module-gsettings', '', d)}"
 FILES_${PN}-module-gsettings += "${libexecdir}/pulse/gsettings-helper ${datadir}/GConf/gsettings ${datadir}/glib-2.0/schemas"