summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/alsa
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia/alsa')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib/0001-topology-correct-version-script-path.patch38
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch31
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib_1.2.11.bb (renamed from meta/recipes-multimedia/alsa/alsa-lib_1.2.4.bb)37
-rw-r--r--meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam_av.c-Include-missing-string.h.patch25
-rw-r--r--meta/recipes-multimedia/alsa/alsa-plugins_1.2.7.1.bb (renamed from meta/recipes-multimedia/alsa/alsa-plugins_1.2.2.bb)75
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools_1.2.11.bb (renamed from meta/recipes-multimedia/alsa/alsa-tools_1.2.2.bb)8
-rw-r--r--meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.5.1.bb (renamed from meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.4.bb)5
-rw-r--r--meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.11.bb (renamed from meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.4.bb)5
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.4.bb25
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils_1.2.11.bb (renamed from meta/recipes-multimedia/alsa/alsa-utils.inc)105
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils_1.2.4.bb2
11 files changed, 191 insertions, 165 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-correct-version-script-path.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-correct-version-script-path.patch
new file mode 100644
index 0000000000..30aeef5817
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-correct-version-script-path.patch
@@ -0,0 +1,38 @@
1From 2a736a0d2543f206fd2653aaae8a08a4c42eb917 Mon Sep 17 00:00:00 2001
2From: Michael Opdenacker <michael.opdenacker@bootlin.com>
3Date: Tue, 30 Jan 2024 14:24:25 +0100
4Subject: [PATCH] topology: correct version script path
5
6From: Jan Palus <jpalus@fastmail.com>
7
8contrary to libasound, version script for libatopology is a regular
9source file. while it's often the case that $(builddir) and $(srcdir)
10point to the same directory, they don't always have to. therefore path
11needs to point explicitly to $(srcdir) for Versions script in topology
12
13Closes: https://github.com/alsa-project/alsa-lib/pull/383
14Fixes: GH-382
15Fixes: dc7da761f3a2 ("topology: separate Versions linker script")
16Signed-off-by: Jan Palus <jpalus@fastmail.com>
17Signed-off-by: Jaroslav Kysela <perex@perex.cz>
18Upstream-Status: Backport [https://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff;h=2a736a0d2543f206fd2653aaae8a08a4c42eb917]
19---
20 src/topology/Makefile.am | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am
24index 04299588..e0b78373 100644
25--- a/src/topology/Makefile.am
26+++ b/src/topology/Makefile.am
27@@ -2,7 +2,7 @@ EXTRA_DIST = Versions
28 COMPATNUM=@LIBTOOL_VERSION_INFO@
29
30 if VERSIONED_SYMBOLS
31-VSYMS = -Wl,--version-script=Versions
32+VSYMS = -Wl,--version-script=$(srcdir)/Versions
33 else
34 VSYMS =
35 endif
36--
372.34.1
38
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch b/meta/recipes-multimedia/alsa/alsa-lib/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch
deleted file mode 100644
index 98e2988dda..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-lib/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001
2From: Jaroslav Kysela <perex@perex.cz>
3Date: Thu, 22 Oct 2020 20:57:32 +0200
4Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be
5 declared even for \!DL_ORIGIN_AVAILABLE
6
7Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable")
8BugLink: https://github.com/alsa-project/alsa-lib/issues/91
9Signed-off-by: Jaroslav Kysela <perex@perex.cz>
10Upstream-Status: Backport
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 src/dlmisc.c | 2 --
14 1 file changed, 2 deletions(-)
15
16diff --git a/src/dlmisc.c b/src/dlmisc.c
17index c9517c55..f20eb593 100644
18--- a/src/dlmisc.c
19+++ b/src/dlmisc.c
20@@ -42,11 +42,9 @@
21 #ifndef PIC
22 struct snd_dlsym_link *snd_dlsym_start = NULL;
23 #endif
24-#ifdef DL_ORIGIN_AVAILABLE
25 static int snd_plugin_dir_set = 0;
26 static char *snd_plugin_dir = NULL;
27 #endif
28-#endif
29
30 #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD)
31 static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER;
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.2.4.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.2.11.bb
index c49cc2a9b4..c212b17aa3 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.2.4.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.2.11.bb
@@ -4,42 +4,43 @@ provides a level of abstraction over the /dev interfaces provided by the kernel
4HOMEPAGE = "http://www.alsa-project.org" 4HOMEPAGE = "http://www.alsa-project.org"
5BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking" 5BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking"
6SECTION = "libs/multimedia" 6SECTION = "libs/multimedia"
7LICENSE = "LGPLv2.1 & GPLv2+" 7LICENSE = "LGPL-2.1-only & GPL-2.0-or-later"
8LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \ 8LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \
9 file://src/socket.c;md5=285675b45e83f571c6a957fe4ab79c93;beginline=9;endline=24 \ 9 file://src/socket.c;md5=285675b45e83f571c6a957fe4ab79c93;beginline=9;endline=24 \
10 " 10 "
11 11
12SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2 \ 12SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2 \
13 file://ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch" 13 file://0001-topology-correct-version-script-path.patch \
14SRC_URI[sha256sum] = "f7554be1a56cdff468b58fc1c29b95b64864c590038dd309c7a978c7116908f7" 14 "
15SRC_URI[sha256sum] = "9f3f2f69b995f9ad37359072fbc69a3a88bfba081fc83e9be30e14662795bb4d"
15 16
16inherit autotools pkgconfig 17inherit autotools pkgconfig
17 18
18EXTRA_OECONF += " \ 19EXTRA_OECONF += " \
19 ${@bb.utils.contains('TARGET_FPU', 'soft', '--with-softfloat', '', d)} \ 20 ${@bb.utils.contains('TARGET_FPU', 'soft', '--with-softfloat', '', d)} \
20 --disable-python \ 21 --disable-python --disable-old-symbols \
21" 22"
22 23
23PACKAGES =+ "alsa-server alsa-conf libatopology" 24PACKAGES =+ "alsa-server alsa-conf libatopology"
24 25
25FILES_alsa-server = "${bindir}/*" 26FILES:alsa-server = "${bindir}/*"
26FILES_alsa-conf = "${datadir}/alsa/" 27FILES:alsa-conf = "${datadir}/alsa/"
27FILES_libatopology = "${libdir}/libatopology.so.*" 28FILES:libatopology = "${libdir}/libatopology.so.*"
28 29
29RDEPENDS_${PN}_class-target = "alsa-conf alsa-ucm-conf" 30RDEPENDS:${PN}:class-target = "alsa-conf alsa-ucm-conf"
30RDEPENDS_libatopology_class-target = "alsa-topology-conf" 31RDEPENDS:libatopology:class-target = "alsa-topology-conf"
31 32
32# upgrade path 33# upgrade path
33RPROVIDES_${PN} = "libasound" 34RPROVIDES:${PN} = "libasound"
34RREPLACES_${PN} = "libasound" 35RREPLACES:${PN} = "libasound"
35RCONFLICTS_${PN} = "libasound" 36RCONFLICTS:${PN} = "libasound"
36 37
37RPROVIDES_${PN}-dev = "alsa-dev" 38RPROVIDES:${PN}-dev = "alsa-dev"
38RREPLACES_${PN}-dev = "alsa-dev" 39RREPLACES:${PN}-dev = "alsa-dev"
39RCONFLICTS_${PN}-dev = "alsa-dev" 40RCONFLICTS:${PN}-dev = "alsa-dev"
40 41
41RPROVIDES_alsa-conf = "alsa-conf-base" 42RPROVIDES:alsa-conf = "alsa-conf-base"
42RREPLACES_alsa-conf = "alsa-conf-base" 43RREPLACES:alsa-conf = "alsa-conf-base"
43RCONFLICTS_alsa-conf = "alsa-conf-base" 44RCONFLICTS:alsa-conf = "alsa-conf-base"
44 45
45BBCLASSEXTEND = "native nativesdk" 46BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam_av.c-Include-missing-string.h.patch b/meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam_av.c-Include-missing-string.h.patch
new file mode 100644
index 0000000000..ff7745d637
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam_av.c-Include-missing-string.h.patch
@@ -0,0 +1,25 @@
1From b01b176a665ba65979d74922955f51dc4888a713 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 23 Aug 2022 15:21:16 -0700
4Subject: [PATCH] arcam_av.c: Include missing string.h
5
6bzero() function needs this header to be included
7
8Upstream-Status: Submitted [https://github.com/alsa-project/alsa-plugins/pull/47]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 arcam-av/arcam_av.c | 1 +
12 1 file changed, 1 insertion(+)
13
14diff --git a/arcam-av/arcam_av.c b/arcam-av/arcam_av.c
15index 63f9b4e..29fc537 100644
16--- a/arcam-av/arcam_av.c
17+++ b/arcam-av/arcam_av.c
18@@ -27,6 +27,7 @@
19 #include <signal.h>
20 #include <stddef.h>
21 #include <stdio.h>
22+#include <string.h>
23 #include <termios.h>
24 #include <unistd.h>
25
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins_1.2.2.bb b/meta/recipes-multimedia/alsa/alsa-plugins_1.2.7.1.bb
index 1381896f38..9500462d5c 100644
--- a/meta/recipes-multimedia/alsa/alsa-plugins_1.2.2.bb
+++ b/meta/recipes-multimedia/alsa/alsa-plugins_1.2.7.1.bb
@@ -6,25 +6,26 @@ HOMEPAGE = "http://alsa-project.org"
6BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking" 6BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking"
7SECTION = "multimedia" 7SECTION = "multimedia"
8 8
9# The primary license of alsa-plugins is LGPLv2.1. 9# The primary license of alsa-plugins is LGPL-2.1-only.
10# 10#
11# m4/attributes.m4 is licensed under GPLv2+. m4/attributes.m4 is part of the 11# m4/attributes.m4 is licensed under GPL-2.0-or-later. m4/attributes.m4 is part
12# build system, and doesn't affect the licensing of the build result. 12# of the build system, and doesn't affect the licensing of the build result.
13# 13#
14# The samplerate plugin source code is licensed under GPLv2+ to be consistent 14# The samplerate plugin source code is licensed under GPL-2.0-or-later to be
15# with the libsamplerate license. However, if the licensee has a commercial 15# consistent with the libsamplerate license. However, if the licensee has a
16# license for libsamplerate, the samplerate plugin may be used under the terms 16# commercial license for libsamplerate, the samplerate plugin may be used under
17# of LGPLv2.1 like the rest of the plugins. 17# the terms of LGPL-2.1-only like the rest of the plugins.
18LICENSE = "LGPLv2.1 & GPLv2+" 18LICENSE = "LGPL-2.1-only & GPL-2.0-or-later"
19LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \ 19LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \
20 file://COPYING.GPL;md5=59530bdf33659b29e73d4adb9f9f6552 \ 20 file://COPYING.GPL;md5=59530bdf33659b29e73d4adb9f9f6552 \
21 file://m4/attributes.m4;endline=33;md5=bb8c6b2a67ac15156961e242fec33e50 \ 21 file://m4/attributes.m4;endline=33;md5=bb8c6b2a67ac15156961e242fec33e50 \
22 file://rate/rate_samplerate.c;endline=35;md5=fd77bce85f4a338c0e8ab18430b69fae \ 22 file://rate/rate_samplerate.c;endline=35;md5=fd77bce85f4a338c0e8ab18430b69fae \
23 " 23 "
24 24
25SRC_URI = "https://www.alsa-project.org/files/pub/plugins/${BP}.tar.bz2" 25SRC_URI = "https://www.alsa-project.org/files/pub/plugins/${BP}.tar.bz2 \
26SRC_URI[md5sum] = "8455e3c6fbc47f62f070afabc14ba575" 26 file://0001-arcam_av.c-Include-missing-string.h.patch \
27SRC_URI[sha256sum] = "1c0f06450c928d711719686c9dbece2d480184f36fab11b8f0534cb7b41e337d" 27 "
28SRC_URI[sha256sum] = "8c337814954bb7c167456733a6046142a2931f12eccba3ec2a4ae618a3432511"
28 29
29DEPENDS += "alsa-lib" 30DEPENDS += "alsa-lib"
30 31
@@ -35,7 +36,7 @@ PACKAGECONFIG ??= "\
35 speexdsp \ 36 speexdsp \
36 ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ 37 ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \
37" 38"
38PACKAGECONFIG[aaf] = "--enable-aaf,--disable-aaf,avtp" 39PACKAGECONFIG[aaf] = "--enable-aaf,--disable-aaf,libavtp"
39PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" 40PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
40PACKAGECONFIG[libav] = "--enable-libav,--disable-libav,libav" 41PACKAGECONFIG[libav] = "--enable-libav,--disable-libav,libav"
41PACKAGECONFIG[maemo-plugin] = "--enable-maemo-plugin,--disable-maemo-plugin" 42PACKAGECONFIG[maemo-plugin] = "--enable-maemo-plugin,--disable-maemo-plugin"
@@ -50,10 +51,10 @@ PACKAGES_DYNAMIC = "^libasound-module-.*"
50 51
51# The alsa-plugins package doesn't itself contain anything, it just depends on 52# The alsa-plugins package doesn't itself contain anything, it just depends on
52# all built plugins. 53# all built plugins.
53FILES_${PN} = "" 54FILES:${PN} = ""
54ALLOW_EMPTY_${PN} = "1" 55ALLOW_EMPTY:${PN} = "1"
55 56
56do_install_append() { 57do_install:append() {
57 rm -f ${D}${libdir}/alsa-lib/*.la 58 rm -f ${D}${libdir}/alsa-lib/*.la
58 59
59 if [ "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'yes', 'no', d)}" = "yes" ]; then 60 if [ "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'yes', 'no', d)}" = "yes" ]; then
@@ -66,10 +67,10 @@ do_install_append() {
66 fi 67 fi
67} 68}
68 69
69python populate_packages_prepend() { 70python populate_packages:prepend() {
70 plugindir = d.expand('${libdir}/alsa-lib/') 71 plugindir = d.expand('${libdir}/alsa-lib/')
71 packages = " ".join(do_split_packages(d, plugindir, r'^libasound_module_(.*)\.so$', 'libasound-module-%s', 'Alsa plugin for %s', extra_depends='')) 72 packages = " ".join(do_split_packages(d, plugindir, r'^libasound_module_(.*)\.so$', 'libasound-module-%s', 'Alsa plugin for %s', extra_depends=''))
72 d.setVar("RDEPENDS_alsa-plugins", packages) 73 d.setVar("RDEPENDS:alsa-plugins", packages)
73} 74}
74 75
75# Many plugins have a configuration file (plus a symlink in /etc) associated 76# Many plugins have a configuration file (plus a symlink in /etc) associated
@@ -85,51 +86,51 @@ python populate_packages_prepend() {
85# cause big problems, but some kind of improvement to the packaging could 86# cause big problems, but some kind of improvement to the packaging could
86# probably be done here (at least it would be good to handle the different 87# probably be done here (at least it would be good to handle the different
87# plugins in a consistent way). 88# plugins in a consistent way).
88FILES_${MLPREFIX}libasound-module-ctl-arcam-av += "\ 89FILES:${MLPREFIX}libasound-module-ctl-arcam-av += "\
89 ${datadir}/alsa/alsa.conf.d/50-arcam-av-ctl.conf \ 90 ${datadir}/alsa/alsa.conf.d/50-arcam-av-ctl.conf \
90 ${sysconfdir}/alsa/conf.d/50-arcam-av-ctl.conf \ 91 ${sysconfdir}/alsa/conf.d/50-arcam-av-ctl.conf \
91" 92"
92FILES_${MLPREFIX}libasound-module-pcm-a52 += "\ 93FILES:${MLPREFIX}libasound-module-pcm-a52 += "\
93 ${datadir}/alsa/alsa.conf.d/60-a52-encoder.conf \ 94 ${datadir}/alsa/alsa.conf.d/60-a52-encoder.conf \
94 ${sysconfdir}/alsa/conf.d/60-a52-encoder.conf \ 95 ${sysconfdir}/alsa/conf.d/60-a52-encoder.conf \
95" 96"
96FILES_${MLPREFIX}libasound-module-pcm-alsa-dsp += "\ 97FILES:${MLPREFIX}libasound-module-pcm-alsa-dsp += "\
97 ${datadir}/alsa/alsa.conf.d/98-maemo.conf \ 98 ${datadir}/alsa/alsa.conf.d/98-maemo.conf \
98 ${sysconfdir}/alsa/conf.d/98-maemo.conf \ 99 ${sysconfdir}/alsa/conf.d/98-maemo.conf \
99" 100"
100FILES_${MLPREFIX}libasound-module-pcm-jack += "\ 101FILES:${MLPREFIX}libasound-module-pcm-jack += "\
101 ${datadir}/alsa/alsa.conf.d/50-jack.conf \ 102 ${datadir}/alsa/alsa.conf.d/50-jack.conf \
102 ${sysconfdir}/alsa/conf.d/50-jack.conf \ 103 ${sysconfdir}/alsa/conf.d/50-jack.conf \
103" 104"
104FILES_${MLPREFIX}libasound-module-pcm-oss += "\ 105FILES:${MLPREFIX}libasound-module-pcm-oss += "\
105 ${datadir}/alsa/alsa.conf.d/50-oss.conf \ 106 ${datadir}/alsa/alsa.conf.d/50-oss.conf \
106 ${sysconfdir}/alsa/conf.d/50-oss.conf \ 107 ${sysconfdir}/alsa/conf.d/50-oss.conf \
107" 108"
108FILES_${MLPREFIX}libasound-module-pcm-speex += "\ 109FILES:${MLPREFIX}libasound-module-pcm-speex += "\
109 ${datadir}/alsa/alsa.conf.d/60-speex.conf \ 110 ${datadir}/alsa/alsa.conf.d/60-speex.conf \
110 ${sysconfdir}/alsa/conf.d/60-speex.conf \ 111 ${sysconfdir}/alsa/conf.d/60-speex.conf \
111" 112"
112FILES_${MLPREFIX}libasound-module-pcm-upmix += "\ 113FILES:${MLPREFIX}libasound-module-pcm-upmix += "\
113 ${datadir}/alsa/alsa.conf.d/60-upmix.conf \ 114 ${datadir}/alsa/alsa.conf.d/60-upmix.conf \
114 ${sysconfdir}/alsa/conf.d/60-upmix.conf \ 115 ${sysconfdir}/alsa/conf.d/60-upmix.conf \
115" 116"
116FILES_${MLPREFIX}libasound-module-pcm-usb-stream += "\ 117FILES:${MLPREFIX}libasound-module-pcm-usb-stream += "\
117 ${datadir}/alsa/alsa.conf.d/98-usb-stream.conf \ 118 ${datadir}/alsa/alsa.conf.d/98-usb-stream.conf \
118 ${sysconfdir}/alsa/conf.d/98-usb-stream.conf \ 119 ${sysconfdir}/alsa/conf.d/98-usb-stream.conf \
119" 120"
120FILES_${MLPREFIX}libasound-module-pcm-vdownmix += "\ 121FILES:${MLPREFIX}libasound-module-pcm-vdownmix += "\
121 ${datadir}/alsa/alsa.conf.d/60-vdownmix.conf \ 122 ${datadir}/alsa/alsa.conf.d/60-vdownmix.conf \
122 ${sysconfdir}/alsa/conf.d/60-vdownmix.conf \ 123 ${sysconfdir}/alsa/conf.d/60-vdownmix.conf \
123" 124"
124FILES_${MLPREFIX}libasound-module-rate-lavrate += "\ 125FILES:${MLPREFIX}libasound-module-rate-lavrate += "\
125 ${datadir}/alsa/alsa.conf.d/10-rate-lav.conf \ 126 ${datadir}/alsa/alsa.conf.d/10-rate-lav.conf \
126 ${sysconfdir}/alsa/conf.d/10-rate-lav.conf \ 127 ${sysconfdir}/alsa/conf.d/10-rate-lav.conf \
127" 128"
128FILES_${MLPREFIX}libasound-module-rate-samplerate += "\ 129FILES:${MLPREFIX}libasound-module-rate-samplerate += "\
129 ${datadir}/alsa/alsa.conf.d/10-samplerate.conf \ 130 ${datadir}/alsa/alsa.conf.d/10-samplerate.conf \
130 ${sysconfdir}/alsa/conf.d/10-samplerate.conf \ 131 ${sysconfdir}/alsa/conf.d/10-samplerate.conf \
131" 132"
132FILES_${MLPREFIX}libasound-module-rate-speexrate += "\ 133FILES:${MLPREFIX}libasound-module-rate-speexrate += "\
133 ${datadir}/alsa/alsa.conf.d/10-speexrate.conf \ 134 ${datadir}/alsa/alsa.conf.d/10-speexrate.conf \
134 ${sysconfdir}/alsa/conf.d/10-speexrate.conf \ 135 ${sysconfdir}/alsa/conf.d/10-speexrate.conf \
135" 136"
@@ -150,25 +151,25 @@ FILES_${MLPREFIX}libasound-module-rate-speexrate += "\
150# The symlinks cause QA errors, because usually it's a bug if a non 151# The symlinks cause QA errors, because usually it's a bug if a non
151# -dev/-dbg/-nativesdk package contains links to .so files, but in this case 152# -dev/-dbg/-nativesdk package contains links to .so files, but in this case
152# the errors are false positives, so we disable the QA checks. 153# the errors are false positives, so we disable the QA checks.
153FILES_${MLPREFIX}libasound-module-rate-lavrate += "${libdir}/alsa-lib/*rate_lavrate_*.so" 154FILES:${MLPREFIX}libasound-module-rate-lavrate += "${libdir}/alsa-lib/*rate_lavrate_*.so"
154FILES_${MLPREFIX}libasound-module-rate-samplerate += "${libdir}/alsa-lib/*rate_samplerate_*.so" 155FILES:${MLPREFIX}libasound-module-rate-samplerate += "${libdir}/alsa-lib/*rate_samplerate_*.so"
155FILES_${MLPREFIX}libasound-module-rate-speexrate += "${libdir}/alsa-lib/*rate_speexrate_*.so" 156FILES:${MLPREFIX}libasound-module-rate-speexrate += "${libdir}/alsa-lib/*rate_speexrate_*.so"
156INSANE_SKIP_${MLPREFIX}libasound-module-rate-lavrate = "dev-so" 157INSANE_SKIP:${MLPREFIX}libasound-module-rate-lavrate = "dev-so"
157INSANE_SKIP_${MLPREFIX}libasound-module-rate-samplerate = "dev-so" 158INSANE_SKIP:${MLPREFIX}libasound-module-rate-samplerate = "dev-so"
158INSANE_SKIP_${MLPREFIX}libasound-module-rate-speexrate = "dev-so" 159INSANE_SKIP:${MLPREFIX}libasound-module-rate-speexrate = "dev-so"
159 160
160# 50-pulseaudio.conf defines a device named "pulse" that applications can use 161# 50-pulseaudio.conf defines a device named "pulse" that applications can use
161# if they explicitly want to use the PulseAudio plugin. 162# if they explicitly want to use the PulseAudio plugin.
162# 99-pulseaudio-default.conf configures the "default" device to use the 163# 99-pulseaudio-default.conf configures the "default" device to use the
163# PulseAudio plugin. 164# PulseAudio plugin.
164FILES_${PN}-pulseaudio-conf += "\ 165FILES:${PN}-pulseaudio-conf += "\
165 ${datadir}/alsa/alsa.conf.d/50-pulseaudio.conf \ 166 ${datadir}/alsa/alsa.conf.d/50-pulseaudio.conf \
166 ${datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf \ 167 ${datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf \
167 ${sysconfdir}/alsa/conf.d/50-pulseaudio.conf \ 168 ${sysconfdir}/alsa/conf.d/50-pulseaudio.conf \
168 ${sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf \ 169 ${sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf \
169" 170"
170 171
171RDEPENDS_${PN}-pulseaudio-conf += "\ 172RDEPENDS:${PN}-pulseaudio-conf += "\
172 ${MLPREFIX}libasound-module-conf-pulse \ 173 ${MLPREFIX}libasound-module-conf-pulse \
173 ${MLPREFIX}libasound-module-ctl-pulse \ 174 ${MLPREFIX}libasound-module-ctl-pulse \
174 ${MLPREFIX}libasound-module-pcm-pulse \ 175 ${MLPREFIX}libasound-module-pcm-pulse \
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.2.2.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.2.11.bb
index 0a25d809b0..53868041c0 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.2.2.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.2.11.bb
@@ -5,7 +5,7 @@ firmware loaders for pcmcia, USB and the hdsp devices."
5HOMEPAGE = "http://www.alsa-project.org" 5HOMEPAGE = "http://www.alsa-project.org"
6BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking" 6BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking"
7SECTION = "console/utils" 7SECTION = "console/utils"
8LICENSE = "GPLv2 & LGPLv2+" 8LICENSE = "GPL-2.0-only & LGPL-2.0-or-later"
9DEPENDS = "alsa-lib" 9DEPENDS = "alsa-lib"
10 10
11LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ 11LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
@@ -14,8 +14,7 @@ LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=59530bdf33659b29e73d4adb9f9f65
14 14
15SRC_URI = "https://www.alsa-project.org/files/pub/tools/${BP}.tar.bz2" 15SRC_URI = "https://www.alsa-project.org/files/pub/tools/${BP}.tar.bz2"
16 16
17SRC_URI[md5sum] = "4e6187d2c3a8c73a9d75d66a72faed27" 17SRC_URI[sha256sum] = "0915c9634a502fd3655ca9c574d259bc9e79983d91d45aeacff6f3c00f8ae3e9"
18SRC_URI[sha256sum] = "bfd3c7aae1289269605d3da02279159b10e3dabdd31e658cbceaa30170957349"
19 18
20inherit autotools-brokensep pkgconfig 19inherit autotools-brokensep pkgconfig
21# brokensep as as10k1 (and probably more) fail out of tree 20# brokensep as as10k1 (and probably more) fail out of tree
@@ -72,6 +71,7 @@ python do_compile() {
72} 71}
73 72
74python do_install() { 73python do_install() {
74 d.delVarFlag("autotools_do_install", "cleandirs")
75 for subdir in d.getVar("PACKAGECONFIG").split(): 75 for subdir in d.getVar("PACKAGECONFIG").split():
76 subdir = subdir.replace("--", "/") 76 subdir = subdir.replace("--", "/")
77 bb.note("Installing %s" % subdir) 77 bb.note("Installing %s" % subdir)
@@ -86,4 +86,4 @@ python do_install() {
86 pass 86 pass
87} 87}
88 88
89FILES_${PN} += "${datadir}" 89FILES:${PN} += "${datadir}"
diff --git a/meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.4.bb b/meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.5.1.bb
index 26542fbbbc..4374a6bb6d 100644
--- a/meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.4.bb
+++ b/meta/recipes-multimedia/alsa/alsa-topology-conf_1.2.5.1.bb
@@ -8,7 +8,8 @@ LICENSE = "BSD-3-Clause"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=20d74d74db9741697903372ad001d3b4" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=20d74d74db9741697903372ad001d3b4"
9 9
10SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2" 10SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2"
11SRC_URI[sha256sum] = "55e0e6e42eca4cc7656c257af2440cdc65b83689dca49fc60ca0194db079ed07" 11SRC_URI[sha256sum] = "f7c5bae1545abcd73824bc97f4e72c340e11abea188ba0f1c06f5e0ad776b179"
12# Something went wrong at upstream tarballing
12 13
13inherit allarch 14inherit allarch
14 15
@@ -19,4 +20,4 @@ do_install() {
19 20
20PACKAGES = "${PN}" 21PACKAGES = "${PN}"
21 22
22FILES_${PN} = "*" 23FILES:${PN} = "*"
diff --git a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.4.bb b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.11.bb
index 32cf41c8fd..ce1a42c9b8 100644
--- a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.4.bb
+++ b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.11.bb
@@ -8,7 +8,8 @@ LICENSE = "BSD-3-Clause"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=20d74d74db9741697903372ad001d3b4" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=20d74d74db9741697903372ad001d3b4"
9 9
10SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2" 10SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2"
11SRC_URI[sha256sum] = "2c3b535c77dcb9aaf62a61f4f8324f1ab184162f105f7ec9ed1e37c742fcd340" 11SRC_URI[sha256sum] = "387c01cf30e2a1676d7b8f72b2681cf219abca70dd1ec2a9e33add5bf3feae81"
12# Something went wrong at upstream tarballing
12 13
13inherit allarch 14inherit allarch
14 15
@@ -20,4 +21,4 @@ do_install() {
20 21
21PACKAGES = "${PN}" 22PACKAGES = "${PN}"
22 23
23FILES_${PN} = "*" 24FILES:${PN} = "*"
diff --git a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.4.bb b/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.4.bb
deleted file mode 100644
index 048fef68a5..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.4.bb
+++ /dev/null
@@ -1,25 +0,0 @@
1require alsa-utils.inc
2
3SUMMARY = "Shell scripts that show help info and create ALSA configuration files"
4PROVIDES = "alsa-utils-alsaconf"
5
6FILESEXTRAPATHS_prepend := "${THISDIR}/alsa-utils:"
7
8PACKAGES = "${PN}"
9RDEPENDS_${PN} += "bash"
10
11FILES_${PN} = "${sbindir}/alsaconf \
12 ${sbindir}/alsa-info.sh \
13 ${sbindir}/alsabat-test.sh \
14 "
15
16S = "${WORKDIR}/alsa-utils-${PV}"
17
18do_install() {
19 install -d ${D}${sbindir}
20 install -m 0755 ${B}/alsaconf/alsaconf ${D}${sbindir}/
21 install -m 0755 ${S}/alsa-info/alsa-info.sh ${D}${sbindir}/
22 if ${@bb.utils.contains('PACKAGECONFIG', 'bat', 'true', 'false', d)}; then
23 install -m 0755 ${S}/bat/alsabat-test.sh ${D}${sbindir}/
24 fi
25}
diff --git a/meta/recipes-multimedia/alsa/alsa-utils.inc b/meta/recipes-multimedia/alsa/alsa-utils_1.2.11.bb
index f2e8133d2c..e598fac9f8 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils.inc
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.11.bb
@@ -4,8 +4,9 @@ designed to allow users to control the various parts of the ALSA system."
4HOMEPAGE = "http://www.alsa-project.org" 4HOMEPAGE = "http://www.alsa-project.org"
5BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking" 5BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking"
6SECTION = "console/utils" 6SECTION = "console/utils"
7# Some parts are GPLv2+, some are only GPLv2 (e.g. axfer, alsactl) so result is GPLv2 7# Some parts are GPL-2.0-or-later, some are GPL-2.0-only (e.g. axfer, alsactl)
8LICENSE = "GPLv2" 8# so result is GPL-2.0-only
9LICENSE = "GPL-2.0-only"
9LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ 10LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
10 file://alsactl/utils.c;beginline=3;endline=18;md5=96cc06a4cebe5eb7975688ffb0e65642" 11 file://alsactl/utils.c;beginline=3;endline=18;md5=96cc06a4cebe5eb7975688ffb0e65642"
11DEPENDS = "alsa-lib ncurses libsamplerate0" 12DEPENDS = "alsa-lib ncurses libsamplerate0"
@@ -23,8 +24,9 @@ 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" 24PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
24 25
25# alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe 26# 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" 27SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2 \
27SRC_URI[sha256sum] = "98ffc2d599de0577d423a48fa5f20a992ca0b82d812ed1f2e58ade49ac6da426" 28 "
29SRC_URI[sha256sum] = "9ac6ca3a883f151e568dcf979b8d2e5cbecc51b819bb0e6bb8a2e9b34cc428a7"
28 30
29# On build machines with python-docutils (not python3-docutils !!) installed 31# On build machines with python-docutils (not python3-docutils !!) installed
30# rst2man (not rst2man.py) is detected and compile fails with 32# rst2man (not rst2man.py) is detected and compile fails with
@@ -52,56 +54,71 @@ ALSA_UTILS_PKGS = "\
52 alsa-utils-alsactl \ 54 alsa-utils-alsactl \
53 alsa-utils-alsaloop \ 55 alsa-utils-alsaloop \
54 alsa-utils-alsaucm \ 56 alsa-utils-alsaucm \
57 alsa-utils-scripts \
58 alsa-utils-nhltdmicinfo \
55 " 59 "
56 60
57PACKAGES += "${ALSA_UTILS_PKGS}" 61PACKAGES += "${ALSA_UTILS_PKGS}"
58RDEPENDS_${PN} += "${ALSA_UTILS_PKGS}" 62RDEPENDS:${PN} += "${ALSA_UTILS_PKGS}"
59 63
60FILES_${PN} = "" 64FILES:${PN} = ""
61ALLOW_EMPTY_alsa-utils = "1" 65ALLOW_EMPTY:alsa-utils = "1"
62FILES_alsa-utils-alsabat = "${bindir}/alsabat" 66FILES:alsa-utils-alsabat = "${bindir}/alsabat"
63FILES_alsa-utils-alsatplg = "${bindir}/alsatplg" 67FILES:alsa-utils-alsatplg = "${bindir}/alsatplg ${libdir}/alsa-topology"
64FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord ${bindir}/axfer" 68FILES:alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord ${bindir}/axfer"
65FILES_alsa-utils-amixer = "${bindir}/amixer" 69FILES:alsa-utils-amixer = "${bindir}/amixer"
66FILES_alsa-utils-alsamixer = "${bindir}/alsamixer" 70FILES:alsa-utils-alsamixer = "${bindir}/alsamixer"
67FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/speaker-test/" 71FILES:alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/speaker-test/"
68FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi" 72FILES:alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi"
69FILES_alsa-utils-aconnect = "${bindir}/aconnect" 73FILES:alsa-utils-aconnect = "${bindir}/aconnect"
70FILES_alsa-utils-aseqnet = "${bindir}/aseqnet" 74FILES:alsa-utils-aseqnet = "${bindir}/aseqnet"
71FILES_alsa-utils-iecset = "${bindir}/iecset" 75FILES:alsa-utils-iecset = "${bindir}/iecset"
72FILES_alsa-utils-alsactl = "${sbindir}/alsactl */udev/rules.d/90-alsa-restore.rules */*/udev/rules.d/90-alsa-restore.rules ${systemd_unitdir} ${localstatedir}/lib/alsa ${datadir}/alsa/init/" 76FILES:alsa-utils-alsactl = "${sbindir}/alsactl */udev/rules.d/90-alsa-restore.rules */*/udev/rules.d/90-alsa-restore.rules ${systemd_unitdir} ${localstatedir}/lib/alsa ${datadir}/alsa/init/"
73FILES_alsa-utils-aseqdump = "${bindir}/aseqdump" 77FILES:alsa-utils-aseqdump = "${bindir}/aseqdump"
74FILES_alsa-utils-alsaloop = "${bindir}/alsaloop" 78FILES:alsa-utils-alsaloop = "${bindir}/alsaloop"
75FILES_alsa-utils-alsaucm = "${bindir}/alsaucm */udev/rules.d/89-alsa-ucm.rules */*/udev/rules.d/89-alsa-ucm.rules" 79FILES:alsa-utils-alsaucm = "${bindir}/alsaucm */udev/rules.d/89-alsa-ucm.rules */*/udev/rules.d/89-alsa-ucm.rules"
76 80FILES:alsa-utils-scripts = "${sbindir}/alsaconf \
77SUMMARY_alsa-utils-alsabat = "Command-line sound tester for ALSA sound card driver" 81 ${sbindir}/alsa-info.sh \
78SUMMARY_alsa-utils-alsatplg = "Converts topology text files into binary format for kernel" 82 ${sbindir}/alsabat-test.sh \
79SUMMARY_alsa-utils-aplay = "Play (and record) sound files using ALSA" 83 "
80SUMMARY_alsa-utils-amixer = "Command-line control for ALSA mixer and settings" 84FILES:alsa-utils-nhltdmicinfo = "${bindir}/nhlt-dmic-info"
81SUMMARY_alsa-utils-alsamixer = "ncurses-based control for ALSA mixer and settings" 85
82SUMMARY_alsa-utils-speakertest = "ALSA surround speaker test utility" 86SUMMARY:alsa-utils-alsabat = "Command-line sound tester for ALSA sound card driver"
83SUMMARY_alsa-utils-midi = "Miscellaneous MIDI utilities for ALSA" 87SUMMARY:alsa-utils-alsatplg = "Converts topology text files into binary format for kernel"
84SUMMARY_alsa-utils-aconnect = "ALSA sequencer connection manager" 88SUMMARY:alsa-utils-aplay = "Play (and record) sound files using ALSA"
85SUMMARY_alsa-utils-aseqnet = "Network client/server for ALSA sequencer" 89SUMMARY:alsa-utils-amixer = "Command-line control for ALSA mixer and settings"
86SUMMARY_alsa-utils-iecset = "ALSA utility for setting/showing IEC958 (S/PDIF) status bits" 90SUMMARY:alsa-utils-alsamixer = "ncurses-based control for ALSA mixer and settings"
87SUMMARY_alsa-utils-alsactl = "Saves/restores ALSA-settings in /etc/asound.state" 91SUMMARY:alsa-utils-speakertest = "ALSA surround speaker test utility"
88SUMMARY_alsa-utils-aseqdump = "Shows the events received at an ALSA sequencer port" 92SUMMARY:alsa-utils-midi = "Miscellaneous MIDI utilities for ALSA"
89SUMMARY_alsa-utils-alsaloop = "ALSA PCM loopback utility" 93SUMMARY:alsa-utils-aconnect = "ALSA sequencer connection manager"
90SUMMARY_alsa-utils-alsaucm = "ALSA Use Case Manager" 94SUMMARY:alsa-utils-aseqnet = "Network client/server for ALSA sequencer"
91 95SUMMARY:alsa-utils-iecset = "ALSA utility for setting/showing IEC958 (S/PDIF) status bits"
92RRECOMMENDS_alsa-utils-alsactl = "alsa-states" 96SUMMARY:alsa-utils-alsactl = "Saves/restores ALSA-settings in /etc/asound.state"
97SUMMARY:alsa-utils-aseqdump = "Shows the events received at an ALSA sequencer port"
98SUMMARY:alsa-utils-alsaloop = "ALSA PCM loopback utility"
99SUMMARY:alsa-utils-alsaucm = "ALSA Use Case Manager"
100SUMMARY:alsa-utils-scripts = "Shell scripts that show help info and create ALSA configuration files"
101SUMMARY:alsa-utils-nhltdmicinfo = "Dumps microphone array information from ACPI NHLT table"
102
103RRECOMMENDS:alsa-utils-alsactl = "alsa-states"
93 104
94do_install() { 105do_install() {
95 autotools_do_install 106 autotools_do_install
96 107
97 # We don't ship this here because it requires a dependency on bash. 108 install -d ${D}${sbindir}
98 # See alsa-utils-scripts_${PV}.bb 109 install -m 0755 ${B}/alsaconf/alsaconf ${D}${sbindir}/
99 rm ${D}${sbindir}/alsaconf 110 install -m 0755 ${S}/alsa-info/alsa-info.sh ${D}${sbindir}/
100 rm ${D}${sbindir}/alsa-info.sh 111 if ${@bb.utils.contains('PACKAGECONFIG', 'bat', 'true', 'false', d)}; then
101 rm -f ${D}${sbindir}/alsabat-test.sh 112 install -m 0755 ${S}/bat/alsabat-test.sh ${D}${sbindir}/
113 fi
102 114
103 # If udev is disabled, we told configure to install the rules 115 # If udev is disabled, we told configure to install the rules
104 # in /unwanted, so we can remove them now. If udev is enabled, 116 # in /unwanted, so we can remove them now. If udev is enabled,
105 # then /unwanted won't exist and this will have no effect. 117 # then /unwanted won't exist and this will have no effect.
106 rm -rf ${D}/unwanted 118 rm -rf ${D}/unwanted
107} 119}
120
121
122PROVIDES = "alsa-utils-alsaconf alsa-utils-scripts"
123
124RDEPENDS:${PN}-scripts += "bash"
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.4.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.4.bb
deleted file mode 100644
index 3430288da4..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.4.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1require alsa-utils.inc
2
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-11 13:10:35 +0000