Accepting request 390290 from multimedia:libs

1

OBS-URL: https://build.opensuse.org/request/show/390290
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pulseaudio?expand=0&rev=138

baselibs.conf

@@ -1,5 +1,7 @@
 libpulse0
   obsoletes "pulseaudio-libs-<targettype> <= <version>"
   provides "pulseaudio-libs-<targettype> = <version>"
+  recommends "pulseaudio-utils-<targettype>"
 libpulse-mainloop-glib0
 libpulse-devel
+pulseaudio-utils

disable-srbchannel.patch

@@ -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;

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) $< > $@

pulseaudio.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+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
+
+- 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) 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
+
 -------------------------------------------------------------------
 Mon Mar 21 14:13:32 UTC 2016 - lmuelle@suse.com
 

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
+# PATCH-FIX-OPENSUSE padsp-biarch.patch bnc#968568
-# XXX note this patch isn't used for now, kept just for workaround in future
+Patch4:         padsp-biarch.patch
-Patch3:         disable-srbchannel.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
+%patch4 -p1
-%patch3 -p1
-%endif
 
 %build
+./bootstrap.sh
 echo 'HTML_TIMESTAMP=NO' >> doxygen/doxygen.conf.in
 export LDFLAGS="-pie"
 export CFLAGS="%{optflags} -fPIE"
@@ -394,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
@@ -445,7 +445,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/
@@ -554,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)
@@ -670,6 +670,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*

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
+    if grep -q ^autospawn $pulse_client_conf >/dev/null 2>&1; then
-	sed -i -e "s|^autospawn.*|autospawn = yes|g" /etc/pulse/client.conf
+	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
+    if grep -q ^autospawn $pulse_client_conf >/dev/null 2>&1; then
-	sed -i -e "s|^autospawn.*|autospawn = no|g" /etc/pulse/client.conf
+	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