Accepting request 623452 from multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/623452
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pulseaudio?expand=0&rev=156
This commit is contained in:
Dominique Leuenberger 2018-07-25 14:06:05 +00:00 committed by Git OBS Bridge
commit 82ab611355
5 changed files with 18 additions and 48 deletions

View File

@ -1,41 +0,0 @@
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());

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6e422dbdc9fd11c0cb6af869e5eda73dc24a8be3c14725440edd51ce6b464444
size 1657212

3
pulseaudio-12.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:809668ffc296043779c984f53461c2b3987a45b7a25eb2f0a1d11d9f23ba4055
size 1665092

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Jul 16 12:49:15 UTC 2018 - oholecek@suse.com
- Update to 12.2
* Fixed broken configure script (building failed when gsettings
was enabled)
- Update to 12.1
* Fixed a crash when switching to the A2DP bluetooth profile
* Fixed the plugin search path in module-ladspa-sink
* Fixed file permissions for the pipes created by module-pipe-sink and
module-pipe-source
- Remove patch 0001-Revert-ladspa-sink-fix-Windows-compilation.patch
-------------------------------------------------------------------
Thu Jun 21 07:06:31 UTC 2018 - oholecek@suse.com

View File

@ -21,13 +21,13 @@
%define _fillupdir /var/adm/fillup-templates
%endif
%define drvver 12.0
%define drvver 12.2
%define soname 0
%define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
%define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
%define _bashcompletionsdir %{_datadir}/bash-completion/completions
Name: pulseaudio
Version: 12.0
Version: 12.2
Release: 0
Summary: A Networked Sound Server
License: GPL-2.0+ AND LGPL-2.1+
@ -47,7 +47,6 @@ 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
@ -344,7 +343,6 @@ Optional dependency offering zsh completion for various PulseAudio utilities
%patch2
%patch4 -p1
%patch5
%patch6 -p1
%build
NOCONFIGURE=1 ./bootstrap.sh