forked from pool/pulseaudio
Ondrej Holecek
f7c5102d8f
- 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
42 lines
2.0 KiB
Diff
42 lines
2.0 KiB
Diff
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());
|