summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
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:20:44 +0100
commit6ead5bc9132d7a06f2fc480b2e46c933fb0f8983 (patch)
treef2366267d1d5ea7401f3c0aab053dd7ff052efe0 /meta/recipes-multimedia
parent1239d73e8967e2659c4d6065fb45bf019ae01d8c (diff)
downloadpoky-6ead5bc9132d7a06f2fc480b2e46c933fb0f8983.tar.gz
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 (From OE-Core rev: 4255c19584af17b96d452d4cf934e32039894cab) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-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
23PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" 23PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
24 24
25# alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe 25# alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe
26SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2 \ 26SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2"
27 file://0001-utils.c-Include-limits.h-explicitly-to-fix-build-on-.patch" 27SRC_URI[sha256sum] = "9c169ae37a49295f9b97b92ace772803daf6b6510a19574e0b78f87e562118d0"
28SRC_URI[sha256sum] = "09970af05838b30001ca93ba27cb85b24c45056c70a80066c3ece6abe5a19997"
29 28
30# On build machines with python-docutils (not python3-docutils !!) installed 29# On build machines with python-docutils (not python3-docutils !!) installed
31# rst2man (not rst2man.py) is detected and compile fails with 30# 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 @@
1From b20cb6ef5e3f331181b93e39293602ad2c774af8 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Thu, 3 Jun 2021 16:07:10 +0200
4Subject: [PATCH] utils.c: Include limits.h explicitly to fix build on musl
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Fixes:
10| ../../alsa-utils-1.2.5/alsactl/utils.c: In function 'snd_card_clean_cfgdir':
11| ../../alsa-utils-1.2.5/alsactl/utils.c:309:19: error: 'PATH_MAX' undeclared (first use in this function)
12| 309 | char path[PATH_MAX];
13| | ^~~~~~~~
14| ../../alsa-utils-1.2.5/alsactl/utils.c:309:19: note: each undeclared identifier is reported only once for each function it appears in
15
16Upstream-Status: Submitted [https://github.com/alsa-project/alsa-utils/pull/92]
17
18Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
19---
20 alsactl/utils.c | 1 +
21 1 file changed, 1 insertion(+)
22
23diff --git a/alsactl/utils.c b/alsactl/utils.c
24index 881b505..1a4896b 100644
25--- a/alsactl/utils.c
26+++ b/alsactl/utils.c
27@@ -30,6 +30,7 @@
28 #include <syslog.h>
29 #include <sys/stat.h>
30 #include <sys/mman.h>
31+#include <limits.h>
32 #include "alsactl.h"
33
34 int file_map(const char *filename, char **buf, size_t *bufsize)
35--
362.31.1
37