From patchwork Mon Jan 7 17:42:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 154948 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3733751ljp; Mon, 7 Jan 2019 09:42:49 -0800 (PST) X-Google-Smtp-Source: ALg8bN7VJDCqgauVUEhRLTUHE5Sux2w9WmWhfMyOwDlpc9NmQHUbcQUGnG3fAM2AYeZRDl+E8Jo0 X-Received: by 2002:a63:4926:: with SMTP id w38mr11260245pga.353.1546882969838; Mon, 07 Jan 2019 09:42:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546882969; cv=none; d=google.com; s=arc-20160816; b=sO9kPeJ4cPO9wW3odOedtiD10FdRU43BA2J0YHGoGJjBNyoZVxuhUFrKdD8UFxKwF4 pD8Z2rP7ZxTZWt+rQtzHiQwmIaygZusJUPPw8HXhDxz0ByIPDqavTWRP24OpqKHNeQlK 8Jukn7sNoqCf0R/K4LObXEL+4VStUAKQ1q1staa2DCLVbdLUwPma5DQ8TAeY+I0My/gO GSPd08KDt8tYGDKYNyd3zCqxxuvHv8Rj209vKQ1qag2cC/uJme4hGk6f57hmmdhwnqNG sTicma8p5ZpqKs6P4mkHdRo4NgvNzY6fz9BD1nHN0LzBqB78TLWhTbvuoOmU+oPv/GOy Q1aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=LUb9o8eibaNyAvJKdgJiDsU1gV5fZYFKND9RTT5vKOk=; b=NmXN2lMUJBGZvpmkAVDq09uT5/w/hzKiciUmTTdp2p9hnYxRVD9H6Z8tBfEDrSW42j tawDC2bQOthuGQH7zBXgSqlvHXGY7eo5JU60VRqxhluj4eC++v1SG5zbLiwsmJujDfjF tHkEZJ0Q+e3gRLChRRkSsIJhUrBangCrdar/ALPtkpRqHfs/ThgK0Ja4K9b81Ho1w2Yz LFsVSawq4g72s1xXdmrqBmAdOnzEljFI/g71W3RBTZe7MoyLy00R68TIhUiAsQE3Eps7 A4XjHchIVY3iQgTxyFA8mgNG+oZRtDTn76n0mEux8L26ESEdIknXnv8hQ0/f74bHxdqk JR3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b="z/uGa27y"; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id m19si9739281pls.437.2019.01.07.09.42.49; Mon, 07 Jan 2019 09:42:49 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b="z/uGa27y"; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 149EA7BF08; Mon, 7 Jan 2019 17:42:45 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mail.openembedded.org (Postfix) with ESMTP id 2422D7BF28 for ; Mon, 7 Jan 2019 17:42:43 +0000 (UTC) Received: by mail-wr1-f53.google.com with SMTP id v13so1325123wrw.5 for ; Mon, 07 Jan 2019 09:42:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=dDnMvABoEr57XkbWr8+bZTvBoYvQNqfMfZ6URZufXC8=; b=z/uGa27yo1AFwAGV63nl3lTMbvNC+5f4z41hcXvCyFSGkooEZv+x3YIjB/HGP0INHw KdX2Y4zvrMT+0Fr2V/gSV3aBAxobrO4VRG5QAaAa+wsV1Et/fmSA1g0HnXS+TAIEgw/j N3xc+yfM3nhjghYXfTw7jDhe659d5VRdvoWohCvbHmuSrKNOR2mSbgqE9umDyRByiqku vQWhZIIpvCuEj9xr2SUnpiF0N86sSYyt48f96wn7OLtOewus14/yoF9QGXG+BIKFp+mU x8cLyWZAAiuqgm4EWOxOB9it3P2nU91PX1l/7qVTvaS70DSXaaZiaE4O9AdBkCUrz8+U d/rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=dDnMvABoEr57XkbWr8+bZTvBoYvQNqfMfZ6URZufXC8=; b=EpFuzItlgcb4kU33VYitmQ3R8joZUAEiAOM0rKgmnolWfKMMnKe8SDVEFK109vUnKE 2Ph1Y59P5xeVCPlDyr40zJ4m3EZWQjBHDqwxA1ZckROWvS/F4fh/UncZNKdnEgBAcyNv haLYfSrxhy6CG9AArXeh209cCCS08DCwMWnXbb/Vm8CzBkcyw8hL7SfsojyDThXftbng /ZPsv02GlwXbz41Ft/yRjww79d6N0Xg4hp4XJ6G4IxFQ7YmCVz88ziK4WmJm3djsQdNf 3TxzbIqbsw6YmA4d4D0JRPXU9wf4iJ6T0LeIDOzgHXyWkp163jBRE5xxQ3kUc2cu4XUp HdLw== X-Gm-Message-State: AJcUukdWv4PYrZSC02TxzIUSJC9e6zRkfCQngFTIu7sw6/GcaHPOFiSX 6IL311/3cbbDxUUnOQCT/sMC7FDVJNY= X-Received: by 2002:adf:80a9:: with SMTP id 38mr49258115wrl.137.1546882963506; Mon, 07 Jan 2019 09:42:43 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id e18sm68614360wrv.88.2019.01.07.09.42.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Jan 2019 09:42:42 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 7 Jan 2019 17:42:40 +0000 Message-Id: <20190107174240.851-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] pulseaudio: add PACKAGECONFIGs for GConf and GSettings X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Behaviour is kept the same. Signed-off-by: Ross Burton --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 91d9b8ef832..d6123329502 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -58,7 +58,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0e5cd938de1a7a53ea5adac38cc10c39 \ DEPENDS = "libatomic-ops libsndfile1 libtool intltool-native" # optional -DEPENDS += "udev alsa-lib glib-2.0 gconf" +DEPENDS += "udev alsa-lib glib-2.0" DEPENDS += "speexdsp libxml-parser-perl-native libcap" inherit autotools bash-completion pkgconfig useradd gettext perlnative bluetooth systemd manpages @@ -98,20 +98,18 @@ EXTRA_OECONF += "--without-fftw" # very good anyway, better alternatives exist (such as the webrtc canceller). EXTRA_OECONF += "--disable-adrian-aec" -# FIXME: The gsettings module is temporarily disabled, because adding support -# for it is a bit complicated. -EXTRA_OECONF += "--disable-gsettings" - PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', '3g', 'ofono', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd x11', d)} \ - dbus \ + dbus gconf \ " PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4 sbc" 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" PACKAGECONFIG[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" @@ -251,8 +249,9 @@ RDEPENDS_pulseaudio-server += "alsa-plugins-pulseaudio-conf" RDEPENDS_pulseaudio-module-console-kit =+ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}" RDEPENDS_pulseaudio-misc += "pulseaudio-module-cli-protocol-unix" -FILES_pulseaudio-module-gconf += "${libexecdir}/pulse/gconf-helper" FILES_pulseaudio-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer" +FILES_pulseaudio-module-gconf += "${libexecdir}/pulse/gconf-helper" +FILES_pulseaudio-module-gsettings += "${libexecdir}/pulse/gsettings-helper ${datadir}/GConf/gsettings ${datadir}/glib-2.0/schemas" # The console-kit module is good to have on X11 systems (it keeps PulseAudio # running for the duration of the user login session). The device-manager and