Various bits related to pulseaudio
v2 cover Various bits related to pulseaudio
From: Christopher Larson <[email protected]>
While it was pointed out that a configuration option for autospawn-for-root may be preferable, we can switch to that as a future improvement, so I think it should still go in as is, unless there's an objection to that.
v2 changes: removed inaccurate comment regarding autospawn-for-root packageconfig.
The following changes since commit 524c590fb44d0ef9711accf2db1a21e4a3cbcfc2:
oe-selftest: test devtool build-image plugin (2015-08-31 11:37:00 +0100)
are available in the git repository at:
git://github.com/kergoth/openembedded-core pulseaudio-related-bits
https://github.com/kergoth/openembedded-core/tree/pulseaudio-related-bits
Christopher Larson (3):
packagegroup-core-x11-sato: obey the pulseaudio distro feature
pulseaudio: pass --with-systemduserunitdir
pulseaudio: add 'autospawn-for-root' PACKAGECONFIG
meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 18 +++++++++++++++++- .../packagegroups/packagegroup-core-x11-sato.bb | 3 +-- 2 files changed, 18 insertions(+), 3 deletions(-)
Signature · 1 line
2.2.1
PATCH v2 1/3 packagegroup-core-x11-sato: obey the pulseaudio distro feature
From: Christopher Larson <[email protected]>
--- meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb +1 -2
@@ -39,8 +39,7 @@ RDEPENDS_${PN}-base = "\ libsdl \ ${NETWORK_MANAGER} \ udev-extraconf \ - pulseaudio-server \ - pulseaudio-client-conf-sato \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio-server pulseaudio-client-conf-sato', '', d)} \ " # pcmanfm doesn't work on mips
Signature · 1 line
2.2.1
PATCH v2 2/3 pulseaudio: pass --with-systemduserunitdir
From: Christopher Larson <[email protected]>
We want to make sure our path variables are obeyed.
--- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-multimedia/pulseaudio/pulseaudio.inc +1 -1
@@ -43,7 +43,7 @@ PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4 sbc" PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc" 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,--disable-systemd-daemon --disable-systemd-login --disable-systemd-journal,systemd" +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" PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxtst libice libsm libxcb" PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
Signature · 1 line
2.2.1
PATCH v2 3/3 pulseaudio: add 'autospawn-for-root' PACKAGECONFIG
In reply to Christopher LarsonFrom: Christopher Larson <[email protected]>
Since many embedded systems don't have non-root users, it's useful to be able to use pulseaudio autospawn for root as well.
--- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
meta/recipes-multimedia/pulseaudio/pulseaudio.inc +16 -0
@@ -47,6 +47,9 @@ PACKAGECONFIG[systemd] = "--enable-systemd-daemon --enable-systemd-login --enabl PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxtst libice libsm libxcb" PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" +# Since many embedded systems don't have non-root users, it's useful to be +# able to use pulseaudio autospawn for root as well. +PACKAGECONFIG[autospawn-for-root] = ",,," EXTRA_OECONF_append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " --enable-neon-opt=no", d)}" EXTRA_OECONF_append_armeb = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " --enable-neon-opt=no", d)}"
@@ -59,6 +62,19 @@ export TARGET_PFPU = "${TARGET_FPU}" OE_LT_RPATH_ALLOW = "any" OE_LT_RPATH_ALLOW[export]="1" +set_cfg_value () { + sed -i -e "s/\(; *\)\?$2 =.*/$2 = $3/" "$1" + if ! grep -q "^$2 = $3\$" "$1"; then + die "Use of sed to set '$2' to '$3' in '$1' failed" + fi +} + +do_compile_append () { + if ${@bb.utils.contains('PACKAGECONFIG', 'autospawn-for-root', 'true', 'false', d)}; then + set_cfg_value src/client.conf allow-autospawn-for-root yes + fi +} + do_install_append() { install -d ${D}${sysconfdir}/default/volatiles install -m 0644 ${WORKDIR}/volatiles.04_pulse ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse
Signature · 1 line
2.2.1