summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-06-06 14:01:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-06-07 21:21:54 +0100
commit23e0f49c66f865ae326b21f2a19a2b836ef258b2 (patch)
treeedeae25527d38ed3f45b75e53dc414d3fd58707a /meta/recipes-multimedia
parent65045442271c41c71b314c8ac0f086a6db7aef4b (diff)
downloadpoky-23e0f49c66f865ae326b21f2a19a2b836ef258b2.tar.gz
alsa-utils-scripts: merge into alsa-utils
There is no reason to keep the recipe separate: bash dependency is not a problem until the alsa-utils-scripts package is explicitly installed into a target image. (From OE-Core rev: 466eba749629cdc8d759b6df3e1d95340fcfd67f) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.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.6.bb25
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils.inc108
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils_1.2.6.bb120
3 files changed, 119 insertions, 134 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.6.bb b/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.6.bb
deleted file mode 100644
index 000e984a7d..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.2.6.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.inc
deleted file mode 100644
index bca7cdd3bd..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-utils.inc
+++ /dev/null
@@ -1,108 +0,0 @@
1SUMMARY = "ALSA sound utilities"
2DESCRIPTION = "collection of small and often extremely powerful applications \
3designed to allow users to control the various parts of the ALSA system."
4HOMEPAGE = "http://www.alsa-project.org"
5BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking"
6SECTION = "console/utils"
7# Some parts are GPL-2.0-or-later, some are GPL-2.0-only (e.g. axfer, alsactl)
8# so result is GPL-2.0-only
9LICENSE = "GPL-2.0-only"
10LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
11 file://alsactl/utils.c;beginline=3;endline=18;md5=96cc06a4cebe5eb7975688ffb0e65642"
12DEPENDS = "alsa-lib ncurses libsamplerate0"
13
14PACKAGECONFIG ??= "udev"
15
16# alsabat can be built also without fftw support (with reduced functionality).
17# It would be better to always enable alsabat, but provide an option for
18# enabling/disabling fftw. The configure script doesn't support that, however
19# (at least in any obvious way), so for now we only support alsabat with fftw
20# or no alsabat at all.
21PACKAGECONFIG[bat] = "--enable-bat,--disable-bat,fftwf"
22
23PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d,--with-udev-rules-dir=/unwanted/rules.d,udev"
24PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
25
26# alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe
27SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2"
28SRC_URI[sha256sum] = "6a1efd8a1f1d9d38e489633eaec1fffa5c315663b316cab804be486887e6145d"
29
30# On build machines with python-docutils (not python3-docutils !!) installed
31# rst2man (not rst2man.py) is detected and compile fails with
32# | make[1]: *** No rule to make target 'alsaucm.1', needed by 'all-am'. Stop.
33# Avoid this by disabling expicitly
34EXTRA_OECONF = "--disable-rst2man"
35
36inherit autotools gettext pkgconfig manpages
37
38# This are all packages that we need to make. Also, the now empty alsa-utils
39# ipk depends on them.
40
41ALSA_UTILS_PKGS = "\
42 ${@bb.utils.contains('PACKAGECONFIG', 'bat', 'alsa-utils-alsabat', '', d)} \
43 alsa-utils-alsamixer \
44 alsa-utils-alsatplg \
45 alsa-utils-midi \
46 alsa-utils-aplay \
47 alsa-utils-amixer \
48 alsa-utils-aconnect \
49 alsa-utils-iecset \
50 alsa-utils-speakertest \
51 alsa-utils-aseqnet \
52 alsa-utils-aseqdump \
53 alsa-utils-alsactl \
54 alsa-utils-alsaloop \
55 alsa-utils-alsaucm \
56 "
57
58PACKAGES += "${ALSA_UTILS_PKGS}"
59RDEPENDS:${PN} += "${ALSA_UTILS_PKGS}"
60
61FILES:${PN} = ""
62ALLOW_EMPTY:alsa-utils = "1"
63FILES:alsa-utils-alsabat = "${bindir}/alsabat"
64FILES:alsa-utils-alsatplg = "${bindir}/alsatplg"
65FILES:alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord ${bindir}/axfer"
66FILES:alsa-utils-amixer = "${bindir}/amixer"
67FILES:alsa-utils-alsamixer = "${bindir}/alsamixer"
68FILES:alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/speaker-test/"
69FILES:alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi"
70FILES:alsa-utils-aconnect = "${bindir}/aconnect"
71FILES:alsa-utils-aseqnet = "${bindir}/aseqnet"
72FILES:alsa-utils-iecset = "${bindir}/iecset"
73FILES: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/"
74FILES:alsa-utils-aseqdump = "${bindir}/aseqdump"
75FILES:alsa-utils-alsaloop = "${bindir}/alsaloop"
76FILES:alsa-utils-alsaucm = "${bindir}/alsaucm */udev/rules.d/89-alsa-ucm.rules */*/udev/rules.d/89-alsa-ucm.rules"
77
78SUMMARY:alsa-utils-alsabat = "Command-line sound tester for ALSA sound card driver"
79SUMMARY:alsa-utils-alsatplg = "Converts topology text files into binary format for kernel"
80SUMMARY:alsa-utils-aplay = "Play (and record) sound files using ALSA"
81SUMMARY:alsa-utils-amixer = "Command-line control for ALSA mixer and settings"
82SUMMARY:alsa-utils-alsamixer = "ncurses-based control for ALSA mixer and settings"
83SUMMARY:alsa-utils-speakertest = "ALSA surround speaker test utility"
84SUMMARY:alsa-utils-midi = "Miscellaneous MIDI utilities for ALSA"
85SUMMARY:alsa-utils-aconnect = "ALSA sequencer connection manager"
86SUMMARY:alsa-utils-aseqnet = "Network client/server for ALSA sequencer"
87SUMMARY:alsa-utils-iecset = "ALSA utility for setting/showing IEC958 (S/PDIF) status bits"
88SUMMARY:alsa-utils-alsactl = "Saves/restores ALSA-settings in /etc/asound.state"
89SUMMARY:alsa-utils-aseqdump = "Shows the events received at an ALSA sequencer port"
90SUMMARY:alsa-utils-alsaloop = "ALSA PCM loopback utility"
91SUMMARY:alsa-utils-alsaucm = "ALSA Use Case Manager"
92
93RRECOMMENDS:alsa-utils-alsactl = "alsa-states"
94
95do_install() {
96 autotools_do_install
97
98 # We don't ship this here because it requires a dependency on bash.
99 # See alsa-utils-scripts_${PV}.bb
100 rm ${D}${sbindir}/alsaconf
101 rm ${D}${sbindir}/alsa-info.sh
102 rm -f ${D}${sbindir}/alsabat-test.sh
103
104 # If udev is disabled, we told configure to install the rules
105 # in /unwanted, so we can remove them now. If udev is enabled,
106 # then /unwanted won't exist and this will have no effect.
107 rm -rf ${D}/unwanted
108}
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.6.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.6.bb
index 3430288da4..6bb4e3158d 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.6.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.6.bb
@@ -1,2 +1,120 @@
1require alsa-utils.inc 1SUMMARY = "ALSA sound utilities"
2DESCRIPTION = "collection of small and often extremely powerful applications \
3designed to allow users to control the various parts of the ALSA system."
4HOMEPAGE = "http://www.alsa-project.org"
5BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking"
6SECTION = "console/utils"
7# Some parts are GPL-2.0-or-later, some are GPL-2.0-only (e.g. axfer, alsactl)
8# so result is GPL-2.0-only
9LICENSE = "GPL-2.0-only"
10LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
11 file://alsactl/utils.c;beginline=3;endline=18;md5=96cc06a4cebe5eb7975688ffb0e65642"
12DEPENDS = "alsa-lib ncurses libsamplerate0"
2 13
14PACKAGECONFIG ??= "udev"
15
16# alsabat can be built also without fftw support (with reduced functionality).
17# It would be better to always enable alsabat, but provide an option for
18# enabling/disabling fftw. The configure script doesn't support that, however
19# (at least in any obvious way), so for now we only support alsabat with fftw
20# or no alsabat at all.
21PACKAGECONFIG[bat] = "--enable-bat,--disable-bat,fftwf"
22
23PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d,--with-udev-rules-dir=/unwanted/rules.d,udev"
24PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
25
26# alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe
27SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2"
28SRC_URI[sha256sum] = "6a1efd8a1f1d9d38e489633eaec1fffa5c315663b316cab804be486887e6145d"
29
30# On build machines with python-docutils (not python3-docutils !!) installed
31# rst2man (not rst2man.py) is detected and compile fails with
32# | make[1]: *** No rule to make target 'alsaucm.1', needed by 'all-am'. Stop.
33# Avoid this by disabling expicitly
34EXTRA_OECONF = "--disable-rst2man"
35
36inherit autotools gettext pkgconfig manpages
37
38# This are all packages that we need to make. Also, the now empty alsa-utils
39# ipk depends on them.
40
41ALSA_UTILS_PKGS = "\
42 ${@bb.utils.contains('PACKAGECONFIG', 'bat', 'alsa-utils-alsabat', '', d)} \
43 alsa-utils-alsamixer \
44 alsa-utils-alsatplg \
45 alsa-utils-midi \
46 alsa-utils-aplay \
47 alsa-utils-amixer \
48 alsa-utils-aconnect \
49 alsa-utils-iecset \
50 alsa-utils-speakertest \
51 alsa-utils-aseqnet \
52 alsa-utils-aseqdump \
53 alsa-utils-alsactl \
54 alsa-utils-alsaloop \
55 alsa-utils-alsaucm \
56 alsa-utils-scripts \
57 "
58
59PACKAGES += "${ALSA_UTILS_PKGS}"
60RDEPENDS:${PN} += "${ALSA_UTILS_PKGS}"
61
62FILES:${PN} = ""
63ALLOW_EMPTY:alsa-utils = "1"
64FILES:alsa-utils-alsabat = "${bindir}/alsabat"
65FILES:alsa-utils-alsatplg = "${bindir}/alsatplg"
66FILES:alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord ${bindir}/axfer"
67FILES:alsa-utils-amixer = "${bindir}/amixer"
68FILES:alsa-utils-alsamixer = "${bindir}/alsamixer"
69FILES:alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/speaker-test/"
70FILES:alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi"
71FILES:alsa-utils-aconnect = "${bindir}/aconnect"
72FILES:alsa-utils-aseqnet = "${bindir}/aseqnet"
73FILES:alsa-utils-iecset = "${bindir}/iecset"
74FILES: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/"
75FILES:alsa-utils-aseqdump = "${bindir}/aseqdump"
76FILES:alsa-utils-alsaloop = "${bindir}/alsaloop"
77FILES:alsa-utils-alsaucm = "${bindir}/alsaucm */udev/rules.d/89-alsa-ucm.rules */*/udev/rules.d/89-alsa-ucm.rules"
78FILES:alsa-utils-scripts = "${sbindir}/alsaconf \
79 ${sbindir}/alsa-info.sh \
80 ${sbindir}/alsabat-test.sh \
81 "
82
83SUMMARY:alsa-utils-alsabat = "Command-line sound tester for ALSA sound card driver"
84SUMMARY:alsa-utils-alsatplg = "Converts topology text files into binary format for kernel"
85SUMMARY:alsa-utils-aplay = "Play (and record) sound files using ALSA"
86SUMMARY:alsa-utils-amixer = "Command-line control for ALSA mixer and settings"
87SUMMARY:alsa-utils-alsamixer = "ncurses-based control for ALSA mixer and settings"
88SUMMARY:alsa-utils-speakertest = "ALSA surround speaker test utility"
89SUMMARY:alsa-utils-midi = "Miscellaneous MIDI utilities for ALSA"
90SUMMARY:alsa-utils-aconnect = "ALSA sequencer connection manager"
91SUMMARY:alsa-utils-aseqnet = "Network client/server for ALSA sequencer"
92SUMMARY:alsa-utils-iecset = "ALSA utility for setting/showing IEC958 (S/PDIF) status bits"
93SUMMARY:alsa-utils-alsactl = "Saves/restores ALSA-settings in /etc/asound.state"
94SUMMARY:alsa-utils-aseqdump = "Shows the events received at an ALSA sequencer port"
95SUMMARY:alsa-utils-alsaloop = "ALSA PCM loopback utility"
96SUMMARY:alsa-utils-alsaucm = "ALSA Use Case Manager"
97SUMMARY:alsa-utils-scripts = "Shell scripts that show help info and create ALSA configuration files"
98
99RRECOMMENDS:alsa-utils-alsactl = "alsa-states"
100
101do_install() {
102 autotools_do_install
103
104 install -d ${D}${sbindir}
105 install -m 0755 ${B}/alsaconf/alsaconf ${D}${sbindir}/
106 install -m 0755 ${S}/alsa-info/alsa-info.sh ${D}${sbindir}/
107 if ${@bb.utils.contains('PACKAGECONFIG', 'bat', 'true', 'false', d)}; then
108 install -m 0755 ${S}/bat/alsabat-test.sh ${D}${sbindir}/
109 fi
110
111 # If udev is disabled, we told configure to install the rules
112 # in /unwanted, so we can remove them now. If udev is enabled,
113 # then /unwanted won't exist and this will have no effect.
114 rm -rf ${D}/unwanted
115}
116
117
118PROVIDES = "alsa-utils-alsaconf alsa-utils-scripts"
119
120RDEPENDS:${PN}-scripts += "bash"