Skip to contentSkip to conversation

alsa-lib: upgrade 1.2.5 -> 1.2.5.1

PATCH New wangmy 1 participant 4 messages Jun 16, 2021

lore
Share & tools
lore

wangmy

author
#0 lore raw

PATCH 1/1 alsa-lib: upgrade 1.2.5 -> 1.2.5.1

0001-ucm_exec.c-Include-limits.h-explicitly-to-fix-build-.patch removed since it is included in 1.2.5.1

---
 ...de-limits.h-explicitly-to-fix-build-.patch | 41 -------------------
 ...{alsa-lib_1.2.5.bb => alsa-lib_1.2.5.1.bb} |  5 +--
 2 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 meta/recipes-multimedia/alsa/alsa-lib/0001-ucm_exec.c-Include-limits.h-explicitly-to-fix-build-.patch
 rename meta/recipes-multimedia/alsa/{alsa-lib_1.2.5.bb => alsa-lib_1.2.5.1.bb} (88%)
meta/recipes-multimedia/alsa/alsa-lib/0001-ucm_exec.c-Include-limits.h-explicitly-to-fix-build-.patch deleted +0 -41
deleted file mode 100644
index 8752ef0dc0..0000000000
@@ -1,41 +0,0 @@
-From 26ab44c99e9f370e3da0c18982fa482e2e55f0a8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
-Date: Thu, 3 Jun 2021 12:29:03 +0200
-Subject: [PATCH] ucm_exec.c: Include limits.h explicitly to fix build on musl
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes:
-| ../../../alsa-lib-1.2.5/src/ucm/ucm_exec.c: In function 'find_exec':
-| ../../../alsa-lib-1.2.5/src/ucm/ucm_exec.c:43:18: error: 'PATH_MAX' undeclared (first use in this function)
-|    43 |         char bin[PATH_MAX];
-|       |                  ^~~~~~~~
-| ../../../alsa-lib-1.2.5/src/ucm/ucm_exec.c:43:18: note: each undeclared identifier is reported only once for each function it appears in
-| ../../../alsa-lib-1.2.5/src/ucm/ucm_exec.c: In function 'uc_mgr_exec':
-| ../../../alsa-lib-1.2.5/src/ucm/ucm_exec.c:177:18: error: 'PATH_MAX' undeclared (first use in this function)
-|   177 |         char bin[PATH_MAX];
-|       |                  ^~~~~~~~
-
-Upstream-Status: Submitted [https://github.com/alsa-project/alsa-lib/pull/145]
-
-Signed-off-by: Andreas Müller <[email protected]>
----
- src/ucm/ucm_exec.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/ucm/ucm_exec.c b/src/ucm/ucm_exec.c
-index d83206d0..4ddf5d15 100644
---- a/src/ucm/ucm_exec.c
-+++ b/src/ucm/ucm_exec.c
-@@ -30,6 +30,7 @@
- #include "ucm_local.h"
- #include <sys/stat.h>
- #include <sys/wait.h>
-+#include <limits.h>
- #include <dirent.h>
-
- static pthread_mutex_t fork_lock = PTHREAD_MUTEX_INITIALIZER;
---
-2.31.1
-
meta/recipes-multimedia/alsa/alsa-lib_1.2.5.1.bb renamed from meta/recipes-multimedia/alsa/alsa-lib_1.2.5.bb +2 -3
similarity index 88%
rename from meta/recipes-multimedia/alsa/alsa-lib_1.2.5.bb
rename to meta/recipes-multimedia/alsa/alsa-lib_1.2.5.1.bb
index 1d6a9655f6..151d63c0e8 100644
@@ -9,9 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \
                     file://src/socket.c;md5=285675b45e83f571c6a957fe4ab79c93;beginline=9;endline=24 \
                     "
 
-SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2 \
-           file://0001-ucm_exec.c-Include-limits.h-explicitly-to-fix-build-.patch"
-SRC_URI[sha256sum] = "9092894a8c083b33acf8d6deb901b58f5d20d6da583789f814e8e46f2850ef18"
+SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2"
+SRC_URI[sha256sum] = "628421d950cecaf234de3f899d520c0a6923313c964ad751ffac081df331438e"
 
 inherit autotools pkgconfig
 

--
2.25.1

author
#1 lore raw

PATCH 1/1 alsa-topology-conf: upgrade 1.2.5 -> 1.2.5.1

---
 ...sa-topology-conf_1.2.5.bb => alsa-topology-conf_1.2.5.1.bb} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta/recipes-multimedia/alsa/{alsa-topology-conf_1.2.5.bb => alsa-topology-conf_1.2.5.1.bb} (84%)
meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.5.1.bb renamed from meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.5.bb +1 -2
similarity index 84%
rename from meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.5.bb
rename to meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.5.1.bb
index a6b2d7a608..c96826c4bd 100644
@@ -8,9 +8,8 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=20d74d74db9741697903372ad001d3b4"
 
 SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "8bfa8306ca63e1d0cbe80be984660273b91bd5b7dd0800a6c5aa71dd8c8d775c"
+SRC_URI[sha256sum] = "f7c5bae1545abcd73824bc97f4e72c340e11abea188ba0f1c06f5e0ad776b179"
 # Something went wrong at upstream tarballing
-S = "${WORKDIR}/${BPN}-1.2.4.2.g15998"
 
 inherit allarch
 
Signature · 1 line
2.25.1
author
#2 lore raw

PATCH 1/1 alsa-ucm-conf: upgrade 1.2.5 -> 1.2.5.1

In reply to wangmy
---
 .../alsa/{alsa-ucm-conf_1.2.5.bb => alsa-ucm-conf_1.2.5.1.bb}  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta/recipes-multimedia/alsa/{alsa-ucm-conf_1.2.5.bb => alsa-ucm-conf_1.2.5.1.bb} (85%)
meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.5.1.bb renamed from meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.5.bb +1 -2
similarity index 85%
rename from meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.5.bb
rename to meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.5.1.bb
index 5de7185895..4d5f3742f0 100644
@@ -8,9 +8,8 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=20d74d74db9741697903372ad001d3b4"
 
 SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "093ae3d85a5e6fd2cd1cc27feda400d7191382fb8b5e5e23497286c87c1507a5"
+SRC_URI[sha256sum] = "5841a444166dcbf479db751303dbc3556f685085ac7e00f0c9e7755676195d97"
 # Something went wrong at upstream tarballing
-S = "${WORKDIR}/${BPN}-1.2.4.81.g4884e"
 
 inherit allarch
 
Signature · 1 line
2.25.1
author
#3 lore raw

PATCH 1/1 alsa-utils: upgrade 1.2.5 -> 1.2.5.1

In reply to wangmy

0001-utils.c-Include-limits.h-explicitly-to-fix-build-on-.patch removed since it is included in 1.2.5.1

---
 ...1.2.5.bb => alsa-utils-scripts_1.2.5.1.bb} |  0
 meta/recipes-multimedia/alsa/alsa-utils.inc   |  5 +--
 ...a-utils_1.2.5.bb => alsa-utils_1.2.5.1.bb} |  0
 ...limits.h-explicitly-to-fix-build-on-.patch | 37 -------------------
 4 files changed, 2 insertions(+), 40 deletions(-)
 rename meta/recipes-multimedia/alsa/{alsa-utils-scripts_1.2.5.bb => alsa-utils-scripts_1.2.5.1.bb} (100%)
 rename meta/recipes-multimedia/alsa/{alsa-utils_1.2.5.bb => alsa-utils_1.2.5.1.bb} (100%)
 delete mode 100644 meta/recipes-multimedia/alsa/files/0001-utils.c-Include-limits.h-explicitly-to-fix-build-on-.patch
meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.5.1.bb renamed from meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.5.bb +0 -0
similarity index 100%
rename from meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.5.bb
rename to meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.5.1.bb
meta/recipes-multimedia/alsa/alsa-utils.inc +2 -3
index a017b02faf..733bb2456c 100644
@@ -23,9 +23,8 @@ PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev
 PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
 
 # alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe
-SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2 \
-           file://0001-utils.c-Include-limits.h-explicitly-to-fix-build-on-.patch"
-SRC_URI[sha256sum] = "09970af05838b30001ca93ba27cb85b24c45056c70a80066c3ece6abe5a19997"
+SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2"
+SRC_URI[sha256sum] = "9c169ae37a49295f9b97b92ace772803daf6b6510a19574e0b78f87e562118d0"
 
 # On build machines with python-docutils (not python3-docutils !!) installed
 # rst2man (not rst2man.py) is detected and compile fails with
meta/recipes-multimedia/alsa/alsa-utils_1.2.5.1.bb renamed from meta/recipes-multimedia/alsa/alsa-utils_1.2.5.bb +0 -0
similarity index 100%
rename from meta/recipes-multimedia/alsa/alsa-utils_1.2.5.bb
rename to meta/recipes-multimedia/alsa/alsa-utils_1.2.5.1.bb
meta/recipes-multimedia/alsa/files/0001-utils.c-Include-limits.h-explicitly-to-fix-build-on-.patch deleted +0 -37
deleted file mode 100644
index 445f3ecade..0000000000
@@ -1,37 +0,0 @@
-From b20cb6ef5e3f331181b93e39293602ad2c774af8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
-Date: Thu, 3 Jun 2021 16:07:10 +0200
-Subject: [PATCH] utils.c: Include limits.h explicitly to fix build on musl
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes:
-| ../../alsa-utils-1.2.5/alsactl/utils.c: In function 'snd_card_clean_cfgdir':
-| ../../alsa-utils-1.2.5/alsactl/utils.c:309:19: error: 'PATH_MAX' undeclared (first use in this function)
-|   309 |         char path[PATH_MAX];
-|       |                   ^~~~~~~~
-| ../../alsa-utils-1.2.5/alsactl/utils.c:309:19: note: each undeclared identifier is reported only once for each function it appears in
-
-Upstream-Status: Submitted [https://github.com/alsa-project/alsa-utils/pull/92]
-
-Signed-off-by: Andreas Müller <[email protected]>
----
- alsactl/utils.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/alsactl/utils.c b/alsactl/utils.c
-index 881b505..1a4896b 100644
---- a/alsactl/utils.c
-+++ b/alsactl/utils.c
-@@ -30,6 +30,7 @@
- #include <syslog.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
-+#include <limits.h>
- #include "alsactl.h"
-
- int file_map(const char *filename, char **buf, size_t *bufsize)
---
-2.31.1
-

--
2.25.1