mirror of
git://slackware.nl/current.git
synced 2025-01-15 15:41:54 +01:00
86aaf4d6fc
a/btrfs-progs-5.1-x86_64-1.txz: Upgraded. a/dbus-1.12.14-x86_64-1.txz: Upgraded. a/eudev-3.2.8-x86_64-1.txz: Upgraded. d/bison-3.4-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_46-x86_64-1.txz: Upgraded. l/pulseaudio-12.2-x86_64-2.txz: Rebuilt. Patched to build against alsa-lib-1.1.9. Thanks to nobodino. n/ethtool-5.1-x86_64-1.txz: Upgraded. xfce/tumbler-0.2.4-x86_64-1.txz: Upgraded.
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
alsa: Fix inclusion of use-case.h
|
|
The recent change in ALSA upstream stripped -I$include/alsa path from
|
|
pkgconfig. We already fixed for this change in some places but still
|
|
the code for UCM was overlooked, and this resulted in the unresolved
|
|
symbols in alsa card module. Fix them as well.
|
|
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
Diffstat
|
|
-rw-r--r-- configure.ac 2
|
|
|
|
-rw-r--r-- src/modules/alsa/alsa-ucm.h 2
|
|
|
|
2 files changed, 2 insertions, 2 deletions
|
|
diff --git a/configure.ac b/configure.ac
|
|
index c004bd7..b44ed15 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -826,7 +826,7 @@ AS_IF([test "x$enable_alsa" = "xyes" && test "x$HAVE_ALSA" = "x0"],
|
|
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)
|
|
diff --git a/src/modules/alsa/alsa-ucm.h b/src/modules/alsa/alsa-ucm.h
|
|
index 53abf3f..c926f3c 100644
|
|
--- 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
|