diff options
author | Scott Murray <scott.murray@konsulko.com> | 2021-08-24 09:57:08 -0400 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-08-25 12:50:36 +0000 |
commit | 502057487cf7346e136e058880a33ac298facb19 (patch) | |
tree | 387230ed28049327c097df986a90a06d9f8f7858 /meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia | |
parent | 61d41b58d300f2f9b8985361f93e698aa8888a65 (diff) |
pipewire: update to pw 0.3.30 and wp 0.4.0
* The pipewire recipe has been synced with the upstream yocto one
* WirePlumber configuration now has volume ducking enabled for
navigation messages. This means that music will now duck when
a navigation message plays instead of being corked.
* PipeWire's default configuration now lives in /usr/share/pipewire,
with the possibility to override it in /etc/pipewire. This allows
resetting to upstream defaults by removing /etc/pipewire
v2: add licenses to the layer to match the upstream recipe,
adapt licenses of sub-packages
v3: mark each package with the desired license instead of the mix
v4: simplify the license output of the sub-packages
Bug-AGL: SPEC-3844
Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com>
[manual backport of e17ac08 from master/lamprey]
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ibf72ed9536706e940abcaa08be92f19617f1ab1f
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26569
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia')
-rw-r--r-- | meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire/0001-modules-add-new-access-seclabel-module.patch | 12 | ||||
-rw-r--r-- | meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire/pipewire.conf | 3 | ||||
-rw-r--r-- | meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire_0.3.30.bbappend (renamed from meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire_0.3.27.bbappend) | 3 |
3 files changed, 7 insertions, 11 deletions
diff --git a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire/0001-modules-add-new-access-seclabel-module.patch b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire/0001-modules-add-new-access-seclabel-module.patch index 7885dfa37..17cb6ec79 100644 --- a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire/0001-modules-add-new-access-seclabel-module.patch +++ b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire/0001-modules-add-new-access-seclabel-module.patch @@ -1,4 +1,4 @@ -From a949b090e9d4d11c300fb23b416a2cc69483962b Mon Sep 17 00:00:00 2001 +From b6854927aaf5e5970178ed9b0c6647bb759f2092 Mon Sep 17 00:00:00 2001 From: George Kiagiadakis <george.kiagiadakis@collabora.com> Date: Tue, 16 Feb 2021 17:26:20 +0200 Subject: [PATCH] modules: add new access-seclabel module @@ -7,6 +7,7 @@ This module allows access control based on the security label of the client. It is tailored for use with the semantics of SMACK Upstream-Status: Inappropriate [smack specific] + --- src/modules/meson.build | 10 ++ src/modules/module-access-seclabel.c | 220 +++++++++++++++++++++++++++ @@ -14,11 +15,11 @@ Upstream-Status: Inappropriate [smack specific] create mode 100644 src/modules/module-access-seclabel.c diff --git a/src/modules/meson.build b/src/modules/meson.build -index 8c9ccc85..234cff6b 100644 +index f51aa29c..21b52d49 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build -@@ -14,6 +14,16 @@ pipewire_module_access = shared_library('pipewire-module-access', [ 'module-acce - dependencies : [mathlib, dl_lib, pipewire_dep], +@@ -56,6 +56,16 @@ pipewire_module_echo_cancel = shared_library('pipewire-module-echo-cancel', + dependencies : [mathlib, dl_lib, pipewire_dep, webrtc_dep], ) +pipewire_module_access_seclabel = shared_library('pipewire-module-access-seclabel', @@ -260,6 +261,3 @@ index 00000000..3739f2e4 + + return 0; +} --- -2.30.0 - diff --git a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire/pipewire.conf b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire/pipewire.conf index bc0c89ac0..5857c4861 100644 --- a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire/pipewire.conf +++ b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire/pipewire.conf @@ -54,6 +54,3 @@ context.modules = [ # by pw-top and pw-profiler. #{ name = libpipewire-module-profiler } ] - -context.objects = {} -context.exec = {} diff --git a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire_0.3.27.bbappend b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire_0.3.30.bbappend index d5e52de98..c895efc8b 100644 --- a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire_0.3.27.bbappend +++ b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire_0.3.30.bbappend @@ -10,7 +10,7 @@ SRC_URI_append= "\ do_install_append() { # replace the original config with our smack-aware config - rm -f ${D}${sysconfdir}/pipewire/pipewire.conf + mkdir -p ${D}${sysconfdir}/pipewire/ install -m 0644 ${WORKDIR}/pipewire.conf ${D}${sysconfdir}/pipewire/pipewire.conf if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then @@ -30,4 +30,5 @@ do_install_append() { FILES_${PN}_append = "\ ${sysconfdir}/smack/accesses.d/* \ + ${sysconfdir}/pipewire/pipewire.conf \ " |