From c10ff71224e2b61a41b51f8fd159c8bd7a470cb3352e10e99b4e33840005d630 Mon Sep 17 00:00:00 2001 From: Ondrej Holecek Date: Wed, 25 Nov 2020 19:46:24 +0000 Subject: [PATCH] Accepting request 850788 from home:tiwai:branches:multimedia:libs - Update to pulseaudio 14.0: see details in: https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/14.0/ - Drop obsoleted patches: 0001-alsa-mixer-path-test-Hide-unused-functions-when-buil.patch 0002-alsa-mixer-recognize-the-Speaker-Jack-control.patch 0003-alsa-mixer-add-support-for-SteelSeries-Arctis-Pro-20.patch 0004-alsa-mixer-Add-support-for-SteelSeries-Arctis-5-2019.patch 0005-alsa-mixer-add-support-for-LucidSound-LS31-and-creat.patch 0006-alsa-ucm-use-ucm2-name-for-the-direct-card-index-ope.patch 0007-alsa-ucm-add-mixer-IDs-to-ucm_items.patch 0008-alsa-mixer-handle-the-index-for-ALSA-mixer-element-i.patch 0009-alsa-mixer-improve-alsa_id_decode-function.patch 0010-alsa-ucm-Support-Playback-CaptureVolume.patch 0011-alsa-ucm-Fix-volume-control-based-on-review.patch 0012-alsa-ucm-use-the-correct-mixer-identifiers-as-first.patch 0013-alsa-ucm-add-support-for-master-volume.patch 0014-alsa-ucm-split-correctly-JackHWMute-device-names.patch 0015-alsa-ucm-fix-parsing-for-JackControl.patch 0016-alsa-ucm-add-comments-to-ucm_get_mixer_id.patch 0017-alsa-ucm-validate-access-to-PA_DEVICE_PORT_DATA.patch 0018-alsa-Skip-resume-PCM-if-hardware-doesn-t-support-it.patch 0019-alsa-ucm-parse-correctly-the-device-values.patch 0020-alsa-ucm-do-not-try-to-use-UCM-device-name-as-jack-n.patch 0021-alsa-util-do-not-try-to-guess-the-mixer-name-from-th.patch 0022-alsa-ucm-add-control-and-mixer-device-items.patch 0023-alsa-ucm-get-the-mixer-names-from-ucm-don-t-guess.patch 0024-alsa-ucm-use-the-proper-mixer-name-for-ucm-pcm-sink-.patch 0025-alsa-mixer-handle-interface-type-CARD-PCM-for-mixer-.patch 0026-alsa-mixer-Add-the-ability-to-pass-the-intended-role.patch OBS-URL: https://build.opensuse.org/request/show/850788 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=222 --- disabled-start.diff | 16 +++-- pulseaudio-13.0.tar.xz | 3 - pulseaudio-14.0.tar.xz | 3 + pulseaudio-old-systemd-workaround.patch | 14 ++-- pulseaudio-wrong-memset.patch | 10 ++- pulseaudio.changes | 48 +++++++++++++ pulseaudio.spec | 91 ++----------------------- qpaeq-shebang.patch | 10 ++- suppress-socket-error-msg.diff | 8 +-- 9 files changed, 88 insertions(+), 115 deletions(-) delete mode 100644 pulseaudio-13.0.tar.xz create mode 100644 pulseaudio-14.0.tar.xz diff --git a/disabled-start.diff b/disabled-start.diff index e987ae9..9274bf8 100644 --- a/disabled-start.diff +++ b/disabled-start.diff @@ -1,8 +1,10 @@ -Index: src/daemon/start-pulseaudio-x11.in -=================================================================== ---- src/daemon/start-pulseaudio-x11.in.orig -+++ src/daemon/start-pulseaudio-x11.in -@@ -19,6 +19,12 @@ +--- + src/daemon/start-pulseaudio-x11.in | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/src/daemon/start-pulseaudio-x11.in ++++ b/src/daemon/start-pulseaudio-x11.in +@@ -17,6 +17,12 @@ set -e @@ -13,5 +15,5 @@ Index: src/daemon/start-pulseaudio-x11.in +fi + if [ x"$DISPLAY" != x ] ; then - - @PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY" > /dev/null + + @PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY xauthority=$XAUTHORITY" > /dev/null diff --git a/pulseaudio-13.0.tar.xz b/pulseaudio-13.0.tar.xz deleted file mode 100644 index 64ad314..0000000 --- a/pulseaudio-13.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057 -size 1901768 diff --git a/pulseaudio-14.0.tar.xz b/pulseaudio-14.0.tar.xz new file mode 100644 index 0000000..6ef960a --- /dev/null +++ b/pulseaudio-14.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a834775d9382b055504e5ee7625dc50768daac29329531deb6597bf05e06c261 +size 1980800 diff --git a/pulseaudio-old-systemd-workaround.patch b/pulseaudio-old-systemd-workaround.patch index 110a3db..9c629b2 100644 --- a/pulseaudio-old-systemd-workaround.patch +++ b/pulseaudio-old-systemd-workaround.patch @@ -1,15 +1,13 @@ --- - src/daemon/systemd/user/pulseaudio.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/daemon/systemd/user/pulseaudio.service.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) -Index: pulseaudio-13.0/src/daemon/systemd/user/pulseaudio.service.in -=================================================================== ---- pulseaudio-13.0.orig/src/daemon/systemd/user/pulseaudio.service.in 2019-09-13 15:10:23.000000000 +0200 -+++ pulseaudio-13.0/src/daemon/systemd/user/pulseaudio.service.in 2019-10-07 17:43:52.208067968 +0200 -@@ -18,13 +18,13 @@ +--- a/src/daemon/systemd/user/pulseaudio.service.in ++++ b/src/daemon/systemd/user/pulseaudio.service.in +@@ -18,13 +18,13 @@ ConditionUser=!root [Service] - ExecStart=@PA_BINARY@ --daemonize=no + ExecStart=@PA_BINARY@ --daemonize=no --log-target=journal -LockPersonality=yes +#LockPersonality=yes MemoryDenyWriteExecute=yes diff --git a/pulseaudio-wrong-memset.patch b/pulseaudio-wrong-memset.patch index 17b5e47..5e132bc 100644 --- a/pulseaudio-wrong-memset.patch +++ b/pulseaudio-wrong-memset.patch @@ -1,6 +1,10 @@ ---- src/modules/echo-cancel/adrian-aec.c.orig 2012-05-20 09:24:20.836607707 +0200 -+++ src/modules/echo-cancel/adrian-aec.c 2012-05-20 09:26:07.641603903 +0200 -@@ -167,7 +167,7 @@ +--- + src/modules/echo-cancel/adrian-aec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/modules/echo-cancel/adrian-aec.c ++++ b/src/modules/echo-cancel/adrian-aec.c +@@ -171,7 +171,7 @@ static void AEC_leaky(AEC *a) } else if (1 == a->hangover) { --(a->hangover); // My Leaky NLMS is to erase vector w when hangover expires diff --git a/pulseaudio.changes b/pulseaudio.changes index 7666963..87af92f 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Wed Nov 25 17:10:35 CET 2020 - tiwai@suse.de + +- Update to pulseaudio 14.0: + see details in: + https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/14.0/ +- Drop obsoleted patches: + 0001-alsa-mixer-path-test-Hide-unused-functions-when-buil.patch + 0002-alsa-mixer-recognize-the-Speaker-Jack-control.patch + 0003-alsa-mixer-add-support-for-SteelSeries-Arctis-Pro-20.patch + 0004-alsa-mixer-Add-support-for-SteelSeries-Arctis-5-2019.patch + 0005-alsa-mixer-add-support-for-LucidSound-LS31-and-creat.patch + 0006-alsa-ucm-use-ucm2-name-for-the-direct-card-index-ope.patch + 0007-alsa-ucm-add-mixer-IDs-to-ucm_items.patch + 0008-alsa-mixer-handle-the-index-for-ALSA-mixer-element-i.patch + 0009-alsa-mixer-improve-alsa_id_decode-function.patch + 0010-alsa-ucm-Support-Playback-CaptureVolume.patch + 0011-alsa-ucm-Fix-volume-control-based-on-review.patch + 0012-alsa-ucm-use-the-correct-mixer-identifiers-as-first.patch + 0013-alsa-ucm-add-support-for-master-volume.patch + 0014-alsa-ucm-split-correctly-JackHWMute-device-names.patch + 0015-alsa-ucm-fix-parsing-for-JackControl.patch + 0016-alsa-ucm-add-comments-to-ucm_get_mixer_id.patch + 0017-alsa-ucm-validate-access-to-PA_DEVICE_PORT_DATA.patch + 0018-alsa-Skip-resume-PCM-if-hardware-doesn-t-support-it.patch + 0019-alsa-ucm-parse-correctly-the-device-values.patch + 0020-alsa-ucm-do-not-try-to-use-UCM-device-name-as-jack-n.patch + 0021-alsa-util-do-not-try-to-guess-the-mixer-name-from-th.patch + 0022-alsa-ucm-add-control-and-mixer-device-items.patch + 0023-alsa-ucm-get-the-mixer-names-from-ucm-don-t-guess.patch + 0024-alsa-ucm-use-the-proper-mixer-name-for-ucm-pcm-sink-.patch + 0025-alsa-mixer-handle-interface-type-CARD-PCM-for-mixer-.patch + 0026-alsa-mixer-Add-the-ability-to-pass-the-intended-role.patch + 0027-alsa-mixer-Set-the-intended-role-of-Steelseries-Arct.patch + 0028-alsa-rewrite-mixer-open-close-cache-mixer-accesses-i.patch + 0029-alsa-ucm-add-support-for-HDMI-ELD.patch + 0030-alsa-mixer-do-the-quick-card-number-lookup-to-save-m.patch + 0031-alsa-mixer-improve-check-for-the-empty-path-set-for-.patch + 0032-alsa-ucm-allow-to-set-profile-priority-from-UCM-valu.patch + 0033-alsa-Document-that-mixer-elements-can-be-identified-.patch + 0034-alsa-ucm-correct-the-channel-default-logic-stereo.patch + 0035-alsa-ucm-do-not-assign-JackHWMute-when-JackControl-i.patch + 0036-ucm-Don-t-log-errors-during-normal-operation.patch + 0037-alsa-handle-unavailbale-HW-volume-in-UCM.patch + 0038-alsa-ucm-use-the-right-profile-name.patch + 0039-ucm-fix-the-port-ucm-device-activation-on-boot.patch + 0040-alsa-sink-source-fix-the-mixer-initialization.patch + ------------------------------------------------------------------- Mon Jun 22 11:34:33 UTC 2020 - Callum Farmer diff --git a/pulseaudio.spec b/pulseaudio.spec index d95e52a..ad4c68f 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -21,12 +21,12 @@ %define _fillupdir /var/adm/fillup-templates %endif -%define drvver 13.0 +%define drvver 14.0 %define soname 0 %define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d %define _bashcompletionsdir %{_datadir}/bash-completion/completions Name: pulseaudio -Version: 13.0 +Version: 14.0 Release: 0 Summary: A Networked Sound Server License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -50,47 +50,6 @@ Patch2: pulseaudio-wrong-memset.patch Patch5: qpaeq-shebang.patch # PATCH-FIX-OPENSUSE Workaround for old systemd on Leap 15.x Patch6: pulseaudio-old-systemd-workaround.patch -# PATCH-FIX-UPSTREAM -Patch1001: 0001-alsa-mixer-path-test-Hide-unused-functions-when-buil.patch -Patch1002: 0002-alsa-mixer-recognize-the-Speaker-Jack-control.patch -Patch1003: 0003-alsa-mixer-add-support-for-SteelSeries-Arctis-Pro-20.patch -Patch1004: 0004-alsa-mixer-Add-support-for-SteelSeries-Arctis-5-2019.patch -Patch1005: 0005-alsa-mixer-add-support-for-LucidSound-LS31-and-creat.patch -Patch1006: 0006-alsa-ucm-use-ucm2-name-for-the-direct-card-index-ope.patch -Patch1007: 0007-alsa-ucm-add-mixer-IDs-to-ucm_items.patch -Patch1008: 0008-alsa-mixer-handle-the-index-for-ALSA-mixer-element-i.patch -Patch1009: 0009-alsa-mixer-improve-alsa_id_decode-function.patch -Patch1010: 0010-alsa-ucm-Support-Playback-CaptureVolume.patch -Patch1011: 0011-alsa-ucm-Fix-volume-control-based-on-review.patch -Patch1012: 0012-alsa-ucm-use-the-correct-mixer-identifiers-as-first.patch -Patch1013: 0013-alsa-ucm-add-support-for-master-volume.patch -Patch1014: 0014-alsa-ucm-split-correctly-JackHWMute-device-names.patch -Patch1015: 0015-alsa-ucm-fix-parsing-for-JackControl.patch -Patch1016: 0016-alsa-ucm-add-comments-to-ucm_get_mixer_id.patch -Patch1017: 0017-alsa-ucm-validate-access-to-PA_DEVICE_PORT_DATA.patch -Patch1018: 0018-alsa-Skip-resume-PCM-if-hardware-doesn-t-support-it.patch -Patch1019: 0019-alsa-ucm-parse-correctly-the-device-values.patch -Patch1020: 0020-alsa-ucm-do-not-try-to-use-UCM-device-name-as-jack-n.patch -Patch1021: 0021-alsa-util-do-not-try-to-guess-the-mixer-name-from-th.patch -Patch1022: 0022-alsa-ucm-add-control-and-mixer-device-items.patch -Patch1023: 0023-alsa-ucm-get-the-mixer-names-from-ucm-don-t-guess.patch -Patch1024: 0024-alsa-ucm-use-the-proper-mixer-name-for-ucm-pcm-sink-.patch -Patch1025: 0025-alsa-mixer-handle-interface-type-CARD-PCM-for-mixer-.patch -Patch1026: 0026-alsa-mixer-Add-the-ability-to-pass-the-intended-role.patch -Patch1027: 0027-alsa-mixer-Set-the-intended-role-of-Steelseries-Arct.patch -Patch1028: 0028-alsa-rewrite-mixer-open-close-cache-mixer-accesses-i.patch -Patch1029: 0029-alsa-ucm-add-support-for-HDMI-ELD.patch -Patch1030: 0030-alsa-mixer-do-the-quick-card-number-lookup-to-save-m.patch -Patch1031: 0031-alsa-mixer-improve-check-for-the-empty-path-set-for-.patch -Patch1032: 0032-alsa-ucm-allow-to-set-profile-priority-from-UCM-valu.patch -Patch1033: 0033-alsa-Document-that-mixer-elements-can-be-identified-.patch -Patch1034: 0034-alsa-ucm-correct-the-channel-default-logic-stereo.patch -Patch1035: 0035-alsa-ucm-do-not-assign-JackHWMute-when-JackControl-i.patch -Patch1036: 0036-ucm-Don-t-log-errors-during-normal-operation.patch -Patch1037: 0037-alsa-handle-unavailbale-HW-volume-in-UCM.patch -Patch1038: 0038-alsa-ucm-use-the-right-profile-name.patch -Patch1039: 0039-ucm-fix-the-port-ucm-device-activation-on-boot.patch -Patch1040: 0040-alsa-sink-source-fix-the-mixer-initialization.patch BuildRequires: alsa-devel >= 1.0.19 BuildRequires: bluez-devel >= 5 BuildRequires: doxygen @@ -378,50 +337,10 @@ Optional dependency offering zsh completion for various PulseAudio utilities %prep %setup -q -T -b0 -%patch0 -%patch1001 -p1 -%patch1002 -p1 -%patch1003 -p1 -%patch1004 -p1 -%patch1005 -p1 -%patch1006 -p1 -%patch1007 -p1 -%patch1008 -p1 -%patch1009 -p1 -%patch1010 -p1 -%patch1011 -p1 -%patch1012 -p1 -%patch1013 -p1 -%patch1014 -p1 -%patch1015 -p1 -%patch1016 -p1 -%patch1017 -p1 -%patch1018 -p1 -%patch1019 -p1 -%patch1020 -p1 -%patch1021 -p1 -%patch1022 -p1 -%patch1023 -p1 -%patch1024 -p1 -%patch1025 -p1 -%patch1026 -p1 -%patch1027 -p1 -%patch1028 -p1 -%patch1029 -p1 -%patch1030 -p1 -%patch1031 -p1 -%patch1032 -p1 -%patch1033 -p1 -%patch1034 -p1 -%patch1035 -p1 -%patch1036 -p1 -%patch1037 -p1 -%patch1038 -p1 -%patch1039 -p1 -%patch1040 -p1 +%patch0 -p1 %patch1 -p1 -%patch2 -%patch5 +%patch2 -p1 +%patch5 -p1 # workaround for Leap 15.x %if 0%{?suse_version} < 1550 %patch6 -p1 diff --git a/qpaeq-shebang.patch b/qpaeq-shebang.patch index 4bae0bb..a554f96 100644 --- a/qpaeq-shebang.patch +++ b/qpaeq-shebang.patch @@ -1,7 +1,11 @@ ---- src/utils/qpaeq.org 2018-05-15 14:12:16.038877587 +0200 -+++ src/utils/qpaeq 2018-05-15 14:12:49.002967454 +0200 +--- + src/utils/qpaeq | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/utils/qpaeq ++++ b/src/utils/qpaeq @@ -1,4 +1,4 @@ --#!/usr/bin/env python +-#!/usr/bin/env python3 +#!/usr/bin/python3 # qpaeq is a equalizer interface for pulseaudio's equalizer sinks # Copyright (C) 2009 Jason Newton local = pa_socket_address_is_local(sa); if ((c->fd = pa_socket_cloexec(sa->sa_family, SOCK_STREAM, 0)) < 0) {