From 1dccd16e29186e7baad6ebcf189b7ea2463c2275 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Mon, 21 Jan 2013 11:19:59 +0200 Subject: alsa-utils: upgrade to 1.0.26 ncursesfix.patch is no longer necessary, build system fixed upstream. ncursesfix.patch removed. Signed-off-by: Cristian Iorga Signed-off-by: Saul Wold --- ...-t-let-systemd-unit-restore-the-volume-wh.patch | 46 ------------ .../alsa/alsa-utils-1.0.25/ncursesfix.patch | 44 ----------- .../obsolete_automake_macros.patch | 15 ---- .../uclibc-exp10-replacement.patch | 21 ------ ...-t-let-systemd-unit-restore-the-volume-wh.patch | 46 ++++++++++++ .../alsa/alsa-utils/obsolete_automake_macros.patch | 15 ++++ .../alsa/alsa-utils/uclibc-exp10-replacement.patch | 21 ++++++ meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb | 86 ---------------------- meta/recipes-multimedia/alsa/alsa-utils_1.0.26.bb | 85 +++++++++++++++++++++ 9 files changed, 167 insertions(+), 212 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils-1.0.25/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils-1.0.25/ncursesfix.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils-1.0.25/obsolete_automake_macros.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils-1.0.25/uclibc-exp10-replacement.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-utils/obsolete_automake_macros.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-utils/uclibc-exp10-replacement.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb create mode 100644 meta/recipes-multimedia/alsa/alsa-utils_1.0.26.bb (limited to 'meta/recipes-multimedia') diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch deleted file mode 100644 index 1690ca566c..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 37c99a3cbff36915b56a5703eeaed3c70796f80f 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 - -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 - - alsactl/Makefile.am | 2 +- - alsactl/alsa-restore.service.in | 1 + - 2 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am -index 5cfc415..c3768c4 100644 ---- a/alsactl/Makefile.am -+++ b/alsactl/Makefile.am -@@ -34,7 +34,7 @@ install-data-hook: - endif - - edit = \ -- $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ -+ $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ - - alsa-store.service: alsa-store.service.in - $(edit) -diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in -index e97d196..3b76710 100644 ---- a/alsactl/alsa-restore.service.in -+++ b/alsactl/alsa-restore.service.in -@@ -4,6 +4,7 @@ DefaultDependencies=no - After=sysinit.target - Before=shutdown.target - Conflicts=shutdown.target -+ConditionPathExists=@localstatedir@/lib/alsa/asound.state - - [Service] - Type=oneshot --- -1.6.6.1 - diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/ncursesfix.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/ncursesfix.patch deleted file mode 100644 index 9936dedf17..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/ncursesfix.patch +++ /dev/null @@ -1,44 +0,0 @@ -Rebase the patch to fit 1.0.24.2 - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Dongxiao Xu - -diff -ruN alsa-utils-1.0.24.2-orig//configure.in alsa-utils-1.0.24.2/configure.in ---- alsa-utils-1.0.24.2-orig//configure.in 2011-04-13 13:51:20.337665010 +0800 -+++ alsa-utils-1.0.24.2/configure.in 2011-04-13 13:51:54.437664986 +0800 -@@ -127,34 +127,16 @@ - NCURSESLIBSUFFIX="" - CURSES_NLS="no" - if test "$curseslib" = "ncursesw" -o \( "$curseslib" = "auto" -a "$USE_NLS" = "yes" \); then -- AC_CHECK_PROG([ncursesw5_config], [ncursesw5-config], [yes]) -- if test "$ncursesw5_config" = "yes"; then -- CURSESINC="" -- CURSESLIB=`ncursesw5-config --libs` -- CURSESLIBDIR=`ncursesw5-config --libdir` -- CURSES_CFLAGS=`ncursesw5-config --cflags` -- curseslib="ncursesw" -- else - AC_CHECK_LIB(ncursesw, initscr, - [ CURSESINC=''; CURSESLIB='-lncursesw'; curseslib="ncursesw"]) -- fi - if test -n "$CURSESINC"; then - NCURSESLIBSUFFIX="w" - CURSES_NLS="yes" - fi - fi - if test "$curseslib" = "ncurses" -o "$curseslib" = "auto"; then -- AC_CHECK_PROG([ncurses5_config], [ncurses5-config], [yes]) -- if test "$ncurses5_config" = "yes"; then -- CURSESINC="" -- CURSESLIB=`ncurses5-config --libs` -- CURSESLIBDIR=`ncurses5-config --libdir` -- CURSES_CFLAGS=`ncurses5-config --cflags` -- curseslib="ncurses" -- else - AC_CHECK_LIB(ncurses, initscr, - [ CURSESINC=''; CURSESLIB='-lncurses'; curseslib="ncurses"]) -- fi - fi - if test "$curseslib" = "curses" -o "$curseslib" = "auto"; then - AC_CHECK_LIB(curses, initscr, diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/obsolete_automake_macros.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/obsolete_automake_macros.patch deleted file mode 100644 index 1a20b48fd4..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/obsolete_automake_macros.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Submitted [alsa-devel@alsa-project.org] - -Signed-off-by: Marko Lindqvist -diff -Nurd alsa-utils-1.0.25/configure.in alsa-utils-1.0.25/configure.in ---- alsa-utils-1.0.25/configure.in 2012-01-25 11:43:48.000000000 +0200 -+++ alsa-utils-1.0.25/configure.in 2013-01-12 10:11:51.401498722 +0200 -@@ -269,7 +269,7 @@ - TESTSOUND="$dir/test.wav") - AC_SUBST(TESTSOUND) - --AM_CONFIG_HEADER(include/aconfig.h) -+AC_CONFIG_HEADERS(include/aconfig.h) - - dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/uclibc-exp10-replacement.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/uclibc-exp10-replacement.patch deleted file mode 100644 index b2a9a956cc..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/uclibc-exp10-replacement.patch +++ /dev/null @@ -1,21 +0,0 @@ -uclibc does not have exp10 function which is glibc extension. -Bur we can get the same behavior by using pow() - -Upstream-Status: Pending - -Khem Raj - -Index: alsa-utils-1.0.24.2/alsamixer/volume_mapping.c -=================================================================== ---- alsa-utils-1.0.24.2.orig/alsamixer/volume_mapping.c -+++ alsa-utils-1.0.24.2/alsamixer/volume_mapping.c -@@ -36,6 +36,9 @@ - #include - #include - #include "volume_mapping.h" -+#ifdef __UCLIBC__ -+#define exp10(x) (pow(10, (x))) -+#endif /* __UCLIBC__ */ - - #define MAX_LINEAR_DB_SCALE 24 - 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 new file mode 100644 index 0000000000..1690ca566c --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch @@ -0,0 +1,46 @@ +From 37c99a3cbff36915b56a5703eeaed3c70796f80f 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 + +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 + + alsactl/Makefile.am | 2 +- + alsactl/alsa-restore.service.in | 1 + + 2 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am +index 5cfc415..c3768c4 100644 +--- a/alsactl/Makefile.am ++++ b/alsactl/Makefile.am +@@ -34,7 +34,7 @@ install-data-hook: + endif + + edit = \ +- $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ ++ $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ + + alsa-store.service: alsa-store.service.in + $(edit) +diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in +index e97d196..3b76710 100644 +--- a/alsactl/alsa-restore.service.in ++++ b/alsactl/alsa-restore.service.in +@@ -4,6 +4,7 @@ DefaultDependencies=no + After=sysinit.target + Before=shutdown.target + Conflicts=shutdown.target ++ConditionPathExists=@localstatedir@/lib/alsa/asound.state + + [Service] + Type=oneshot +-- +1.6.6.1 + diff --git a/meta/recipes-multimedia/alsa/alsa-utils/obsolete_automake_macros.patch b/meta/recipes-multimedia/alsa/alsa-utils/obsolete_automake_macros.patch new file mode 100644 index 0000000000..1a20b48fd4 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils/obsolete_automake_macros.patch @@ -0,0 +1,15 @@ +Upstream-Status: Submitted [alsa-devel@alsa-project.org] + +Signed-off-by: Marko Lindqvist +diff -Nurd alsa-utils-1.0.25/configure.in alsa-utils-1.0.25/configure.in +--- alsa-utils-1.0.25/configure.in 2012-01-25 11:43:48.000000000 +0200 ++++ alsa-utils-1.0.25/configure.in 2013-01-12 10:11:51.401498722 +0200 +@@ -269,7 +269,7 @@ + TESTSOUND="$dir/test.wav") + AC_SUBST(TESTSOUND) + +-AM_CONFIG_HEADER(include/aconfig.h) ++AC_CONFIG_HEADERS(include/aconfig.h) + + dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST diff --git a/meta/recipes-multimedia/alsa/alsa-utils/uclibc-exp10-replacement.patch b/meta/recipes-multimedia/alsa/alsa-utils/uclibc-exp10-replacement.patch new file mode 100644 index 0000000000..b2a9a956cc --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils/uclibc-exp10-replacement.patch @@ -0,0 +1,21 @@ +uclibc does not have exp10 function which is glibc extension. +Bur we can get the same behavior by using pow() + +Upstream-Status: Pending + +Khem Raj + +Index: alsa-utils-1.0.24.2/alsamixer/volume_mapping.c +=================================================================== +--- alsa-utils-1.0.24.2.orig/alsamixer/volume_mapping.c ++++ alsa-utils-1.0.24.2/alsamixer/volume_mapping.c +@@ -36,6 +36,9 @@ + #include + #include + #include "volume_mapping.h" ++#ifdef __UCLIBC__ ++#define exp10(x) (pow(10, (x))) ++#endif /* __UCLIBC__ */ + + #define MAX_LINEAR_DB_SCALE 24 + diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb deleted file mode 100644 index ab8d845963..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb +++ /dev/null @@ -1,86 +0,0 @@ -DESCRIPTION = "ALSA 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" -PR = "r4" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ - file://ncursesfix.patch \ - file://uclibc-exp10-replacement.patch \ - file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \ - file://obsolete_automake_macros.patch \ - " - -SRC_URI[md5sum] = "f81f9dcb9a014fd32cb3a70066a5b9a9" -SRC_URI[sha256sum] = "2e676a2f634bbfe279b260e10a96f617cb72ee63c5bbf6c5f96bb615705b302c" - -# 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 = "--disable-xmlto --with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d" -EXTRA_OECONF_append_libc-uclibc = " --disable-nls" - -inherit autotools gettext - -# 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-alsaconf \ - alsa-utils-alsactl \ - alsa-utils-alsaloop \ - alsa-utils-alsaucm \ - " - -PACKAGES += "${ALSA_UTILS_PKGS}" -RDEPENDS_${PN} += "${ALSA_UTILS_PKGS}" -RDEPENDS_alsa-utils-alsaconf += "bash" - -# We omit alsaconf, because -# a) this is a bash script -# b) it creates config files not suitable for OE-based distros - -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 ${nonarch_base_libdir}/udev/rules.d ${systemd_unitdir} ${localstatedir}/lib/alsa ${datadir}/alsa/init/" -FILES_alsa-utils-aseqdump = "${bindir}/aseqdump" -FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf" -FILES_alsa-utils-alsaloop = "${bindir}/alsaloop" -FILES_alsa-utils-alsaucm = "${bindir}/alsaucm" - - -DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA" -DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings" -DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings" -DESCRIPTION_alsa-utils-speakertest = "ALSA surround speaker test utility" -DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA" -DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager" -DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer" -DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state" -DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files" -DESCRIPTION_alsa-utils-alsaucm = "ALSA Use Case Manager" - -RRECOMMENDS_alsa-utils-alsactl = "alsa-states" - -ALLOW_EMPTY_alsa-utils = "1" diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.26.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.26.bb new file mode 100644 index 0000000000..1c537af745 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.26.bb @@ -0,0 +1,85 @@ +DESCRIPTION = "ALSA 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" +PR = "r0" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ + file://uclibc-exp10-replacement.patch \ + file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \ + file://obsolete_automake_macros.patch \ + " + +SRC_URI[md5sum] = "4dcf1017fafc91603af96705c073eca9" +SRC_URI[sha256sum] = "f85f2a3aa6e78475bbe35b0cad3a8cabb99f45ebc5f37962f2137b8df8b081e7" + +# 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 = "--disable-xmlto --with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d" +EXTRA_OECONF_append_libc-uclibc = " --disable-nls" + +inherit autotools gettext + +# 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-alsaconf \ + alsa-utils-alsactl \ + alsa-utils-alsaloop \ + alsa-utils-alsaucm \ + " + +PACKAGES += "${ALSA_UTILS_PKGS}" +RDEPENDS_${PN} += "${ALSA_UTILS_PKGS}" +RDEPENDS_alsa-utils-alsaconf += "bash" + +# We omit alsaconf, because +# a) this is a bash script +# b) it creates config files not suitable for OE-based distros + +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 ${nonarch_base_libdir}/udev/rules.d ${systemd_unitdir} ${localstatedir}/lib/alsa ${datadir}/alsa/init/" +FILES_alsa-utils-aseqdump = "${bindir}/aseqdump" +FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf" +FILES_alsa-utils-alsaloop = "${bindir}/alsaloop" +FILES_alsa-utils-alsaucm = "${bindir}/alsaucm" + + +DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA" +DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings" +DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings" +DESCRIPTION_alsa-utils-speakertest = "ALSA surround speaker test utility" +DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA" +DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager" +DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer" +DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state" +DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files" +DESCRIPTION_alsa-utils-alsaucm = "ALSA Use Case Manager" + +RRECOMMENDS_alsa-utils-alsactl = "alsa-states" + +ALLOW_EMPTY_alsa-utils = "1" -- cgit v1.2.3