Mostly bugfixes. Remove disable-ucm fix and move patches. Signed-off-by: Christian Melki <[email protected]> --- .../0002-fix-build-with-disable-ucm.patch | 37 ------------------- .../0001-add-largefile-support.patch | 0 .../autogen.sh | 0 .../series | 1 - rules/alsa-lib.make | 4 +- 5 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 patches/alsa-lib-1.2.5.1/0002-fix-build-with-disable-ucm.patch rename patches/{alsa-lib-1.2.5.1 => alsa-lib-1.2.6.1}/0001-add-largefile-support.patch (100%) rename patches/{alsa-lib-1.2.5.1 => alsa-lib-1.2.6.1}/autogen.sh (100%) rename patches/{alsa-lib-1.2.5.1 => alsa-lib-1.2.6.1}/series (79%)
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 deleted file mode 100644 index 886374795..000000000 --- a/patches/alsa-lib-1.2.5.1/0002-fix-build-with-disable-ucm.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Jaroslav Kysela <[email protected]> -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 <[email protected]> -Signed-off-by: Jaroslav Kysela <[email protected]> ---- - 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/0001-add-largefile-support.patch b/patches/alsa-lib-1.2.6.1/0001-add-largefile-support.patch similarity index 100% rename from patches/alsa-lib-1.2.5.1/0001-add-largefile-support.patch rename to patches/alsa-lib-1.2.6.1/0001-add-largefile-support.patch diff --git a/patches/alsa-lib-1.2.5.1/autogen.sh b/patches/alsa-lib-1.2.6.1/autogen.sh similarity index 100% rename from patches/alsa-lib-1.2.5.1/autogen.sh rename to patches/alsa-lib-1.2.6.1/autogen.sh diff --git a/patches/alsa-lib-1.2.5.1/series b/patches/alsa-lib-1.2.6.1/series similarity index 79% rename from patches/alsa-lib-1.2.5.1/series rename to patches/alsa-lib-1.2.6.1/series index 1ede62264..cab3f9ae2 100644 --- a/patches/alsa-lib-1.2.5.1/series +++ b/patches/alsa-lib-1.2.6.1/series @@ -1,5 +1,4 @@ # generated by git-ptx-patches #tag:base --start-number 1 0001-add-largefile-support.patch -0002-fix-build-with-disable-ucm.patch # e32eb79bf9ae6a22f1a3a5336617e2d3 - git-ptx-patches magic diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make index 7fb6a1287..c503315c7 100644 --- a/rules/alsa-lib.make +++ b/rules/alsa-lib.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_ALSA_LIB) += alsa-lib # # Paths and names # -ALSA_LIB_VERSION := 1.2.5.1 -ALSA_LIB_MD5 := c8335793e7828803311edc48fb71662e +ALSA_LIB_VERSION := 1.2.6.1 +ALSA_LIB_MD5 := 039aae4a55e4a33f4c39b274fcc1dc5e ALSA_LIB := alsa-lib-$(ALSA_LIB_VERSION) ALSA_LIB_SUFFIX := tar.bz2 ALSA_LIB_URL := \ -- 2.30.2 _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
