summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/alsa/alsa-utils-1.0.23/ncursesfix.patch (renamed from meta/packages/alsa/alsa-utils/ncursesfix.patch)25
-rw-r--r--meta/packages/alsa/alsa-utils_1.0.23.bb (renamed from meta/packages/alsa/alsa-utils_1.0.20.bb)2
2 files changed, 18 insertions, 9 deletions
diff --git a/meta/packages/alsa/alsa-utils/ncursesfix.patch b/meta/packages/alsa/alsa-utils-1.0.23/ncursesfix.patch
index fa1b138261..0009c1afe9 100644
--- a/meta/packages/alsa/alsa-utils/ncursesfix.patch
+++ b/meta/packages/alsa/alsa-utils-1.0.23/ncursesfix.patch
@@ -1,27 +1,36 @@
1Index: alsa-utils-1.0.20/configure.in 1# alsa-utils: Fix ncurses build failures
2=================================================================== 2# Richard Purdie <rpurdie@linux.intel.com>
3--- alsa-utils-1.0.20.orig/configure.in 2009-05-23 23:37:02.000000000 +0100 3# Rebased to 1.0.23, Dongxiao Xu <dongxiao.xu@intel.com>
4+++ alsa-utils-1.0.20/configure.in 2009-05-23 23:37:24.000000000 +0100 4
5@@ -106,28 +106,12 @@ 5diff -ruN alsa-utils-1.0.23-orig/configure.in alsa-utils-1.0.23/configure.in
6 curseslib="$withval", 6--- alsa-utils-1.0.23-orig/configure.in 2010-04-16 19:19:12.000000000 +0800
7 curseslib="auto") 7+++ alsa-utils-1.0.23/configure.in 2010-06-22 15:22:06.731202478 +0800
8 if test "$curseslib" = "ncursesw"; then 8@@ -109,34 +109,16 @@
9 NCURSESLIBSUFFIX=""
10 CURSES_NLS="no"
11 if test "$curseslib" = "ncursesw" -o \( "$curseslib" = "auto" -a "$USE_NLS" = "yes" \); then
9- AC_CHECK_PROG([ncursesw5_config], [ncursesw5-config], [yes]) 12- AC_CHECK_PROG([ncursesw5_config], [ncursesw5-config], [yes])
10- if test "$ncursesw5_config" = "yes"; then 13- if test "$ncursesw5_config" = "yes"; then
11- CURSESINC="<ncurses.h>" 14- CURSESINC="<ncurses.h>"
12- CURSESLIB=`ncursesw5-config --libs` 15- CURSESLIB=`ncursesw5-config --libs`
16- CURSESLIBDIR=`ncursesw5-config --libdir`
13- CURSES_CFLAGS=`ncursesw5-config --cflags` 17- CURSES_CFLAGS=`ncursesw5-config --cflags`
14- curseslib="ncursesw" 18- curseslib="ncursesw"
15- else 19- else
16 AC_CHECK_LIB(ncursesw, initscr, 20 AC_CHECK_LIB(ncursesw, initscr,
17 [ CURSESINC='<ncurses.h>'; CURSESLIB='-lncursesw'; curseslib="ncursesw"]) 21 [ CURSESINC='<ncurses.h>'; CURSESLIB='-lncursesw'; curseslib="ncursesw"])
18- fi 22- fi
23 if test -n "$CURSESINC"; then
24 NCURSESLIBSUFFIX="w"
25 CURSES_NLS="yes"
26 fi
19 fi 27 fi
20 if test "$curseslib" = "ncurses" -o "$curseslib" = "auto"; then 28 if test "$curseslib" = "ncurses" -o "$curseslib" = "auto"; then
21- AC_CHECK_PROG([ncurses5_config], [ncurses5-config], [yes]) 29- AC_CHECK_PROG([ncurses5_config], [ncurses5-config], [yes])
22- if test "$ncurses5_config" = "yes"; then 30- if test "$ncurses5_config" = "yes"; then
23- CURSESINC="<ncurses.h>" 31- CURSESINC="<ncurses.h>"
24- CURSESLIB=`ncurses5-config --libs` 32- CURSESLIB=`ncurses5-config --libs`
33- CURSESLIBDIR=`ncurses5-config --libdir`
25- CURSES_CFLAGS=`ncurses5-config --cflags` 34- CURSES_CFLAGS=`ncurses5-config --cflags`
26- curseslib="ncurses" 35- curseslib="ncurses"
27- else 36- else
diff --git a/meta/packages/alsa/alsa-utils_1.0.20.bb b/meta/packages/alsa/alsa-utils_1.0.23.bb
index d15370417f..ef571ce8ac 100644
--- a/meta/packages/alsa/alsa-utils_1.0.20.bb
+++ b/meta/packages/alsa/alsa-utils_1.0.23.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.alsa-project.org"
3SECTION = "console/utils" 3SECTION = "console/utils"
4LICENSE = "GPL" 4LICENSE = "GPL"
5DEPENDS = "alsa-lib ncurses gettext" 5DEPENDS = "alsa-lib ncurses gettext"
6PR = "r1" 6PR = "r0"
7 7
8SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ 8SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
9 file://ncursesfix.patch;patch=1 " 9 file://ncursesfix.patch;patch=1 "