From efb6ab5a4f1bbb7842872c4d7713088912d7c6f7 Mon Sep 17 00:00:00 2001 From: Stefano Ragni Date: Thu, 11 Nov 2021 22:06:00 +0100 Subject: [PATCH] pipewire: update to 0.3.40 --- srcpkgs/pipewire/patches/1042.patch | 77 ------------------- ...0decea5f83730c271e9bed03cdd0048fcd49.patch | 22 ------ srcpkgs/pipewire/template | 8 +- 3 files changed, 4 insertions(+), 103 deletions(-) delete mode 100644 srcpkgs/pipewire/patches/1042.patch delete mode 100644 srcpkgs/pipewire/patches/651f0decea5f83730c271e9bed03cdd0048fcd49.patch diff --git a/srcpkgs/pipewire/patches/1042.patch b/srcpkgs/pipewire/patches/1042.patch deleted file mode 100644 index fc4c5f2f35cd..000000000000 --- a/srcpkgs/pipewire/patches/1042.patch +++ /dev/null @@ -1,77 +0,0 @@ -From cf3c0431c387a72fdbc66ec78086f695d0b6de3c Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 26 Oct 2021 11:14:06 +1000 -Subject: [PATCH 1/2] test: fix tmpdir value after setenv - -Introduced in a2856c6e0f692b7a379e06d3ed6ac8107f9b946b - -set_test_env() modifies TMPDIR so we must not use getenv until after -that call. - -Fixes #1736 ---- - test/pwtest.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/test/pwtest.c b/test/pwtest.c -index fbf16cb2f..a000153fd 100644 ---- a/test/pwtest.c -+++ b/test/pwtest.c -@@ -915,9 +915,7 @@ static void run_test(struct pwtest_context *ctx, struct pwtest_suite *c, struct - pid_t pw_daemon = 0; - int read_fds[_FD_LAST], write_fds[_FD_LAST]; - int r; -- const char *tmpdir = getenv("TMPDIR"); -- -- spa_assert_se(tmpdir != NULL); -+ const char *tmpdir; - - if (t->result == PWTEST_SKIP) { - char *buf = pw_array_add(&t->logs[FD_LOG], 64); -@@ -934,6 +932,8 @@ static void run_test(struct pwtest_context *ctx, struct pwtest_suite *c, struct - } - - set_test_env(ctx, t); -+ tmpdir = getenv("TMPDIR"); -+ spa_assert_se(tmpdir != NULL); - r = chdir(tmpdir); - if (r < 0) { - t->sig_or_errno = -errno; --- -GitLab - - -From 07c5511aedf0b0606c0d3f92ce829c5402436d58 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 26 Oct 2021 11:03:22 +1000 -Subject: [PATCH 2/2] test: handle chdir errors correctly - -When we get to this code, we already updated the environment variables -so we need to use the usual error path to restore them. - -And where chdir does fail, print an error to the log. 256 chars should -be enough here, if your tmpdir exceeds that you just have the error -message cut off. ---- - test/pwtest.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/test/pwtest.c b/test/pwtest.c -index a000153fd..35e7b003c 100644 ---- a/test/pwtest.c -+++ b/test/pwtest.c -@@ -936,8 +936,10 @@ static void run_test(struct pwtest_context *ctx, struct pwtest_suite *c, struct - spa_assert_se(tmpdir != NULL); - r = chdir(tmpdir); - if (r < 0) { -+ char *buf = pw_array_add(&t->logs[FD_LOG], 256); -+ spa_scnprintf(buf, 256, "pwtest: failed to chdir to '%s'\n", tmpdir); - t->sig_or_errno = -errno; -- return; -+ goto error; - } - - if (t->args.pw_daemon) { --- -GitLab - diff --git a/srcpkgs/pipewire/patches/651f0decea5f83730c271e9bed03cdd0048fcd49.patch b/srcpkgs/pipewire/patches/651f0decea5f83730c271e9bed03cdd0048fcd49.patch deleted file mode 100644 index b0866c5b4309..000000000000 --- a/srcpkgs/pipewire/patches/651f0decea5f83730c271e9bed03cdd0048fcd49.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 651f0decea5f83730c271e9bed03cdd0048fcd49 Mon Sep 17 00:00:00 2001 -From: Wim Taymans -Date: Thu, 21 Oct 2021 11:09:48 +0200 -Subject: [PATCH] cpu: fix compilation on some architectures - ---- - spa/plugins/support/cpu.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/spa/plugins/support/cpu.c b/spa/plugins/support/cpu.c -index ee1816512..01cff4854 100644 ---- a/spa/plugins/support/cpu.c -+++ b/spa/plugins/support/cpu.c -@@ -270,7 +270,7 @@ impl_init(const struct spa_handle_factory *factory, - if ((str = spa_dict_lookup(info, SPA_KEY_CPU_VM_TYPE)) != NULL) - this->vm_type = atoi(str); - if ((str = spa_dict_lookup(info, SPA_KEY_CPU_ZERO_DENORMALS)) != NULL) -- impl_cpu_zero_denormals(this, spa_atob(str)); -+ spa_cpu_zero_denormals(&this->cpu, spa_atob(str)); - } - - spa_log_debug(this->log, "%p: count:%d align:%d flags:%08x", diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index fc8b75f3aaf9..67ffc1882f3e 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,8 +1,8 @@ # Template file for 'pipewire' pkgname=pipewire -version=0.3.39 +version=0.3.40 revision=1 -_pms_version=0.4.0 +_pms_version=0.4.1 build_style=meson configure_args=" --auto-features=enabled @@ -32,8 +32,8 @@ homepage="https://pipewire.org/" changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS" distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz" -checksum="2112173c7d5e89b28ec289a25d30f2be5340e2ca6d104511d176324ffd0f968a - c04496f1606d60174ba30b0adc0dc14ec0e3d1bf1684dd42836a56511e64ba8b" +checksum="a2c8176d757a2ac6db445c61a50802ff1c26f49f5a28174f5eb0278609a887cf + 119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975" make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire" system_accounts="_pipewire"