From 4255c19584af17b96d452d4cf934e32039894cab Mon Sep 17 00:00:00 2001 From: wangmy Date: Thu, 17 Jun 2021 07:54:00 +0800 Subject: [PATCH] alsa-utils: upgrade 1.2.5 -> 1.2.5.1 0001-utils.c-Include-limits.h-explicitly-to-fix-build-on-.patch removed since it is included in 1.2.5.1 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- ...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 diff --git a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.5.bb b/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.5.1.bb 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 diff --git a/meta/recipes-multimedia/alsa/alsa-utils.inc b/meta/recipes-multimedia/alsa/alsa-utils.inc index a017b02faf..733bb2456c 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils.inc +++ b/meta/recipes-multimedia/alsa/alsa-utils.inc @@ -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 diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.5.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.5.1.bb 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 diff --git a/meta/recipes-multimedia/alsa/files/0001-utils.c-Include-limits.h-explicitly-to-fix-build-on-.patch b/meta/recipes-multimedia/alsa/files/0001-utils.c-Include-limits.h-explicitly-to-fix-build-on-.patch deleted file mode 100644 index 445f3ecade..0000000000 --- a/meta/recipes-multimedia/alsa/files/0001-utils.c-Include-limits.h-explicitly-to-fix-build-on-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b20cb6ef5e3f331181b93e39293602ad2c774af8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -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 ---- - 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 - #include - #include -+#include - #include "alsactl.h" - - int file_map(const char *filename, char **buf, size_t *bufsize) --- -2.31.1 - -- 2.40.1