From 440aba7eb3450d425edcd10b543850c750894dd9 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Wed, 13 Apr 2011 13:54:41 +0800 Subject: alsa-utils: upgrade to version 1.0.24.2 (From OE-Core rev: c59f6c1f7de59963fa0f0f0912b2233357dcec02) Signed-off-by: Dongxiao Xu Signed-off-by: Richard Purdie --- .../alsa/alsa-utils-1.0.23/ncursesfix.patch | 42 ------------- .../alsa/alsa-utils-1.0.24.2/ncursesfix.patch | 44 ++++++++++++++ meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb | 70 ---------------------- .../recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb | 70 ++++++++++++++++++++++ 4 files changed, 114 insertions(+), 112 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils-1.0.23/ncursesfix.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/ncursesfix.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb create mode 100644 meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb (limited to 'meta/recipes-multimedia/alsa') diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.23/ncursesfix.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.23/ncursesfix.patch deleted file mode 100644 index 0009c1afe9..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-utils-1.0.23/ncursesfix.patch +++ /dev/null @@ -1,42 +0,0 @@ -# alsa-utils: Fix ncurses build failures -# Richard Purdie -# Rebased to 1.0.23, Dongxiao Xu - -diff -ruN alsa-utils-1.0.23-orig/configure.in alsa-utils-1.0.23/configure.in ---- alsa-utils-1.0.23-orig/configure.in 2010-04-16 19:19:12.000000000 +0800 -+++ alsa-utils-1.0.23/configure.in 2010-06-22 15:22:06.731202478 +0800 -@@ -109,34 +109,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.24.2/ncursesfix.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/ncursesfix.patch new file mode 100644 index 0000000000..9936dedf17 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/ncursesfix.patch @@ -0,0 +1,44 @@ +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.23.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb deleted file mode 100644 index 46283ccccc..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb +++ /dev/null @@ -1,70 +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=393a5ca445f6965873eca0259a17f833 \ - file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9" -DEPENDS = "alsa-lib ncurses gettext" -PR = "r0" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ - file://ncursesfix.patch;patch=1 " - -SRC_URI[md5sum] = "cb0cf46029ac9549cf3a31bff6a4f4e1" -SRC_URI[sha256sum] = "b7d05e915e25f8540ad151c6dd558cf0fc1e9bb0ee23052d531c983666a1f7b0" - -# 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" -EXTRA_OECONF_linux-uclibc = "--disable-nls" -EXTRA_OECONF_linux-uclibcgnueabi = "--disable-nls" - -inherit autotools - -# This are all packages that we need to make. Also, the now empty alsa-utils -# ipk depend on them. - -PACKAGES += "\ - 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 " - -# 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/" -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" -FILES_alsa-utils-aseqdump = "${bindir}/aseqdump" -FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf" - -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" - -ALLOW_EMPTY_alsa-utils = "1" diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb new file mode 100644 index 0000000000..953a3acefd --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb @@ -0,0 +1,70 @@ +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=393a5ca445f6965873eca0259a17f833 \ + file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9" +DEPENDS = "alsa-lib ncurses gettext" +PR = "r0" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ + file://ncursesfix.patch;patch=1 " + +SRC_URI[md5sum] = "8238cd57cb301d1c36bcf0ecb59ce6b2" +SRC_URI[sha256sum] = "95127f740291086486c06c28118cabca0814bde48fd14dac041a9812a5ac1be2" + +# 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" +EXTRA_OECONF_linux-uclibc = "--disable-nls" +EXTRA_OECONF_linux-uclibcgnueabi = "--disable-nls" + +inherit autotools + +# This are all packages that we need to make. Also, the now empty alsa-utils +# ipk depend on them. + +PACKAGES += "\ + 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 " + +# 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/" +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" +FILES_alsa-utils-aseqdump = "${bindir}/aseqdump" +FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf" + +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" + +ALLOW_EMPTY_alsa-utils = "1" -- cgit v1.2.3-54-g00ecf