summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio/0001-alsa-Fix-inclusion-of-use-case.h.patch46
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio_12.2.bb1
2 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-alsa-Fix-inclusion-of-use-case.h.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-alsa-Fix-inclusion-of-use-case.h.patch
new file mode 100644
index 0000000000..15026a2f83
--- /dev/null
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-alsa-Fix-inclusion-of-use-case.h.patch
@@ -0,0 +1,46 @@
1From b89d33bb182c42db5ad3987b0e91b7bf62f421e8 Mon Sep 17 00:00:00 2001
2From: Takashi Iwai <tiwai@suse.de>
3Date: Sun, 21 Apr 2019 11:59:30 +0200
4Subject: [PATCH] alsa: Fix inclusion of use-case.h
5
6The recent change in ALSA upstream stripped -I$include/alsa path from
7pkgconfig. We already fixed for this change in some places but still
8the code for UCM was overlooked, and this resulted in the unresolved
9symbols in alsa card module. Fix them as well.
10
11Signed-off-by: Takashi Iwai <tiwai@suse.de>
12Upstream-Status: Backport
13---
14 configure.ac | 2 +-
15 src/modules/alsa/alsa-ucm.h | 2 +-
16 2 files changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/configure.ac b/configure.ac
19index c004bd70d..b44ed1595 100644
20--- a/configure.ac
21+++ b/configure.ac
22@@ -826,7 +826,7 @@ AS_IF([test "x$enable_alsa" = "xyes" && test "x$HAVE_ALSA" = "x0"],
23 AS_IF([test "x$HAVE_ALSA" = "x1"],
24 [
25 save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $ASOUNDLIB_CFLAGS"
26- AC_CHECK_HEADERS([use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
27+ AC_CHECK_HEADERS([alsa/use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
28 CPPFLAGS="$save_CPPFLAGS"
29 ],
30 HAVE_ALSA_UCM=0)
31diff --git a/src/modules/alsa/alsa-ucm.h b/src/modules/alsa/alsa-ucm.h
32index 53abf3f90..c926f3cc3 100644
33--- a/src/modules/alsa/alsa-ucm.h
34+++ b/src/modules/alsa/alsa-ucm.h
35@@ -23,7 +23,7 @@
36 ***/
37
38 #ifdef HAVE_ALSA_UCM
39-#include <use-case.h>
40+#include <alsa/use-case.h>
41 #else
42 typedef void snd_use_case_mgr_t;
43 #endif
44--
452.21.0
46
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_12.2.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_12.2.bb
index c020fbd4f6..88b4975a66 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_12.2.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_12.2.bb
@@ -3,6 +3,7 @@ require pulseaudio.inc
3SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ 3SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \
4 file://0001-client-conf-Add-allow-autospawn-for-root.patch \ 4 file://0001-client-conf-Add-allow-autospawn-for-root.patch \
5 file://0001-introduce-a-special-build-flag-to-explicitly-disable.patch \ 5 file://0001-introduce-a-special-build-flag-to-explicitly-disable.patch \
6 file://0001-alsa-Fix-inclusion-of-use-case.h.patch \
6 file://0002-do-not-display-CLFAGS-to-improve-reproducibility-bui.patch \ 7 file://0002-do-not-display-CLFAGS-to-improve-reproducibility-bui.patch \
7 file://volatiles.04_pulse \ 8 file://volatiles.04_pulse \
8 " 9 "