From patchwork Tue Jan 8 14:38:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 154975 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4953862jaa; Tue, 8 Jan 2019 06:39:00 -0800 (PST) X-Google-Smtp-Source: ALg8bN7L3Zla+aM3nF3C5iH23G8TSjmVpLQSKXn28NI66Y7CxipxMPX6uF1AfE8ZL3WryKQNoY3j X-Received: by 2002:a17:902:2bc5:: with SMTP id l63mr2047772plb.107.1546958340907; Tue, 08 Jan 2019 06:39:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546958340; cv=none; d=google.com; s=arc-20160816; b=Gzpd0vlugrdEFifqpeN8mSLapvK26TI8dKYau316gQMZ8L7fzV2/tXpfUvFECDNRIb dyyh7AZZyaW438ZncOqTlW23eGRwhznuDTDp5XdDS+uA2UKizOACbuThOpV+MzUHlVKO KClt3igCgwgrqwlh+BsUSygUEUi+t+fJZl+18zo63waemVnkam4l8sQdjPapvLoMRwTv W26qUDHw/fzH6nnIzvV42gCU2KKlxLs6eLIZhJ5XPX9CzkXwF35IGSMPXo7zwZUjGwB6 Tvw77yRYEsuaUbzjF3XEIxVR666jXfUm4xUrzf/rQTe2k+9pXcVSEfARoc5wRFt5ufhK 264g== 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=itw0aBVQ7pmG29WvNiX6p7p5FYSw9wEJ4N4gynKjZYY=; b=paI9A9cRA/ehXqcbupFBc+3etojZuol1//KxcxwUFrUCAuf0dAjJT71Xo1kxMw7n2g +QJ1+oZjCpaFIOq7YGO+ZG85Q4MKPZvE/swF9DHHJyHu4S6phufHQtQxR7aymaDJhfr0 ObXK1TDRieHZWxfeO/E2QOodUYY0fCmT7vSAchRm7FD+kfRxGhW9HLUupyTlopnWbR1z wXuC70j7vDo6s0gakFslOV4+oO5F8l1B/um8zS7syEHUV8n5Vfxu6XCo7EtA7WXRvTwy jO0PpJLeXEGkvZyINuG/aAZ3C0hFXPjopg/usAnJIPzvtYbIjRZ4tEMwGu+pUqqg3qua QrFg== 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=QmyFNsc1; 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 a1si5791311pgk.495.2019.01.08.06.39.00; Tue, 08 Jan 2019 06:39:00 -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=QmyFNsc1; 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 AA6127BD94; Tue, 8 Jan 2019 14:38:56 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mail.openembedded.org (Postfix) with ESMTP id ABC27605BF for ; Tue, 8 Jan 2019 14:38:54 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id f188so4597371wmf.5 for ; Tue, 08 Jan 2019 06:38:56 -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=vpcV7eoT+yG5rhSSbV3EYgSmqhyE2tiatylu+JLqszg=; b=QmyFNsc1QK6ETAMQ3YMG5sjLFawcv6m4se9N7FHjlk7bRMVdev7JObwVgYabwXk+tf Xp+qwgvOM+SMXau/Yxkptudgek4HJD/36tLfiJ4yRAlYAdgGQEov/mWbajnjlfAErDcx JPXYWbUK8Bf8lD8Hycy77DQiHVETWygyUZjLZCcsAYg4DoAMor6ItuyqapjvuFIzrxwr mbJWK/t5xztvW0OemRApDniNBVYHbCSZkurGXUsKU3+xgTZ+pHrUC+8eWtH04FcdgYuj WaUZX5jXmv8yj/H5q8NgT64Rb12IpM3/icjkT4qyO+pgSk+KO4n9dGprPp2K/433eig3 +cPQ== 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=vpcV7eoT+yG5rhSSbV3EYgSmqhyE2tiatylu+JLqszg=; b=Gp+MzRyBErQZJ+BQ8qcW/gx532R4Xjnx8B5oRfPGXg9hjafVoYbNPdjU0TtZUtRwjp jEeuridCSKpJbajF2rRNMN2qsXtAezX1dJFBZzFSY5SfK3qlv2fhGM2ehIQ1KbrBrHae AfIrFIacsXNUqmkjFG+uh2VU0/DHCMN474v5Zw5oP+mnCJEBJgNelG5QqzdPF9VIv8a2 YiNUlwB8o144K9rTrpXcnZ/41/wFPUtY4TLV7tOSFOZ5jhGqwVCinEtalQSvqr2V5XAL dV8a4XLAWO11sGgwnXDnj0gvC9D0WtDvlMliH0fd66OfSS9EXFvJ72zc2Vtw2q5X3AC+ mdyA== X-Gm-Message-State: AJcUukeLz6V7ot+i5s/d1G/Xto0/5aajMb/ITXQ6A16Hden767fwl6yX R1J35xiZhJU50OjA3l6Eb7+fEKtPsgQ= X-Received: by 2002:a1c:cec1:: with SMTP id e184mr2070646wmg.75.1546958335123; Tue, 08 Jan 2019 06:38:55 -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 m4sm11803498wmi.3.2019.01.08.06.38.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Jan 2019 06:38:54 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 8 Jan 2019 14:38:49 +0000 Message-Id: <20190108143851.20544-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/3] gsettings: allow the schemas to be in any package 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 Instead of assuming that the schemas are located in ${PN}, add a GSETTINGS_PACKAGE variable for the package name and default it to ${PN}. For recipe that can conditionally ship schemas, support GSETTINGS_PACKAGE being empty gracefully by doing nothing. Signed-off-by: Ross Burton --- meta/classes/gsettings.bbclass | 48 +++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 22 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/classes/gsettings.bbclass b/meta/classes/gsettings.bbclass index eae3dc7999f..47cf00102ec 100644 --- a/meta/classes/gsettings.bbclass +++ b/meta/classes/gsettings.bbclass @@ -7,32 +7,36 @@ # TODO use a trigger so that this runs once per package operation run - -RDEPENDS_${PN} += "glib-2.0-utils" - -FILES_${PN} += "${datadir}/glib-2.0/schemas" - -PACKAGE_WRITE_DEPS += "glib-2.0-native" +GSETTINGS_PACKAGE ?= "${PN}" + +python __anonymous() { + pkg = d.getVar("GSETTINGS_PACKAGE") + if pkg: + d.appendVar("PACKAGE_WRITE_DEPS", " glib-2.0-native") + d.appendVar("RDEPENDS_" + pkg, " glib-2.0-utils") + d.appendVar("FILES_" + pkg, " ${datadir}/glib-2.0/schemas") +} gsettings_postinstrm () { glib-compile-schemas $D${datadir}/glib-2.0/schemas } python populate_packages_append () { - pkg = d.getVar('PN') - bb.note("adding gsettings postinst scripts to %s" % pkg) - - postinst = d.getVar('pkg_postinst_%s' % pkg) or d.getVar('pkg_postinst') - if not postinst: - postinst = '#!/bin/sh\n' - postinst += d.getVar('gsettings_postinstrm') - d.setVar('pkg_postinst_%s' % pkg, postinst) - - bb.note("adding gsettings postrm scripts to %s" % pkg) - - postrm = d.getVar('pkg_postrm_%s' % pkg) or d.getVar('pkg_postrm') - if not postrm: - postrm = '#!/bin/sh\n' - postrm += d.getVar('gsettings_postinstrm') - d.setVar('pkg_postrm_%s' % pkg, postrm) + pkg = d.getVar('GSETTINGS_PACKAGE') + if pkg: + bb.note("adding gsettings postinst scripts to %s" % pkg) + + postinst = d.getVar('pkg_postinst_%s' % pkg) or d.getVar('pkg_postinst') + if not postinst: + postinst = '#!/bin/sh\n' + postinst += d.getVar('gsettings_postinstrm') + d.setVar('pkg_postinst_%s' % pkg, postinst) + + bb.note("adding gsettings postrm scripts to %s" % pkg) + + postrm = d.getVar('pkg_postrm_%s' % pkg) or d.getVar('pkg_postrm') + if not postrm: + postrm = '#!/bin/sh\n' + postrm += d.getVar('gsettings_postinstrm') + d.setVar('pkg_postrm_%s' % pkg, postrm) } From patchwork Tue Jan 8 14:38:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 154976 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4954259jaa; Tue, 8 Jan 2019 06:39:25 -0800 (PST) X-Google-Smtp-Source: ALg8bN5qZ54gOpmWItXcyRb2VhP0hFD0E6H3BD4nLZ1IfBZpGBkpaiLJqdw7htCxQanjVznQxM23 X-Received: by 2002:a62:8add:: with SMTP id o90mr1982808pfk.210.1546958365772; Tue, 08 Jan 2019 06:39:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546958365; cv=none; d=google.com; s=arc-20160816; b=YBxfkMCSwjQoC8dpLeogUtMEd4qesQiLdNIV1J8jJFwL8KHO++LsvGD9+J2J8Bsw8/ 2VfQQHihNklctbq3IhvkU6a9jpdLjrG76xusbBew5yPABT1xag+Who3eWQud6d3XWOLh XsTLkEx2eYPnL3TEXsvbBXNquzTcP/7eNCweXQsm7cRRUXN0+vP6Gr9uGlo1Af75gOU9 zpGGpdNAx2YVVEKWBQssojKyGUu8UOURuriEvCiPRu5wjqcgBG3ZthxFSxkxazbDRxwq oQViSqYaMuQBA+z+QEse9dTBkyA5QD4Nw58pPjiVyVEtaC5RLXMdayzjiv3pNZKATCSE zIpQ== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=Zcu6MucVm+nsunwItFKsjUU/PBv+P+N2hpwnnGEaEQs=; b=0rYNRjQL+nHUMLOuuzh/6QbJvps3l77PpAcoD154LjDyYBK/WL+SxYlpycyCshjXam Fr0usWVMyAaPlRqy9IrapBC86acklYvALXqm/GDY61eCRLawKE8EhNiujWYlVbSUwtlc dq0c4kNC0O6LOoDG2OueZW58hipRrC+8owxRM+BFmqqHRNOUPnUi1r/NLQyHtkk0lx0/ y1yG2amparcmOx0qEuGzbNJhNp1zeqeok6JDP81AcYlIy3L0Zfe5HhOTEtCZaduyXval krX31lmK10/3pDy6QvJtbw1blQ9HbNLU46YLmLfUI4JxHP8sD4xImZwFuZOWdAiDYAL+ QaQA== 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=sER3vdXW; 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 y13si430836pgj.157.2019.01.08.06.39.25; Tue, 08 Jan 2019 06:39:25 -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=sER3vdXW; 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 17E4C7BDA1; Tue, 8 Jan 2019 14:39:23 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mail.openembedded.org (Postfix) with ESMTP id C8596605BF for ; Tue, 8 Jan 2019 14:38:55 +0000 (UTC) Received: by mail-wm1-f48.google.com with SMTP id d15so4362540wmb.3 for ; Tue, 08 Jan 2019 06:38:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OaCTcLhHTVobEAETOpt0tXiasukOGjfwn6nYGzXaIAA=; b=sER3vdXW+vW0w5DI4v5SzN6ndusN0LenbjPhsC5j30vC21DdN0aJkF9YRQoKJqY77K s3493OlwKwuYH0fHnDA5SLl2ZPahUMKmejD7eSlYsvSrHLIeDAp/Ev3AtoMluhmFYGFQ a0+5OOWVmCJJiuQVckHIalNWyX9vGvF8Brac6jJOCrFjQzxkDLnseZqGlXDyFln55CYV 8y/+G9ym/204pLQo8ubTu3zuMWuFEtTAoMr60ZLeOymJrZjCuOWWXGpVpg1el58uR+x3 M3d9O+QmpePucXOIosYpGVL/w4rhZfuG/iCQo4SfOxfvayKOY6IE8IzmB7HbTRLPOcRQ C6+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OaCTcLhHTVobEAETOpt0tXiasukOGjfwn6nYGzXaIAA=; b=Aa6Sh8yjLO4jFjc4rhZFeONW9g4UqLwNNzrQFfGCx6M5EfY6xT7hftTmBZKVvlJy+4 70rDa898lOIATtbOzRB1GP1Kf6l9dPG4wMZUWIsUghI14TH5LCEomJyaJdZJ/qijAWvf VjvylIHqv1wsuHwS0H/9EAKaKqkWyu4LMcGZ26t0CpZpdWSEnGG0kV7VODr3YYHRHNw4 98TLIy5daR8/tckjOo17Nx/6Her+VOmLvmoLgS2qjEQsnCaho5pc/fgq+swZOaozzs8R ozTMOctDKfry3r1jufJKl26pszOaapBIo0M6wPdZnYFezmIlgdLK2xR8Czxr+k/ZxDac Rz5A== X-Gm-Message-State: AJcUukcSf/2ms2TPyiBfZLwciGNntl/DbZB9Nm0prIWHqBHC6Ea0s0rY NDSYYn3oTzCvVo2+xXSQxRs08/7vYqA= X-Received: by 2002:a1c:a9d4:: with SMTP id s203mr1928026wme.132.1546958336234; Tue, 08 Jan 2019 06:38:56 -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 m4sm11803498wmi.3.2019.01.08.06.38.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Jan 2019 06:38:55 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 8 Jan 2019 14:38:50 +0000 Message-Id: <20190108143851.20544-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190108143851.20544-1-ross.burton@intel.com> References: <20190108143851.20544-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/3] 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. (From OE-Core rev: b1ea450037b3beacc7da5cbd27ad9ce895f475ff) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 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..7498185c5f2 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 \ 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 +inherit autotools bash-completion pkgconfig useradd gettext perlnative bluetooth systemd manpages gsettings # *.desktop rules wont be generated during configure and build will fail # if using --disable-nls @@ -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,11 @@ 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" + +GSETTINGS_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'gsettings', 'pulseaudio-module-gsettings', '', d)}" +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 From patchwork Tue Jan 8 14:38:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 154977 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4954343jaa; Tue, 8 Jan 2019 06:39:31 -0800 (PST) X-Google-Smtp-Source: ALg8bN75aKh22QniLzFojbbQ1giE5ShzEQwFLxrf1n04bs5kafOIug+ijqx64Zfup4mY1Uot/M9T X-Received: by 2002:a63:c748:: with SMTP id v8mr1810461pgg.108.1546958370949; Tue, 08 Jan 2019 06:39:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546958370; cv=none; d=google.com; s=arc-20160816; b=DdccQHu7GT1YqDpxcUgpHO6tXi9dxfd7cwfUrqzoYivo0Jxm37fOKoo0KqAgg7HI+R 66DgNV8D658alQNH9YlSujVwxf6ATNV8BCHs6ZJ1c9NFD7l3Zv30yFi4RxM3Gk5GDTp5 CU0snSaf68bv3bM785yqSypZhrxMqu6/dMa4RDN1pY8YouRzfLCvEOeN36DRgymWlNYw wNjwQYZVwbEyA7JbxwKbcrKfWYxFtYTXsFxh0Bj5KuQaDCNwl1WoPRqmf4p0tGx38441 IzQFm7VBLEoXCjh7ZwBI+g+LTnP4XqV3U6u3RUElJgLy60r9SsykxDUzEnDp7cp8LVqg HgAQ== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=waviOv+MozZTtfdhRBZ+W/8yeIcJX2CrbTHIHVXhZJo=; b=MOStbXaZlfMw51m1MawbYGkA9J/9xILdApJfOssFbXw15vR92xGu2Jv7pKVJpa4Anr mpWH06SnSXogYx39cNLNu98IkfpDZCfhQssKowk9xEV/XZtUkdj5J+x6t03KsSgW6qoO WtTvIzm6TAtGgnBzaMJ/Uk9iWaJW96D6WKma8zST3j5tvxtvO+UPZrnnjBi4UBn1hsgM UXIqejNAizkmP0ouujvHlpk/bUDf+JuG7gCP18Rj0nEifbZeHHIaPSZLcVqn6ytneHri C16dhESWZjxzXJ18vEiKVmUZRyQ9Cn2xOFKFN1alF/HonNRlT2oQugJv1DkH9SOOC5VY wGwg== 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=b8bZ5e5F; 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 m5si68538344pfm.149.2019.01.08.06.39.30; Tue, 08 Jan 2019 06:39:30 -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=b8bZ5e5F; 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 8C7537BDB5; Tue, 8 Jan 2019 14:39:24 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mail.openembedded.org (Postfix) with ESMTP id ADCB87BD98 for ; Tue, 8 Jan 2019 14:38:56 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id z5so4243664wrt.11 for ; Tue, 08 Jan 2019 06:38:58 -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:in-reply-to:references; bh=dKP/CWZc7w2m9XEFVKS0s+Qwh5TmDtYGF1ChSNBTVUo=; b=b8bZ5e5FZ8vLdml6NNqdwzpLXsNuoqRswYzpZD7E8bJG8usdyURq2ISzP6VwhkBwaP C4Yh2XQ1cwUWjylS5VaAQsVmgJik9G2BOKHafVGDVQf6kbp6uSPofFzlpxKZintBnfK7 qG5X5rEx90gzk+a6RnmqDxwfQhpuPrqdyNzyHqAfDlk++4tePm6kJHNiMbgyub4Y/EJH IRKgzWzwZZqBLQw1IMtd3uoBQgTthFI1khURFx/MDHAHABgD7kBwi2v5BfrVVfGhR0mI fcCPKgesBSAztmnpDSuOl45gzNq2SeFycxKlvNw5aXi/0ivQZfyYO6GAGYlucvghEqa9 PT7A== 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:in-reply-to :references; bh=dKP/CWZc7w2m9XEFVKS0s+Qwh5TmDtYGF1ChSNBTVUo=; b=YNzm0yh8kyqvM2QtOhixY0hQfDjr7vclhZYb4YyXnFetn88LE5O5Cajxix+hmQzlYu yirNA4+JdjyNF5cCNaPyly+zWAt3Ft09kXOWD8VHVIW2eW3zf31AxFYhBdCm739LbdAc TprFaXcnqX7fXgsLlZYDqQJEDkxFQsiobm1/IDQG6s8aW12e8i7TuXvxBPnhoG0w0Lcc N2Nv37BxS3aqzwzyTT03UeOE3VdqrFvU484xW1ULE950V++mr9ctmTMqVDYlroqp5dga 0y/Nq6KxHJvw2TJmtuoZHOYAtVks++H9BQbxqv6lTUj59tFjp/qn/cNe9YUCK5btTeSw bQiw== X-Gm-Message-State: AJcUukdtS+kOtIgXGuiwqdqcYHLxVQ+WidsJ5eWaZNF5a6z9LhADfAcz 0ab48tTdNnx1qV/O83z0O0FsBX4UREc= X-Received: by 2002:adf:9ec8:: with SMTP id b8mr1755796wrf.164.1546958337141; Tue, 08 Jan 2019 06:38:57 -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 m4sm11803498wmi.3.2019.01.08.06.38.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Jan 2019 06:38:56 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 8 Jan 2019 14:38:51 +0000 Message-Id: <20190108143851.20544-3-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190108143851.20544-1-ross.burton@intel.com> References: <20190108143851.20544-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 3/3] pulseaudio: switch configuration module from GConf to 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 The only user of the configuration module is paprefs, which as of 1.0 uses GSettings not GConf. Also GConf is unmaintained, so one less recipe using it is good. Signed-off-by: Ross Burton --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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 7498185c5f2..1a23bd1ca1b 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -102,7 +102,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ ${@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 gconf \ + dbus gsettings \ " PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"