diff options
author | Clemens Gruber <clemens.gruber@pqgruber.com> | 2021-09-02 22:32:10 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-09-03 17:37:53 +0200 |
commit | 8f5ef51d50e99c71b86ee43cad25d5f26ad92c04 (patch) | |
tree | 9a2c03d0c4c3097bbae86254a52b2a4dbf7cbfdc | |
parent | 95d9fa18f2ff89acb3f47f171fbf09c7ca3365bd (diff) | |
download | ptxdist-8f5ef51d50e99c71b86ee43cad25d5f26ad92c04.tar.gz ptxdist-8f5ef51d50e99c71b86ee43cad25d5f26ad92c04.tar.xz |
alsa-lib: add patch to fix builds without ucm
Adds an upstream patch which fixes builds without the ALSA Use Case
Manager.
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
Message-Id: <20210902203210.43812-1-clemens.gruber@pqgruber.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/alsa-lib-1.2.5.1/0002-fix-build-with-disable-ucm.patch | 37 | ||||
-rw-r--r-- | patches/alsa-lib-1.2.5.1/series | 3 |
2 files changed, 39 insertions, 1 deletions
diff --git a/patches/alsa-lib-1.2.5.1/0002-fix-build-with-disable-ucm.patch b/patches/alsa-lib-1.2.5.1/0002-fix-build-with-disable-ucm.patch new file mode 100644 index 000000000..886374795 --- /dev/null +++ b/patches/alsa-lib-1.2.5.1/0002-fix-build-with-disable-ucm.patch @@ -0,0 +1,37 @@ +From: Jaroslav Kysela <perex@perex.cz> +Date: Mon, 28 Jun 2021 12:08:53 +0200 +Subject: [PATCH] fix build with --disable-ucm + +Link: https://mailman.alsa-project.org/pipermail/alsa-devel/2021-June/186729.html +Reported-by: Michael Forney <mforney@mforney.org> +Signed-off-by: Jaroslav Kysela <perex@perex.cz> +--- + include/local.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/include/local.h b/include/local.h +index 4e7d88a0ecac..7cfcec53dd5d 100644 +--- a/include/local.h ++++ b/include/local.h +@@ -374,6 +374,8 @@ int _snd_config_load_with_include(snd_config_t *config, snd_input_t *in, + void *INTERNAL(snd_dlopen)(const char *name, int mode, char *errbuf, size_t errbuflen); + #endif + ++#ifdef BUILD_UCM ++ + const char *uc_mgr_alibcfg_by_device(snd_config_t **config, const char *name); + + static inline int _snd_is_ucm_device(const char *name) +@@ -381,4 +383,12 @@ static inline int _snd_is_ucm_device(const char *name) + return name && name[0] == '_' && name[1] == 'u' && name[2] == 'c' && name[3] == 'm'; + } + ++#else ++ ++static inline const char *uc_mgr_alibcfg_by_device(snd_config_t **config, const char *name) { return NULL; } ++static inline int _snd_is_ucm_device(const char *name) { return 0; } ++ ++ ++#endif ++ + #endif diff --git a/patches/alsa-lib-1.2.5.1/series b/patches/alsa-lib-1.2.5.1/series index f96f3345c..1ede62264 100644 --- a/patches/alsa-lib-1.2.5.1/series +++ b/patches/alsa-lib-1.2.5.1/series @@ -1,4 +1,5 @@ # generated by git-ptx-patches #tag:base --start-number 1 0001-add-largefile-support.patch -# 28c8f5e33d509bdb14724d1cc3204a4d - git-ptx-patches magic +0002-fix-build-with-disable-ucm.patch +# e32eb79bf9ae6a22f1a3a5336617e2d3 - git-ptx-patches magic |