From 0f0d0a6144cc465bbc3ee70c530b8e7c3c68968a42b1454f4ccc6b9ed511ce17 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Wed, 13 Apr 2016 07:16:26 +0000 Subject: [PATCH 1/3] Accepting request 388299 from home:tiwai:branches:multimedia:libs - Move libpulsedsp.so into pulseaudio-utils subpackage and add it to baselibs.conf so that 32bit compat lib is built (boo#968568); also recommends is added in libpulse0-32bit for easy installation - Fix padsp script to support bi-arch libs (boo#968568) - Call bootstrap.sh for rebuilding properly with patches - Drop the obsoleted disable-srbchannel.patch, which has been fixed in upstream already OBS-URL: https://build.opensuse.org/request/show/388299 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=168 --- baselibs.conf | 2 ++ disable-srbchannel.patch | 15 --------------- padsp-biarch.patch | 36 ++++++++++++++++++++++++++++++++++++ pulseaudio.changes | 11 +++++++++++ pulseaudio.spec | 13 ++++++------- 5 files changed, 55 insertions(+), 22 deletions(-) delete mode 100644 disable-srbchannel.patch create mode 100644 padsp-biarch.patch diff --git a/baselibs.conf b/baselibs.conf index e8d0306..dfb60b3 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,5 +1,7 @@ libpulse0 obsoletes "pulseaudio-libs- <= " provides "pulseaudio-libs- = " + recommends "pulseaudio-utils-" libpulse-mainloop-glib0 libpulse-devel +pulseaudio-utils diff --git a/disable-srbchannel.patch b/disable-srbchannel.patch deleted file mode 100644 index 73fc9b1..0000000 --- a/disable-srbchannel.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- - src/pulsecore/protocol-native.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/src/pulsecore/protocol-native.c -+++ b/src/pulsecore/protocol-native.c -@@ -5328,7 +5328,7 @@ int pa_native_options_parse(pa_native_op - pa_assert(PA_REFCNT_VALUE(o) >= 1); - pa_assert(ma); - -- o->srbchannel = true; -+ o->srbchannel = false; - if (pa_modargs_get_value_boolean(ma, "srbchannel", &o->srbchannel) < 0) { - pa_log("srbchannel= expects a boolean argument."); - return -1; diff --git a/padsp-biarch.patch b/padsp-biarch.patch new file mode 100644 index 0000000..29dccba --- /dev/null +++ b/padsp-biarch.patch @@ -0,0 +1,36 @@ +--- + src/Makefile.am | 5 ++++- + src/utils/padsp.in | 6 ++++-- + 2 files changed, 8 insertions(+), 3 deletions(-) + +--- a/src/utils/padsp.in ++++ b/src/utils/padsp.in +@@ -73,10 +73,12 @@ done + + shift $(( $OPTIND - 1 )) + ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ + if [ x"$LD_PRELOAD" = x ] ; then +- LD_PRELOAD="@pkglibdir@/libpulsedsp.so" ++ LD_PRELOAD="${exec_prefix}/\$LIB/@PACKAGE@/libpulsedsp.so" + else +- LD_PRELOAD="$LD_PRELOAD @pkglibdir@/libpulsedsp.so" ++ LD_PRELOAD="$LD_PRELOAD ${exec_prefix}/\$LIB/@PACKAGE@/libpulsedsp.so" + fi + + export LD_PRELOAD +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -901,7 +901,10 @@ padsplib_LTLIBRARIES = libpulsedsp.la + bin_SCRIPTS += padsp + + edit = @SED@ \ +- -e "s|@pkglibdir[@]|$(pkglibdir)|g" ++ -e "s|@pkglibdir[@]|$(pkglibdir)|g" \ ++ -e "s|@prefix[@]|$(prefix)|g" \ ++ -e "s|@exec_prefix[@]|$(exec_prefix)|g" \ ++ -e "s|@PACKAGE[@]|$(PACKAGE)|g" + + padsp: utils/padsp.in + $(edit) $< > $@ diff --git a/pulseaudio.changes b/pulseaudio.changes index 7857d54..c070fac 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Apr 4 14:06:06 CEST 2016 - tiwai@suse.de + +- Move libpulsedsp.so into pulseaudio-utils subpackage and add it + to baselibs.conf so that 32bit compat lib is built (boo#968568); + also recommends is added in libpulse0-32bit for easy installation +- Fix padsp script to support bi-arch libs (boo#968568) +- Call bootstrap.sh for rebuilding properly with patches +- Drop the obsoleted disable-srbchannel.patch, which has been fixed + in upstream already + ------------------------------------------------------------------- Mon Mar 21 14:13:32 UTC 2016 - lmuelle@suse.com diff --git a/pulseaudio.spec b/pulseaudio.spec index 2a4d52f..4134987 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -44,9 +44,8 @@ Source99: baselibs.conf Patch0: disabled-start.diff Patch1: suppress-socket-error-msg.diff Patch2: pulseaudio-wrong-memset.patch -# PATCH-FIX-SUSE disable-srbchannel.patch boo#950487 Disable srbchannel as a workaround for crashes on KDE -# XXX note this patch isn't used for now, kept just for workaround in future -Patch3: disable-srbchannel.patch +# PATCH-FIX-OPENSUSE padsp-biarch.patch bnc#968568 +Patch4: padsp-biarch.patch BuildRequires: alsa-devel >= 1.0.19 # require only minimal bluez, if we are on bluez 5 we will determine in build phase BuildRequires: bluez-devel >= 4.99 @@ -326,11 +325,10 @@ Optional dependency offering zsh completion for various PulseAudio utilities %patch0 %patch1 -p1 %patch2 -%if 0 -%patch3 -p1 -%endif +%patch4 -p1 %build +./bootstrap.sh echo 'HTML_TIMESTAMP=NO' >> doxygen/doxygen.conf.in export LDFLAGS="-pie" export CFLAGS="%{optflags} -fPIE" @@ -445,7 +443,6 @@ exit 0 %{_datadir}/pulseaudio/alsa-mixer %{_localstatedir}/adm/fillup-templates/sysconfig.sound-pulseaudio %dir %{_libdir}/pulseaudio -%{_libdir}/pulseaudio/libpulsedsp.so %{_libdir}/pulseaudio/libpulsecore-%{drvver}.so %dir %{_libdir}/pulse-%{drvver}/ %dir %{_libdir}/pulse-%{drvver}/modules/ @@ -670,6 +667,8 @@ exit 0 %{_bindir}/pax11publish %{_bindir}/padsp %{_bindir}/pasuspender +%dir %{_libdir}/pulseaudio +%{_libdir}/pulseaudio/libpulsedsp.so %{_mandir}/man1/pacat.1* %{_mandir}/man1/pacmd.1* %{_mandir}/man1/pactl.1* From cd66ccea2459284c0c2dee1f363932eead26e79da9651ad3de19c7a1b3926cfd Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Wed, 13 Apr 2016 17:30:22 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=169 --- pulseaudio.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pulseaudio.changes b/pulseaudio.changes index c070fac..18cc0ce 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -4,7 +4,8 @@ Mon Apr 4 14:06:06 CEST 2016 - tiwai@suse.de - Move libpulsedsp.so into pulseaudio-utils subpackage and add it to baselibs.conf so that 32bit compat lib is built (boo#968568); also recommends is added in libpulse0-32bit for easy installation -- Fix padsp script to support bi-arch libs (boo#968568) +- Fix padsp script to support bi-arch libs (boo#968568) with + padsp-biarch.patch - Call bootstrap.sh for rebuilding properly with patches - Drop the obsoleted disable-srbchannel.patch, which has been fixed in upstream already From b5073d1e26f6d555506f01dd64766b6ae7b6d78b84ee063baffb2eecc9a315e1 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Sat, 16 Apr 2016 08:32:21 +0000 Subject: [PATCH 3/3] Accepting request 390178 from home:tiwai:branches:multimedia:libs - Use /etc/pulse/client.conf.d/50-system.conf as a system setup by setup-pulseaudio script instead of modifying the global config. OBS-URL: https://build.opensuse.org/request/show/390178 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=170 --- pulseaudio.changes | 6 ++++++ pulseaudio.spec | 3 +++ setup-pulseaudio | 13 +++++++------ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/pulseaudio.changes b/pulseaudio.changes index 18cc0ce..a212cbd 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 14 12:45:13 CEST 2016 - tiwai@suse.de + +- Use /etc/pulse/client.conf.d/50-system.conf as a system setup by + setup-pulseaudio script instead of modifying the global config. + ------------------------------------------------------------------- Mon Apr 4 14:06:06 CEST 2016 - tiwai@suse.de diff --git a/pulseaudio.spec b/pulseaudio.spec index 4134987..de61be1 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -392,6 +392,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/pulse/client.conf.d mkdir -p %{buildroot}%{_sysconfdir}/pulse/daemon.conf.d # Install disable_flat_volumes.conf install -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/pulse/daemon.conf.d +# created by setup-pulseaudio script +touch %{buildroot}%{_sysconfdir}/pulse/client.conf.d/50-system.conf %fdupes doxygen/html %pre @@ -551,6 +553,7 @@ exit 0 # created by setup-pulseaudio script %ghost %{_sysconfdir}/profile.d/pulseaudio.sh %ghost %{_sysconfdir}/profile.d/pulseaudio.csh +%ghost %{_sysconfdir}/pulse/client.conf.d/50-system.conf %files esound-compat %defattr(-,root,root) diff --git a/setup-pulseaudio b/setup-pulseaudio index 305a1af..2ac994b 100644 --- a/setup-pulseaudio +++ b/setup-pulseaudio @@ -28,6 +28,7 @@ check_root() { PROFNAME=/etc/profile.d/pulseaudio.sh CPROFNAME=/etc/profile.d/pulseaudio.csh +pulse_client_conf=/etc/pulse/client.conf.d/50-system.conf MPLAYER_CONF=/etc/mplayer/mplayer.conf @@ -199,10 +200,10 @@ enable_qemu () { enable_autospawn() { echo "Enabling PulseAudio autospawn..." - if grep -q ^autospawn /etc/pulse/client.conf; then - sed -i -e "s|^autospawn.*|autospawn = yes|g" /etc/pulse/client.conf + if grep -q ^autospawn $pulse_client_conf >/dev/null 2>&1; then + sed -i -e "s|^autospawn.*|autospawn = yes|g" $pulse_client_conf else - echo "autospawn = yes" >> /etc/pulse/client.conf + echo "autospawn = yes" >> $pulse_client_conf fi } @@ -306,10 +307,10 @@ disable_qemu () { disable_autospawn() { echo "Disabling PulseAudio autospawn..." - if grep -q ^autospawn /etc/pulse/client.conf; then - sed -i -e "s|^autospawn.*|autospawn = no|g" /etc/pulse/client.conf + if grep -q ^autospawn $pulse_client_conf >/dev/null 2>&1; then + sed -i -e "s|^autospawn.*|autospawn = no|g" $pulse_client_conf else - echo "autospawn = no" >> /etc/pulse/client.conf + echo "autospawn = no" >> $pulse_client_conf fi # kill leftover PA processes killall pulseaudio > /dev/null 2>&1