Takashi Iwai
c39fd2e018
- Fix the UCM module build due to the removal of alsa/* include path (bsc#1132880): updated pulseaudio-alsa.patch OBS-URL: https://build.opensuse.org/request/show/696462 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=202
124 lines
3.2 KiB
Diff
124 lines
3.2 KiB
Diff
---
|
|
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 @@
|
|
#endif
|
|
|
|
#include <sys/types.h>
|
|
-#include <asoundlib.h>
|
|
+#include <alsa/asoundlib.h>
|
|
#include <math.h>
|
|
|
|
#ifdef HAVE_VALGRIND_MEMCHECK_H
|
|
--- a/src/modules/alsa/alsa-mixer.h
|
|
+++ b/src/modules/alsa/alsa-mixer.h
|
|
@@ -21,7 +21,7 @@
|
|
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
|
|
***/
|
|
|
|
-#include <asoundlib.h>
|
|
+#include <alsa/asoundlib.h>
|
|
|
|
#include <pulse/sample.h>
|
|
#include <pulse/mainloop-api.h>
|
|
--- a/src/modules/alsa/alsa-sink.c
|
|
+++ b/src/modules/alsa/alsa-sink.c
|
|
@@ -25,7 +25,7 @@
|
|
#include <signal.h>
|
|
#include <stdio.h>
|
|
|
|
-#include <asoundlib.h>
|
|
+#include <alsa/asoundlib.h>
|
|
|
|
#ifdef HAVE_VALGRIND_MEMCHECK_H
|
|
#include <valgrind/memcheck.h>
|
|
--- a/src/modules/alsa/alsa-source.c
|
|
+++ b/src/modules/alsa/alsa-source.c
|
|
@@ -25,7 +25,7 @@
|
|
#include <signal.h>
|
|
#include <stdio.h>
|
|
|
|
-#include <asoundlib.h>
|
|
+#include <alsa/asoundlib.h>
|
|
|
|
#include <pulse/rtclock.h>
|
|
#include <pulse/timeval.h>
|
|
--- a/src/modules/alsa/alsa-ucm.c
|
|
+++ b/src/modules/alsa/alsa-ucm.c
|
|
@@ -27,7 +27,7 @@
|
|
#include <ctype.h>
|
|
#include <sys/types.h>
|
|
#include <limits.h>
|
|
-#include <asoundlib.h>
|
|
+#include <alsa/asoundlib.h>
|
|
|
|
#ifdef HAVE_VALGRIND_MEMCHECK_H
|
|
#include <valgrind/memcheck.h>
|
|
--- a/src/modules/alsa/alsa-util.c
|
|
+++ b/src/modules/alsa/alsa-util.c
|
|
@@ -23,7 +23,7 @@
|
|
#endif
|
|
|
|
#include <sys/types.h>
|
|
-#include <asoundlib.h>
|
|
+#include <alsa/asoundlib.h>
|
|
|
|
#include <pulse/sample.h>
|
|
#include <pulse/xmalloc.h>
|
|
--- a/src/modules/alsa/alsa-util.h
|
|
+++ b/src/modules/alsa/alsa-util.h
|
|
@@ -21,7 +21,7 @@
|
|
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
|
|
***/
|
|
|
|
-#include <asoundlib.h>
|
|
+#include <alsa/asoundlib.h>
|
|
|
|
#include <pulse/sample.h>
|
|
#include <pulse/channelmap.h>
|
|
--- a/src/modules/alsa/module-alsa-source.c
|
|
+++ b/src/modules/alsa/module-alsa-source.c
|
|
@@ -24,7 +24,7 @@
|
|
|
|
#include <stdio.h>
|
|
|
|
-#include <asoundlib.h>
|
|
+#include <alsa/asoundlib.h>
|
|
|
|
#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
|