rpm/pulseaudio
SHA256
1
0
Fork 0
forked from pool/pulseaudio
Code Pull Requests Activity

Accepting request 616853 from home:tiwai:branches:multimedia:libs

Browse Source 
- Fix LADSPA sink regression: revert the affecting commit
  (bsc#1097170):
  0001-Revert-ladspa-sink-fix-Windows-compilation.patch

OBS-URL: https://build.opensuse.org/request/show/616853
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=191
This commit is contained in:
Ondrej Holecek 2018-06-14 12:44:25 +00:00 committed by Git OBS Bridge
parent b13b7c5e72
commit f7c5102d8f
3 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
0001-Revert-ladspa-sink-fix-Windows-compilation.patch Normal file
View File

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

7
pulseaudio.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
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

2
pulseaudio.spec
View File

@ -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
@ -331,6 +332,7 @@ Optional dependency offering zsh completion for various PulseAudio utilities
%patch2
%patch4 -p1
%patch5
%patch6 -p1
%build
NOCONFIGURE=1 ./bootstrap.sh