aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwangmy <wangmy@fujitsu.com>2021-06-17 07:54:00 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-17 22:18:41 +0100
commit4255c19584af17b96d452d4cf934e32039894cab (patch)
tree937c37c515b679870b629039bbaa5f169d4b8390
parent293c6819a4c3ee397ff87ee73d42b5c85f2daf6c (diff)
downloadopenembedded-core-contrib-4255c19584af17b96d452d4cf934e32039894cab.tar.gz
openembedded-core-contrib-4255c19584af17b96d452d4cf934e32039894cab.tar.bz2
openembedded-core-contrib-4255c19584af17b96d452d4cf934e32039894cab.zip
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 <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--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
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils.inc5
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils_1.2.5.1.bb (renamed from meta/recipes-multimedia/alsa/alsa-utils_1.2.5.bb)0
-rw-r--r--meta/recipes-multimedia/alsa/files/0001-utils.c-Include-limits.h-explicitly-to-fix-build-on-.patch37
4 files changed, 2 insertions, 40 deletions
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
index 048fef68a5..048fef68a5 100644
--- 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
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
index 3430288da4..3430288da4 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.5.bb
+++ b/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?= <schnitzeltony@gmail.com>
-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 <schnitzeltony@gmail.com>
----
- 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
-