From 4255c19584af17b96d452d4cf934e32039894cab Mon Sep 17 00:00:00 2001 From: wangmy Date: Thu, 17 Jun 2021 07:54:00 +0800 Subject: 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 --- .../alsa/alsa-utils-scripts_1.2.5.1.bb | 25 +++++++++++++++ .../alsa/alsa-utils-scripts_1.2.5.bb | 25 --------------- meta/recipes-multimedia/alsa/alsa-utils.inc | 5 ++- meta/recipes-multimedia/alsa/alsa-utils_1.2.5.1.bb | 2 ++ meta/recipes-multimedia/alsa/alsa-utils_1.2.5.bb | 2 -- ...lude-limits.h-explicitly-to-fix-build-on-.patch | 37 ---------------------- 6 files changed, 29 insertions(+), 67 deletions(-) create mode 100644 meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.5.1.bb delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.5.bb create mode 100644 meta/recipes-multimedia/alsa/alsa-utils_1.2.5.1.bb delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils_1.2.5.bb 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.1.bb b/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.5.1.bb new file mode 100644 index 0000000000..048fef68a5 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.5.1.bb @@ -0,0 +1,25 @@ +require alsa-utils.inc + +SUMMARY = "Shell scripts that show help info and create ALSA configuration files" +PROVIDES = "alsa-utils-alsaconf" + +FILESEXTRAPATHS_prepend := "${THISDIR}/alsa-utils:" + +PACKAGES = "${PN}" +RDEPENDS_${PN} += "bash" + +FILES_${PN} = "${sbindir}/alsaconf \ + ${sbindir}/alsa-info.sh \ + ${sbindir}/alsabat-test.sh \ + " + +S = "${WORKDIR}/alsa-utils-${PV}" + +do_install() { + install -d ${D}${sbindir} + install -m 0755 ${B}/alsaconf/alsaconf ${D}${sbindir}/ + install -m 0755 ${S}/alsa-info/alsa-info.sh ${D}${sbindir}/ + if ${@bb.utils.contains('PACKAGECONFIG', 'bat', 'true', 'false', d)}; then + install -m 0755 ${S}/bat/alsabat-test.sh ${D}${sbindir}/ + fi +} 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.bb deleted file mode 100644 index 048fef68a5..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.5.bb +++ /dev/null @@ -1,25 +0,0 @@ -require alsa-utils.inc - -SUMMARY = "Shell scripts that show help info and create ALSA configuration files" -PROVIDES = "alsa-utils-alsaconf" - -FILESEXTRAPATHS_prepend := "${THISDIR}/alsa-utils:" - -PACKAGES = "${PN}" -RDEPENDS_${PN} += "bash" - -FILES_${PN} = "${sbindir}/alsaconf \ - ${sbindir}/alsa-info.sh \ - ${sbindir}/alsabat-test.sh \ - " - -S = "${WORKDIR}/alsa-utils-${PV}" - -do_install() { - install -d ${D}${sbindir} - install -m 0755 ${B}/alsaconf/alsaconf ${D}${sbindir}/ - install -m 0755 ${S}/alsa-info/alsa-info.sh ${D}${sbindir}/ - if ${@bb.utils.contains('PACKAGECONFIG', 'bat', 'true', 'false', d)}; then - install -m 0755 ${S}/bat/alsabat-test.sh ${D}${sbindir}/ - fi -} 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.1.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.5.1.bb new file mode 100644 index 0000000000..3430288da4 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.5.1.bb @@ -0,0 +1,2 @@ +require alsa-utils.inc + diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.5.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.5.bb deleted file mode 100644 index 3430288da4..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.5.bb +++ /dev/null @@ -1,2 +0,0 @@ -require alsa-utils.inc - 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 - -- cgit 1.2.3-korg