From b2aae7176f71772a43f19b897e09291579008ad8 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Fri, 29 Aug 2014 20:06:34 +0300 Subject: alsa-utils: upgrade to 1.0.28 Changelog: http://www.alsa-project.org/main/index.php/Changes_v1.0.27.2_v1.0.28 0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch updated. Signed-off-by: Cristian Iorga Signed-off-by: Richard Purdie --- .../alsa/alsa-utils-alsaconf_1.0.27.2.bb | 17 ---- .../alsa/alsa-utils-alsaconf_1.0.28.bb | 17 ++++ ...-t-let-systemd-unit-restore-the-volume-wh.patch | 42 ++++++---- .../recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb | 94 ---------------------- meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb | 94 ++++++++++++++++++++++ 5 files changed, 138 insertions(+), 126 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.27.2.bb create mode 100644 meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.28.bb delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb create mode 100644 meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb (limited to 'meta/recipes-multimedia') diff --git a/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.27.2.bb b/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.27.2.bb deleted file mode 100644 index 968c81ee2b..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.27.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -require alsa-utils_${PV}.bb - -SUMMARY = "Shell script that creates ALSA configuration files" - -FILESEXTRAPATHS_prepend := "${THISDIR}/alsa-utils:" - -PACKAGES = "${PN}" -RDEPENDS_${PN} += "bash" - -FILES_${PN} = "${sbindir}/alsaconf" - -S = "${WORKDIR}/alsa-utils-${PV}" - -do_install() { - install -d ${D}${sbindir} - install -m 0755 ${S}/alsaconf/alsaconf ${D}${sbindir}/ -} diff --git a/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.28.bb b/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.28.bb new file mode 100644 index 0000000000..968c81ee2b --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.28.bb @@ -0,0 +1,17 @@ +require alsa-utils_${PV}.bb + +SUMMARY = "Shell script that creates ALSA configuration files" + +FILESEXTRAPATHS_prepend := "${THISDIR}/alsa-utils:" + +PACKAGES = "${PN}" +RDEPENDS_${PN} += "bash" + +FILES_${PN} = "${sbindir}/alsaconf" + +S = "${WORKDIR}/alsa-utils-${PV}" + +do_install() { + install -d ${D}${sbindir} + install -m 0755 ${S}/alsaconf/alsaconf ${D}${sbindir}/ +} diff --git a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch index 477cd11b12..e99dd515f0 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch +++ b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch @@ -1,35 +1,44 @@ -From 37c99a3cbff36915b56a5703eeaed3c70796f80f Mon Sep 17 00:00:00 2001 +From 43a56fa36a12f09ccd78b3cf5e6ae197fcab501f Mon Sep 17 00:00:00 2001 From: Koen Kooi -Date: Sun, 9 Oct 2011 20:06:35 +0200 -Subject: [PATCH] alsactl: don't let systemd unit restore the volume when asound.state is missing +Date: Fri, 29 Aug 2014 18:58:56 +0300 +Subject: [PATCH] alsactl: don't let systemd unit restore the volume when + asound.state is missing This avoids an error on bootup -Signed-off-by: Koen Kooi - Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459 Upstream-Status: Pending -Index: alsa-utils-1.0.27.2/alsactl/Makefile.am -=================================================================== ---- alsa-utils-1.0.27.2.orig/alsactl/Makefile.am -+++ alsa-utils-1.0.27.2/alsactl/Makefile.am -@@ -36,8 +36,8 @@ install-data-hook: +Signed-off-by: Koen Kooi +Signed-off-by: Cristian Iorga +--- + alsactl/Makefile.am | 7 ++++--- + alsactl/alsa-restore.service.in | 1 + + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am +index 47f06e9..b728c06 100644 +--- a/alsactl/Makefile.am ++++ b/alsactl/Makefile.am +@@ -43,9 +43,10 @@ install-data-hook: endif edit = \ - $(SED) -r -e 's,@sbindir\@,$(sbindir),g' \ +- -e 's,@mydatadir\@,$(mydatadir),g' \ - -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \ -+ $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' \ ++ $(SED) -e 's,@localstatedir\@,$(localstatedir),g' \ ++ -e 's,@sbindir\@,$(sbindir),g' \ ++ -e 's,@mydatadir\@,$(mydatadir),g' \ + -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \ < $< > $@ || rm $@ alsa-state.service: alsa-state.service.in -Index: alsa-utils-1.0.27.2/alsactl/alsa-restore.service.in -=================================================================== ---- alsa-utils-1.0.27.2.orig/alsactl/alsa-restore.service.in -+++ alsa-utils-1.0.27.2/alsactl/alsa-restore.service.in +diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in +index 245a439..b017854 100644 +--- a/alsactl/alsa-restore.service.in ++++ b/alsactl/alsa-restore.service.in @@ -10,6 +10,7 @@ DefaultDependencies=no After=alsa-state.service Before=shutdown.target @@ -38,3 +47,6 @@ Index: alsa-utils-1.0.27.2/alsactl/alsa-restore.service.in [Service] Type=oneshot +-- +1.9.1 + diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb deleted file mode 100644 index 047fcfe5dd..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb +++ /dev/null @@ -1,94 +0,0 @@ -SUMMARY = "ALSA sound utilities" -HOMEPAGE = "http://www.alsa-project.org" -BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php" -SECTION = "console/utils" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9" -DEPENDS = "alsa-lib ncurses libsamplerate0 udev" - -PACKAGECONFIG ??= "udev" -PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d,,udev" -PACKAGECONFIG[xmlto] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ - file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \ - " - -SRC_URI[md5sum] = "b65e9a04181bd7c9db7667a4566f8dc3" -SRC_URI[sha256sum] = "02bfac39092f3b68d743c23ad3d688d6c5aa8df69f2ccd692c5b8282edb352ea" - -# lazy hack. needs proper fixing in gettext.m4, see -# http://bugs.openembedded.org/show_bug.cgi?id=2348 -# please close bug and remove this comment when properly fixed -# -EXTRA_OECONF_append_libc-uclibc = " --disable-nls" - -inherit autotools-brokensep gettext pkgconfig - -# This are all packages that we need to make. Also, the now empty alsa-utils -# ipk depends on them. - -ALSA_UTILS_PKGS = "\ - alsa-utils-alsamixer \ - alsa-utils-midi \ - alsa-utils-aplay \ - alsa-utils-amixer \ - alsa-utils-aconnect \ - alsa-utils-iecset \ - alsa-utils-speakertest \ - alsa-utils-aseqnet \ - alsa-utils-aseqdump \ - alsa-utils-alsactl \ - alsa-utils-alsaloop \ - alsa-utils-alsaucm \ - " - -PACKAGES += "${ALSA_UTILS_PKGS}" -RDEPENDS_${PN} += "${ALSA_UTILS_PKGS}" - -FILES_${PN} = "" -FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord" -FILES_alsa-utils-amixer = "${bindir}/amixer" -FILES_alsa-utils-alsamixer = "${bindir}/alsamixer" -FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/speaker-test/" -FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi" -FILES_alsa-utils-aconnect = "${bindir}/aconnect" -FILES_alsa-utils-aseqnet = "${bindir}/aseqnet" -FILES_alsa-utils-iecset = "${bindir}/iecset" -FILES_alsa-utils-alsactl = "${sbindir}/alsactl */udev/rules.d ${systemd_unitdir} ${localstatedir}/lib/alsa ${datadir}/alsa/init/" -FILES_alsa-utils-aseqdump = "${bindir}/aseqdump" -FILES_alsa-utils-alsaloop = "${bindir}/alsaloop" -FILES_alsa-utils-alsaucm = "${bindir}/alsaucm" - - -SUMMARY_alsa-utils-aplay = "Play (and record) sound files using ALSA" -SUMMARY_alsa-utils-amixer = "Command-line control for ALSA mixer and settings" -SUMMARY_alsa-utils-alsamixer = "ncurses-based control for ALSA mixer and settings" -SUMMARY_alsa-utils-speakertest = "ALSA surround speaker test utility" -SUMMARY_alsa-utils-midi = "Miscellaneous MIDI utilities for ALSA" -SUMMARY_alsa-utils-aconnect = "ALSA sequencer connection manager" -SUMMARY_alsa-utils-aseqnet = "Network client/server for ALSA sequencer" -SUMMARY_alsa-utils-iecset = "ALSA utility for setting/showing IEC958 (S/PDIF) status bits" -SUMMARY_alsa-utils-alsactl = "Saves/restores ALSA-settings in /etc/asound.state" -SUMMARY_alsa-utils-aseqdump = "Shows the events received at an ALSA sequencer port" -SUMMARY_alsa-utils-alsaloop = "ALSA PCM loopback utility" -SUMMARY_alsa-utils-alsaucm = "ALSA Use Case Manager" - -RRECOMMENDS_alsa-utils-alsactl = "alsa-states" - -ALLOW_EMPTY_alsa-utils = "1" - -do_install() { - autotools_do_install - - # We don't ship this here because it requires a dependency on bash. - # See alsa-utils-alsaconf_${PV}.bb - rm ${D}${sbindir}/alsaconf - - if ${@bb.utils.contains('PACKAGECONFIG', 'udev', 'false', 'true', d)}; then - # This is where alsa-utils will install its rules if we don't tell it anything else. - rm -rf ${D}/lib/udev - rmdir --ignore-fail-on-non-empty ${D}/lib - fi -} diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb new file mode 100644 index 0000000000..2d23482c16 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb @@ -0,0 +1,94 @@ +SUMMARY = "ALSA sound utilities" +HOMEPAGE = "http://www.alsa-project.org" +BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php" +SECTION = "console/utils" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9" +DEPENDS = "alsa-lib ncurses libsamplerate0 udev" + +PACKAGECONFIG ??= "udev" +PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d,,udev" +PACKAGECONFIG[xmlto] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ + file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \ + " + +SRC_URI[md5sum] = "361552d5b1cacd0a1e7ba09e69990211" +SRC_URI[sha256sum] = "f3ff4c89b0125a7797b1b13cd094cc92276e655458274967386e812d03642acc" + +# lazy hack. needs proper fixing in gettext.m4, see +# http://bugs.openembedded.org/show_bug.cgi?id=2348 +# please close bug and remove this comment when properly fixed +# +EXTRA_OECONF_append_libc-uclibc = " --disable-nls" + +inherit autotools-brokensep gettext pkgconfig + +# This are all packages that we need to make. Also, the now empty alsa-utils +# ipk depends on them. + +ALSA_UTILS_PKGS = "\ + alsa-utils-alsamixer \ + alsa-utils-midi \ + alsa-utils-aplay \ + alsa-utils-amixer \ + alsa-utils-aconnect \ + alsa-utils-iecset \ + alsa-utils-speakertest \ + alsa-utils-aseqnet \ + alsa-utils-aseqdump \ + alsa-utils-alsactl \ + alsa-utils-alsaloop \ + alsa-utils-alsaucm \ + " + +PACKAGES += "${ALSA_UTILS_PKGS}" +RDEPENDS_${PN} += "${ALSA_UTILS_PKGS}" + +FILES_${PN} = "" +FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord" +FILES_alsa-utils-amixer = "${bindir}/amixer" +FILES_alsa-utils-alsamixer = "${bindir}/alsamixer" +FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/speaker-test/" +FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi" +FILES_alsa-utils-aconnect = "${bindir}/aconnect" +FILES_alsa-utils-aseqnet = "${bindir}/aseqnet" +FILES_alsa-utils-iecset = "${bindir}/iecset" +FILES_alsa-utils-alsactl = "${sbindir}/alsactl */udev/rules.d ${systemd_unitdir} ${localstatedir}/lib/alsa ${datadir}/alsa/init/" +FILES_alsa-utils-aseqdump = "${bindir}/aseqdump" +FILES_alsa-utils-alsaloop = "${bindir}/alsaloop" +FILES_alsa-utils-alsaucm = "${bindir}/alsaucm" + + +SUMMARY_alsa-utils-aplay = "Play (and record) sound files using ALSA" +SUMMARY_alsa-utils-amixer = "Command-line control for ALSA mixer and settings" +SUMMARY_alsa-utils-alsamixer = "ncurses-based control for ALSA mixer and settings" +SUMMARY_alsa-utils-speakertest = "ALSA surround speaker test utility" +SUMMARY_alsa-utils-midi = "Miscellaneous MIDI utilities for ALSA" +SUMMARY_alsa-utils-aconnect = "ALSA sequencer connection manager" +SUMMARY_alsa-utils-aseqnet = "Network client/server for ALSA sequencer" +SUMMARY_alsa-utils-iecset = "ALSA utility for setting/showing IEC958 (S/PDIF) status bits" +SUMMARY_alsa-utils-alsactl = "Saves/restores ALSA-settings in /etc/asound.state" +SUMMARY_alsa-utils-aseqdump = "Shows the events received at an ALSA sequencer port" +SUMMARY_alsa-utils-alsaloop = "ALSA PCM loopback utility" +SUMMARY_alsa-utils-alsaucm = "ALSA Use Case Manager" + +RRECOMMENDS_alsa-utils-alsactl = "alsa-states" + +ALLOW_EMPTY_alsa-utils = "1" + +do_install() { + autotools_do_install + + # We don't ship this here because it requires a dependency on bash. + # See alsa-utils-alsaconf_${PV}.bb + rm ${D}${sbindir}/alsaconf + + if ${@bb.utils.contains('PACKAGECONFIG', 'udev', 'false', 'true', d)}; then + # This is where alsa-utils will install its rules if we don't tell it anything else. + rm -rf ${D}/lib/udev + rmdir --ignore-fail-on-non-empty ${D}/lib + fi +} -- cgit 1.2.3-korg