|
 |
6142c0 |
From 93297a5a87014155540d19e4f619b57d86bcdf6d Mon Sep 17 00:00:00 2001
|
|
|
6142c0 |
From: Takashi Iwai <tiwai@suse.de>
|
|
|
6142c0 |
Date: Sun, 21 Apr 2019 11:59:30 +0200
|
|
|
6142c0 |
Subject: [PATCH 3/3] alsa: Fix inclusion of use-case.h
|
|
|
6142c0 |
|
|
|
6142c0 |
The recent change in ALSA upstream stripped -I$include/alsa path from
|
|
|
6142c0 |
pkgconfig. We already fixed for this change in some places but still
|
|
|
6142c0 |
the code for UCM was overlooked, and this resulted in the unresolved
|
|
|
6142c0 |
symbols in alsa card module. Fix them as well.
|
|
|
6142c0 |
|
|
|
6142c0 |
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
|
6142c0 |
---
|
|
|
6142c0 |
configure.ac | 2 +-
|
|
|
6142c0 |
src/modules/alsa/alsa-ucm.h | 2 +-
|
|
|
6142c0 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
6142c0 |
|
|
|
6142c0 |
diff --git a/configure.ac b/configure.ac
|
|
|
6142c0 |
index 3a71fd8c2..b09c138b4 100644
|
|
|
6142c0 |
--- a/configure.ac
|
|
|
6142c0 |
+++ b/configure.ac
|
|
|
6142c0 |
@@ -830,7 +830,7 @@ AS_IF([test "x$enable_alsa" = "xyes" && test "x$HAVE_ALSA" = "x0"],
|
|
|
6142c0 |
AS_IF([test "x$HAVE_ALSA" = "x1"],
|
|
|
6142c0 |
[
|
|
|
6142c0 |
save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $ASOUNDLIB_CFLAGS"
|
|
|
6142c0 |
- AC_CHECK_HEADERS([use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
|
|
|
6142c0 |
+ AC_CHECK_HEADERS([alsa/use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
|
|
|
6142c0 |
CPPFLAGS="$save_CPPFLAGS"
|
|
|
6142c0 |
],
|
|
|
6142c0 |
HAVE_ALSA_UCM=0)
|
|
|
6142c0 |
diff --git a/src/modules/alsa/alsa-ucm.h b/src/modules/alsa/alsa-ucm.h
|
|
|
6142c0 |
index 53abf3f90..c926f3cc3 100644
|
|
|
6142c0 |
--- a/src/modules/alsa/alsa-ucm.h
|
|
|
6142c0 |
+++ b/src/modules/alsa/alsa-ucm.h
|
|
|
6142c0 |
@@ -23,7 +23,7 @@
|
|
|
6142c0 |
***/
|
|
|
6142c0 |
|
|
|
6142c0 |
#ifdef HAVE_ALSA_UCM
|
|
|
6142c0 |
-#include <use-case.h>
|
|
|
6142c0 |
+#include <alsa/use-case.h>
|
|
|
6142c0 |
#else
|
|
|
6142c0 |
typedef void snd_use_case_mgr_t;
|
|
|
6142c0 |
#endif
|
|
|
6142c0 |
--
|
|
|
6142c0 |
2.21.0
|
|
|
6142c0 |
|