From b4d2fd5d4aca191c7960e099c1dcf02fdab46cec Mon Sep 17 00:00:00 2001 From: Ashok Sidipotu Date: Fri, 14 Jan 2022 21:08:56 +0530 Subject: pipewire: update to pw 0.3.43 and wp 0.4.7 Change-Id: I3e478f5e1215d128f0d76ffb2b18c278d90de266 Signed-off-by: Ashok Sidipotu Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/27090 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Georgios Kiagiadakis Reviewed-by: Jan-Simon Moeller --- ...ninstalled-build-this-script-with-the-mes.patch | 27 +++++++++++++++++----- ...s-add-pipewire-env-variables-when-running.patch | 2 ++ .../wireplumber/wireplumber_git.bb | 4 ++-- 3 files changed, 25 insertions(+), 8 deletions(-) (limited to 'meta-pipewire/recipes-multimedia/wireplumber') diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0001-Revert-wp-uninstalled-build-this-script-with-the-mes.patch b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0001-Revert-wp-uninstalled-build-this-script-with-the-mes.patch index 37b43571d..658b89946 100644 --- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0001-Revert-wp-uninstalled-build-this-script-with-the-mes.patch +++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0001-Revert-wp-uninstalled-build-this-script-with-the-mes.patch @@ -1,20 +1,22 @@ -From 1d39b68d88e967739d6beb3c9be7f4644b5d4077 Mon Sep 17 00:00:00 2001 +From 78cde5e91ba5d9aa7bfe918ce6bad3b4af30c796 Mon Sep 17 00:00:00 2001 From: Ashok Sidipotu -Date: Thu, 2 Dec 2021 16:23:09 +0530 +Date: Fri, 14 Jan 2022 20:14:56 +0530 Subject: [PATCH] Revert "wp-uninstalled: build this script with the meson dirs filled in" This reverts commit 52aaf96179584292f493c4b329bc2c409e6d3dee. + +Upstream-Status: Inappropriate[meson version dependent] --- - meson.build | 18 ------------------ + meson.build | 31 ------------------------------- wp-uninstalled.sh | 11 ++--------- - 2 files changed, 2 insertions(+), 27 deletions(-) + 2 files changed, 2 insertions(+), 40 deletions(-) diff --git a/meson.build b/meson.build -index 1affbc1..f2ca16c 100644 +index 1f9c9d8..7e02b29 100644 --- a/meson.build +++ b/meson.build -@@ -120,21 +120,3 @@ subdir('src') +@@ -120,34 +120,3 @@ subdir('src') if get_option('tests') subdir('tests') endif @@ -36,6 +38,19 @@ index 1affbc1..f2ca16c 100644 - build_by_default : true, - command : ['cp', '@INPUT@', '@OUTPUT@'], -) +- +-if meson.version().version_compare('>= 0.58') +- builddir = meson.project_build_root() +- srcdir = meson.project_source_root() +- +- devenv = environment({ +- 'WIREPLUMBER_MODULE_DIR': builddir / 'modules', +- 'WIREPLUMBER_CONFIG_DIR': srcdir / 'src' / 'config', +- 'WIREPLUMBER_DATA_DIR': srcdir / 'src', +- }) +- +- meson.add_devenv(devenv) +-endif diff --git a/wp-uninstalled.sh b/wp-uninstalled.sh index 79e53f2..d6279ff 100755 --- a/wp-uninstalled.sh diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0002-Revert-tests-add-pipewire-env-variables-when-running.patch b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0002-Revert-tests-add-pipewire-env-variables-when-running.patch index 07ddb746b..7a24d1554 100644 --- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0002-Revert-tests-add-pipewire-env-variables-when-running.patch +++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0002-Revert-tests-add-pipewire-env-variables-when-running.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Revert "tests: add pipewire env variables when running tests, tidy up common_env" This reverts commit c24db9f3539f9b7ebe9e74c991cc3037f28ea22c. + +Upstream-Status: Inappropriate[meson version dependent] --- tests/meson.build | 31 ------------------------------- tests/modules/meson.build | 9 ++++++--- diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb index 7df199e01..bb2380de1 100644 --- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb +++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb @@ -14,8 +14,8 @@ DEPENDS = "glib-2.0 glib-2.0-native pipewire lua" SRC_URI = "\ git://gitlab.freedesktop.org/pipewire/wireplumber.git;protocol=https;branch=master \ " -# v0.4.5 -SRCREV = "3946457a7942a179c0f61c60de8cb8fc643391dd" +# v0.4.7 +SRCREV = "afb177b5e0840d54dc41d02920702c3c9580ce02" # patches to be able to compile with lower version of meson that is available in AGL. SRC_URI += "\ -- cgit 1.2.3-korg