diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/ncursesfix.patch (renamed from meta/recipes-multimedia/alsa/alsa-utils-1.0.23/ncursesfix.patch) | 22 | ||||
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb (renamed from meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb) | 4 |
2 files changed, 14 insertions, 12 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.23/ncursesfix.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/ncursesfix.patch index 0009c1afe9..9936dedf17 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils-1.0.23/ncursesfix.patch +++ b/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/ncursesfix.patch | |||
@@ -1,11 +1,13 @@ | |||
1 | # alsa-utils: Fix ncurses build failures | 1 | Rebase the patch to fit 1.0.24.2 |
2 | # Richard Purdie <rpurdie@linux.intel.com> | ||
3 | # Rebased to 1.0.23, Dongxiao Xu <dongxiao.xu@intel.com> | ||
4 | 2 | ||
5 | diff -ruN alsa-utils-1.0.23-orig/configure.in alsa-utils-1.0.23/configure.in | 3 | Upstream-Status: Inappropriate [configuration] |
6 | --- alsa-utils-1.0.23-orig/configure.in 2010-04-16 19:19:12.000000000 +0800 | 4 | |
7 | +++ alsa-utils-1.0.23/configure.in 2010-06-22 15:22:06.731202478 +0800 | 5 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> |
8 | @@ -109,34 +109,16 @@ | 6 | |
7 | diff -ruN alsa-utils-1.0.24.2-orig//configure.in alsa-utils-1.0.24.2/configure.in | ||
8 | --- alsa-utils-1.0.24.2-orig//configure.in 2011-04-13 13:51:20.337665010 +0800 | ||
9 | +++ alsa-utils-1.0.24.2/configure.in 2011-04-13 13:51:54.437664986 +0800 | ||
10 | @@ -127,34 +127,16 @@ | ||
9 | NCURSESLIBSUFFIX="" | 11 | NCURSESLIBSUFFIX="" |
10 | CURSES_NLS="no" | 12 | CURSES_NLS="no" |
11 | if test "$curseslib" = "ncursesw" -o \( "$curseslib" = "auto" -a "$USE_NLS" = "yes" \); then | 13 | if test "$curseslib" = "ncursesw" -o \( "$curseslib" = "auto" -a "$USE_NLS" = "yes" \); then |
@@ -17,7 +19,7 @@ diff -ruN alsa-utils-1.0.23-orig/configure.in alsa-utils-1.0.23/configure.in | |||
17 | - CURSES_CFLAGS=`ncursesw5-config --cflags` | 19 | - CURSES_CFLAGS=`ncursesw5-config --cflags` |
18 | - curseslib="ncursesw" | 20 | - curseslib="ncursesw" |
19 | - else | 21 | - else |
20 | AC_CHECK_LIB(ncursesw, initscr, | 22 | AC_CHECK_LIB(ncursesw, initscr, |
21 | [ CURSESINC='<ncurses.h>'; CURSESLIB='-lncursesw'; curseslib="ncursesw"]) | 23 | [ CURSESINC='<ncurses.h>'; CURSESLIB='-lncursesw'; curseslib="ncursesw"]) |
22 | - fi | 24 | - fi |
23 | if test -n "$CURSESINC"; then | 25 | if test -n "$CURSESINC"; then |
@@ -34,9 +36,9 @@ diff -ruN alsa-utils-1.0.23-orig/configure.in alsa-utils-1.0.23/configure.in | |||
34 | - CURSES_CFLAGS=`ncurses5-config --cflags` | 36 | - CURSES_CFLAGS=`ncurses5-config --cflags` |
35 | - curseslib="ncurses" | 37 | - curseslib="ncurses" |
36 | - else | 38 | - else |
37 | AC_CHECK_LIB(ncurses, initscr, | 39 | AC_CHECK_LIB(ncurses, initscr, |
38 | [ CURSESINC='<ncurses.h>'; CURSESLIB='-lncurses'; curseslib="ncurses"]) | 40 | [ CURSESINC='<ncurses.h>'; CURSESLIB='-lncurses'; curseslib="ncurses"]) |
39 | - fi | 41 | - fi |
40 | fi | 42 | fi |
41 | if test "$curseslib" = "curses" -o "$curseslib" = "auto"; then | 43 | if test "$curseslib" = "curses" -o "$curseslib" = "auto"; then |
42 | AC_CHECK_LIB(curses, initscr, | 44 | 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.24.2.bb index 46283ccccc..953a3acefd 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb | |||
@@ -11,8 +11,8 @@ PR = "r0" | |||
11 | SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ | 11 | SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ |
12 | file://ncursesfix.patch;patch=1 " | 12 | file://ncursesfix.patch;patch=1 " |
13 | 13 | ||
14 | SRC_URI[md5sum] = "cb0cf46029ac9549cf3a31bff6a4f4e1" | 14 | SRC_URI[md5sum] = "8238cd57cb301d1c36bcf0ecb59ce6b2" |
15 | SRC_URI[sha256sum] = "b7d05e915e25f8540ad151c6dd558cf0fc1e9bb0ee23052d531c983666a1f7b0" | 15 | SRC_URI[sha256sum] = "95127f740291086486c06c28118cabca0814bde48fd14dac041a9812a5ac1be2" |
16 | 16 | ||
17 | # lazy hack. needs proper fixing in gettext.m4, see | 17 | # lazy hack. needs proper fixing in gettext.m4, see |
18 | # http://bugs.openembedded.org/show_bug.cgi?id=2348 | 18 | # http://bugs.openembedded.org/show_bug.cgi?id=2348 |