Accepting request 616861 from multimedia:libs

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

0001-Revert-ladspa-sink-fix-Windows-compilation.patch

@@ -0,0 +1,41 @@
+From cb7503ba4bb1f35d7884fa364383b2219629b89d Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Thu, 14 Jun 2018 13:39:03 +0200
+Subject: [PATCH] Revert "ladspa-sink: fix Windows compilation"
+
+This reverts commit 8c22cd54dec381cdc3e56b007e539a6e2ff7833c.
+---
+ src/Makefile.am                  |    2 +-
+ src/modules/module-ladspa-sink.c |    9 +--------
+ 2 files changed, 2 insertions(+), 9 deletions(-)
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1677,7 +1677,7 @@ module_remap_source_la_LIBADD = $(MODULE
+ module_remap_source_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_remap_source
+ 
+ module_ladspa_sink_la_SOURCES = modules/module-ladspa-sink.c modules/ladspa.h
+-module_ladspa_sink_la_CFLAGS = -DLADSPA_PATH="$(libdir)/ladspa:/usr/local/lib/ladspa:/usr/lib/ladspa:/usr/local/lib64/ladspa:/usr/lib64/ladspa" $(AM_CFLAGS) $(SERVER_CFLAGS) -DPA_MODULE_NAME=module_ladspa_sink
++module_ladspa_sink_la_CFLAGS = -DLADSPA_PATH=\"$(libdir)/ladspa:/usr/local/lib/ladspa:/usr/lib/ladspa:/usr/local/lib64/ladspa:/usr/lib64/ladspa\" $(AM_CFLAGS) $(SERVER_CFLAGS) -DPA_MODULE_NAME=module_ladspa_sink
+ module_ladspa_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
+ module_ladspa_sink_la_LIBADD = $(MODULE_LIBADD) $(LIBLTDL)
+ 
+--- a/src/modules/module-ladspa-sink.c
++++ b/src/modules/module-ladspa-sink.c
+@@ -1054,15 +1054,8 @@ int pa__init(pa_module*m) {
+     u->output = NULL;
+     u->ss = ss;
+ 
+-    /* If the LADSPA_PATH environment variable is not set, we use the
+-     * LADSPA_PATH preprocessor macro instead. The macro can contain characters
+-     * that need to be escaped (especially on Windows backslashes are common).
+-     * The "#" preprocessor operator helpfully adds the required escaping while
+-     * turning the LADSPA_PATH macro into a string. */
+-#define QUOTE_MACRO(x) #x
+     if (!(e = getenv("LADSPA_PATH")))
+-        e = QUOTE_MACRO(LADSPA_PATH);
+-#undef QUOTE_MACRO
++        e = LADSPA_PATH;
+ 
+     /* FIXME: This is not exactly thread safe */
+     t = pa_xstrdup(lt_dlgetsearchpath());

pulseaudio.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Thu Jun 14 13:40:52 CEST 2018 - tiwai@suse.de
+
+- Fix LADSPA sink regression: revert the affecting commit
+  (bsc#1097170):
+  0001-Revert-ladspa-sink-fix-Windows-compilation.patch
+
+-------------------------------------------------------------------
+Wed Jun  6 21:27:06 UTC 2018 - bjorn.lie@gmail.com
+
+- Drop pkgconfig(gconf-2.0) BuildRequires: No longer mandatory,
+  following this, replace --enable-gconf configure call with
+  --disable-gconf and add explicit pkgconfig(gio-2.0)
+  BuildRequires.
+- Following the above, drop pulseaudio-module-gconf sub-package,
+  and obsolete it from pulseaudio-module-gsettings.
+
 -------------------------------------------------------------------
 Tue May 15 12:27:13 UTC 2018 - oholecek@suse.com
 

pulseaudio.spec

@@ -47,6 +47,7 @@ Patch2:         pulseaudio-wrong-memset.patch
 Patch4:         pa-set-exit-idle-time-to-0-when-we-detect-a-session.patch
 # PATCH-FIX-OPENSUSE qpaeq-shebang.patch Avoid rpmlint error due to using env python shebang
 Patch5:         qpaeq-shebang.patch
+Patch6:         0001-Revert-ladspa-sink-fix-Windows-compilation.patch
 BuildRequires:  alsa-devel >= 1.0.19
 BuildRequires:  bluez-devel >= 5
 BuildRequires:  doxygen
@@ -72,7 +73,7 @@ BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(bash-completion)
 BuildRequires:  pkgconfig(dbus-1) >= 1.4.12
-BuildRequires:  pkgconfig(gconf-2.0)
+BuildRequires:  pkgconfig(gio-2.0) >= 2.26.0
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(ice)
@@ -212,24 +213,12 @@ improved drop-in replacement for the Enlightened Sound Daemon (ESOUND).
 
 Contains Bluetooth audio (A2DP/HSP/HFP) support for the PulseAudio sound server.
 
-%package module-gconf
-Summary:        GCONF module for PulseAudio
-Group:          System/Sound Daemons
-Requires:       %{name} = %{version}
-Conflicts:      %{name}-module-gsettings
-
-%description module-gconf
-pulseaudio is a networked sound server for Linux and other Unix like
-operating systems and Microsoft Windows. It is intended to be an
-improved drop-in replacement for the Enlightened Sound Daemon (ESOUND).
-
-This package provides gconf storage of PulseAudio sound server settings.
-
 %package module-gsettings
 Summary:        GSettings module for PulseAudio
 Group:          System/Sound Daemons
 Requires:       %{name} = %{version}
 Conflicts:      %{name}-module-gconf
+Obsoletes:      %{name}-module-gconf
 
 %description module-gsettings
 pulseaudio is a networked sound server for Linux and other Unix like
@@ -343,6 +332,7 @@ Optional dependency offering zsh completion for various PulseAudio utilities
 %patch2
 %patch4 -p1
 %patch5
+%patch6 -p1
 
 %build
 NOCONFIGURE=1 ./bootstrap.sh
@@ -362,7 +352,7 @@ export CFLAGS="%{optflags} -fPIE"
         --disable-bluez4 \
         --enable-webrtc-aec \
         --enable-adrian-aec \
-        --enable-gconf \
+        --disable-gconf \
         --enable-gsettings \
         --with-udev-rules-dir=%{_udevrulesdir} \
         --with-pulsedsp-location='%{_prefix}/\\$$LIB/pulseaudio'
@@ -616,13 +606,6 @@ exit 0
 %{_libdir}/pulse-%{drvver}/modules/module-bluez5-device.so
 %{_libdir}/pulse-%{drvver}/modules/module-bluez5-discover.so
 
-%files module-gconf
-%dir %{_libexecdir}/pulse
-%dir %{_libdir}/pulse-%{drvver}
-%dir %{_libdir}/pulse-%{drvver}/modules
-%{_libdir}/pulse-%{drvver}/modules/module-gconf.so
-%{_libexecdir}/pulse/gconf-helper
-
 %files module-gsettings
 %dir %{_libexecdir}/pulse
 %dir %{_libdir}/pulse-%{drvver}