summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-05-23 23:50:09 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-05-23 23:50:09 +0100
commit362d3886f52d6d4bae57adf81b7dcbd846217dd1 (patch)
tree3d6cd3c03c7e2fb174d0dd89264cb0d298015fff
parent4e3afe59683350983aa7ffece47e75c828f181d2 (diff)
downloadopenembedded-core-362d3886f52d6d4bae57adf81b7dcbd846217dd1.tar.gz
openembedded-core-362d3886f52d6d4bae57adf81b7dcbd846217dd1.tar.bz2
openembedded-core-362d3886f52d6d4bae57adf81b7dcbd846217dd1.zip
alsa-utils: Fix ncurses build failures
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/alsa/alsa-utils/ncursesfix.patch33
-rw-r--r--meta/packages/alsa/alsa-utils_1.0.20.bb4
2 files changed, 36 insertions, 1 deletions
diff --git a/meta/packages/alsa/alsa-utils/ncursesfix.patch b/meta/packages/alsa/alsa-utils/ncursesfix.patch
new file mode 100644
index 0000000000..fa1b138261
--- /dev/null
+++ b/meta/packages/alsa/alsa-utils/ncursesfix.patch
@@ -0,0 +1,33 @@
+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="<ncurses.h>"
+- CURSESLIB=`ncursesw5-config --libs`
+- CURSES_CFLAGS=`ncursesw5-config --cflags`
+- curseslib="ncursesw"
+- else
+ AC_CHECK_LIB(ncursesw, initscr,
+ [ CURSESINC='<ncurses.h>'; 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="<ncurses.h>"
+- CURSESLIB=`ncurses5-config --libs`
+- CURSES_CFLAGS=`ncurses5-config --cflags`
+- curseslib="ncurses"
+- else
+ AC_CHECK_LIB(ncurses, initscr,
+ [ CURSESINC='<ncurses.h>'; 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
index d6cade20f7..7fe0250502 100644
--- a/meta/packages/alsa/alsa-utils_1.0.20.bb
+++ b/meta/packages/alsa/alsa-utils_1.0.20.bb
@@ -3,8 +3,10 @@ HOMEPAGE = "http://www.alsa-project.org"
SECTION = "console/utils"
LICENSE = "GPL"
DEPENDS = "alsa-lib ncurses"
+PR = "r1"
-SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
+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