The package rpms/pipewire.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/pipewire.git/commit/?id=08a20176d335....
Change: -%ifarch s390x
Thanks.
Full change: ============
commit 08a20176d335f30cb313909e2f75de445ba51f3b Author: Wim Taymans wtaymans@redhat.com Date: Thu Nov 11 15:37:37 2021 +0100
Update version to 0.3.40 and media-session 0.4.1
Enable tests for s390x again
diff --git a/.gitignore b/.gitignore index 64807a8..9054764 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,5 @@ /pipewire-0.3.38.tar.gz /pipewire-0.3.39.tar.gz /media-session-0.4.0.tar.gz +/pipewire-0.3.40.tar.gz +/media-session-0.4.1.tar.gz diff --git a/0001-Build-media-session-from-local-tarbal.patch b/0001-Build-media-session-from-local-tarbal.patch index e420c4a..5c299a8 100644 --- a/0001-Build-media-session-from-local-tarbal.patch +++ b/0001-Build-media-session-from-local-tarbal.patch @@ -16,8 +16,8 @@ index f6b4e62fb..a6249e5e1 100644 -url = https://gitlab.freedesktop.org/pipewire/media-session.git -revision = head +[wrap-file] -+source_filename = media-session-0.4.0.tar.gz -+directory = media-session-0.4.0 ++source_filename = media-session-0.4.1.tar.gz ++directory = media-session-0.4.1
-- 2.31.1 diff --git a/0001-cpu-fix-compilation-on-ARM.patch b/0001-cpu-fix-compilation-on-ARM.patch deleted file mode 100644 index 2ac752d..0000000 --- a/0001-cpu-fix-compilation-on-ARM.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f8817b439433798bd7217dc4ae72197887b0fc96 Mon Sep 17 00:00:00 2001 -From: Wim Taymans wtaymans@redhat.com -Date: Thu, 30 Sep 2021 11:12:27 +0200 -Subject: [PATCH] cpu: fix compilation on ARM - ---- - spa/plugins/support/cpu-arm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/spa/plugins/support/cpu-arm.c b/spa/plugins/support/cpu-arm.c -index d80b8ad87..de07ebf41 100644 ---- a/spa/plugins/support/cpu-arm.c -+++ b/spa/plugins/support/cpu-arm.c -@@ -80,7 +80,7 @@ arm_init(struct impl *impl) - int arch; - - if (!(cpuinfo = get_cpuinfo())) { -- spa_log_warn(impl->log, NAME " %p: Can't read cpuinfo", impl); -+ spa_log_warn(impl->log, "%p: Can't read cpuinfo", impl); - return 1; - } - --- -2.31.1 - diff --git a/0001-cpu-fix-compilation-on-some-architectures.patch b/0001-cpu-fix-compilation-on-some-architectures.patch deleted file mode 100644 index 66b546b..0000000 --- a/0001-cpu-fix-compilation-on-some-architectures.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 651f0decea5f83730c271e9bed03cdd0048fcd49 Mon Sep 17 00:00:00 2001 -From: Wim Taymans wtaymans@redhat.com -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", --- -2.31.1 - diff --git a/0001-media-session-only-check-passthrough-when-available.patch b/0001-media-session-only-check-passthrough-when-available.patch deleted file mode 100644 index c9f81c0..0000000 --- a/0001-media-session-only-check-passthrough-when-available.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3eec78bcb7ca9ced50cd525dc590bad663f44d36 Mon Sep 17 00:00:00 2001 -From: Wim Taymans wtaymans@redhat.com -Date: Thu, 9 Sep 2021 16:24:04 +0200 -Subject: [PATCH] media-session: only check passthrough when available - -When none of the nodes have a valid passthrough format, don't check if -passthrough is possible. - -Without the check, it is possible that a node has a common format with -the peer that is not a passthrough format, like a raw audio format. - -Fixes #1587 ---- - src/examples/media-session/policy-node.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/examples/media-session/policy-node.c b/src/examples/media-session/policy-node.c -index ceeb11c42..68732c247 100644 ---- a/src/examples/media-session/policy-node.c -+++ b/src/examples/media-session/policy-node.c -@@ -217,6 +217,9 @@ static bool check_passthrough(struct node *node, struct node *peer) - if (peer->obj->info->state == PW_NODE_STATE_RUNNING) - return false; - -+ if (!node->have_passthrough || !peer->have_passthrough) -+ return false; -+ - spa_list_for_each(p1, &node->obj->param_list, link) { - if (p1->id != SPA_PARAM_EnumFormat) - continue; --- -2.31.1 - diff --git a/pipewire.spec b/pipewire.spec index 44ae17c..8e4b50d 100644 --- a/pipewire.spec +++ b/pipewire.spec @@ -1,15 +1,15 @@ %global majorversion 0 %global minorversion 3 -%global microversion 39 +%global microversion 40
%global apiversion 0.3 %global spaversion 0.2 %global soversion 0 %global libversion %{soversion}.%(bash -c '((intversion = (%{minorversion} * 100) + %{microversion})); echo ${intversion}').0 -%global ms_version 0.4.0 +%global ms_version 0.4.1
# For rpmdev-bumpspec and releng automation -%global baserelease 3 +%global baserelease 1
#global snapdate 20210107 #global gitcommit b17db2cebc1a5ab2c01851d29c05f79cd2f262bb @@ -73,7 +73,6 @@ Source1: https://gitlab.freedesktop.org/pipewire/media-session/-/archive/ %endif
## upstream patches -Patch0001: 0001-cpu-fix-compilation-on-some-architectures.patch
## upstreamable patches
@@ -409,10 +408,6 @@ mv -fv %{buildroot}/lib/udev/rules.d/90-pipewire-alsa.rules %{buildroot}%{_prefi
%check -%ifarch s390x -# FIXME: s390x FAIL: pw-test-stream, pw-test-endpoint -%global tests_nonfatal 1 -%endif %meson_test || TESTS_ERROR=$? if [ "${TESTS_ERROR}" != "" ]; then echo "test failed" @@ -592,6 +587,7 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %if %{with pulse} %files pulseaudio %{_bindir}/pipewire-pulse +%{_mandir}/man1/pipewire-pulse.1* %{_userunitdir}/pipewire-pulse.* %{_datadir}/pipewire/pipewire-pulse.conf %endif @@ -603,6 +599,10 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %endif
%changelog +* Thu Nov 11 2021 Wim Taymans wtaymans@redhat.com - 0.3.40-1 +- Update version to 0.3.40 and media-session 0.4.1 +- Enable tests for s390x again + * Tue Nov 09 2021 Peter Hutterer peter.hutterer@redhat.com - 0.3.39-3 - Don't build media-session on F35, it's a separate package now, see #2016247
diff --git a/sources b/sources index b916341..315320f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pipewire-0.3.39.tar.gz) = 75ed35177577efe7559341394605777be21d0f3952b9379a23c8d4c71d35ed88ec45c3e9ad58832099c8f370753d8b47a5767f47453a599c4f4a4b641b2b0d9d -SHA512 (media-session-0.4.0.tar.gz) = b37c85b85c47e7871066e511947673c7016f72baa00e940907db63e1e7554dfb200d7608ab6ec8ccd4cf84b6d7113894dad956e379bba69d1d8d882dc5b899f2 +SHA512 (pipewire-0.3.40.tar.gz) = 63109b87d50be160a6cde632470849564d4743f4cb469f5e3713bb1cbefc08f80416210ddedc09439555b702193c0266a1b9724e366a3b850bdf1a346c5e80cb +SHA512 (media-session-0.4.1.tar.gz) = bfce472b7260b280c0d3cd74d917f48655b5be9976c89a109e94b81af2c3664e83446e97db573cedba6e5d54dedf77195b80eb0a76f6bfc0e96e342557469f99