From 7f1d42b044ead4454ab0bb77e7db85286605370a Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Sat, 26 Jun 2010 16:29:38 +0800 Subject: alsa-utils: Upgraded to version 1.0.23 Rebased ncursesfix.patch to 1.0.23 and commented for it Change the local file directory name to ${PN}-${PV} Signed-off-by: Dongxiao Xu --- .../alsa/alsa-utils-1.0.23/ncursesfix.patch | 42 ++++++++++++++ meta/packages/alsa/alsa-utils/ncursesfix.patch | 33 ----------- meta/packages/alsa/alsa-utils_1.0.20.bb | 64 ---------------------- meta/packages/alsa/alsa-utils_1.0.23.bb | 64 ++++++++++++++++++++++ 4 files changed, 106 insertions(+), 97 deletions(-) create mode 100644 meta/packages/alsa/alsa-utils-1.0.23/ncursesfix.patch delete mode 100644 meta/packages/alsa/alsa-utils/ncursesfix.patch delete mode 100644 meta/packages/alsa/alsa-utils_1.0.20.bb create mode 100644 meta/packages/alsa/alsa-utils_1.0.23.bb (limited to 'meta/packages/alsa') diff --git a/meta/packages/alsa/alsa-utils-1.0.23/ncursesfix.patch b/meta/packages/alsa/alsa-utils-1.0.23/ncursesfix.patch new file mode 100644 index 0000000000..0009c1afe9 --- /dev/null +++ b/meta/packages/alsa/alsa-utils-1.0.23/ncursesfix.patch @@ -0,0 +1,42 @@ +# 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/packages/alsa/alsa-utils/ncursesfix.patch b/meta/packages/alsa/alsa-utils/ncursesfix.patch deleted file mode 100644 index fa1b138261..0000000000 --- a/meta/packages/alsa/alsa-utils/ncursesfix.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: alsa-utils-1.0.20/configure.in -=================================================================== ---- alsa-utils-1.0.20.orig/configure.in 2009-05-23 23:37:02.000000000 +0100 -+++ alsa-utils-1.0.20/configure.in 2009-05-23 23:37:24.000000000 +0100 -@@ -106,28 +106,12 @@ - curseslib="$withval", - curseslib="auto") - if test "$curseslib" = "ncursesw"; then -- AC_CHECK_PROG([ncursesw5_config], [ncursesw5-config], [yes]) -- if test "$ncursesw5_config" = "yes"; then -- CURSESINC="" -- CURSESLIB=`ncursesw5-config --libs` -- CURSES_CFLAGS=`ncursesw5-config --cflags` -- curseslib="ncursesw" -- else - AC_CHECK_LIB(ncursesw, initscr, - [ CURSESINC=''; CURSESLIB='-lncursesw'; curseslib="ncursesw"]) -- 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` -- 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/packages/alsa/alsa-utils_1.0.20.bb b/meta/packages/alsa/alsa-utils_1.0.20.bb deleted file mode 100644 index d15370417f..0000000000 --- a/meta/packages/alsa/alsa-utils_1.0.20.bb +++ /dev/null @@ -1,64 +0,0 @@ -DESCRIPTION = "ALSA Utilities" -HOMEPAGE = "http://www.alsa-project.org" -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "alsa-lib ncurses gettext" -PR = "r1" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ - file://ncursesfix.patch;patch=1 " - -# 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/packages/alsa/alsa-utils_1.0.23.bb b/meta/packages/alsa/alsa-utils_1.0.23.bb new file mode 100644 index 0000000000..ef571ce8ac --- /dev/null +++ b/meta/packages/alsa/alsa-utils_1.0.23.bb @@ -0,0 +1,64 @@ +DESCRIPTION = "ALSA Utilities" +HOMEPAGE = "http://www.alsa-project.org" +SECTION = "console/utils" +LICENSE = "GPL" +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 " + +# 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