Accepting request 696463 from multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/696463
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pulseaudio?expand=0&rev=159
This commit is contained in:
Yuchen Lin 2019-04-23 12:33:46 +00:00 committed by Git OBS Bridge
commit 53a7da2295
2 changed files with 42 additions and 0 deletions

View File

@ -1,3 +1,16 @@
---
configure.ac | 2 +-
src/modules/alsa/alsa-mixer.c | 2 +-
src/modules/alsa/alsa-mixer.h | 2 +-
src/modules/alsa/alsa-sink.c | 2 +-
src/modules/alsa/alsa-source.c | 2 +-
src/modules/alsa/alsa-ucm.c | 2 +-
src/modules/alsa/alsa-ucm.h | 2 +-
src/modules/alsa/alsa-util.c | 2 +-
src/modules/alsa/alsa-util.h | 2 +-
src/modules/alsa/module-alsa-source.c | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -23,7 +23,7 @@
@ -86,3 +99,25 @@
#ifdef HAVE_VALGRIND_MEMCHECK_H
#include <valgrind/memcheck.h>
--- a/configure.ac
+++ b/configure.ac
@@ -833,7 +833,7 @@ AS_IF([test "x$enable_alsa" = "xyes" &&
AS_IF([test "x$HAVE_ALSA" = "x1"],
[
save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $ASOUNDLIB_CFLAGS"
- AC_CHECK_HEADERS([use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
+ AC_CHECK_HEADERS([alsa/use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
CPPFLAGS="$save_CPPFLAGS"
],
HAVE_ALSA_UCM=0)
--- a/src/modules/alsa/alsa-ucm.h
+++ b/src/modules/alsa/alsa-ucm.h
@@ -23,7 +23,7 @@
***/
#ifdef HAVE_ALSA_UCM
-#include <use-case.h>
+#include <alsa/use-case.h>
#else
typedef void snd_use_case_mgr_t;
#endif

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Apr 21 11:27:32 CEST 2019 - tiwai@suse.de
- Fix the UCM module build due to the removal of alsa/* include
path (bsc#1132880):
updated pulseaudio-alsa.patch
-------------------------------------------------------------------
Wed Mar 27 00:55:14 UTC 2019 - Jan Engelhardt <jengelh@inai.de>