summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-01-21 11:19:59 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-28 12:29:30 +0000
commit336d70c0adc070d83ba845206818630c7dd316c1 (patch)
treef43bbb4c46e7dbf24280fc673c7e50a72491dc91 /meta
parent98bee847ac923d9bf99b8d3457f7b5f6c20d6372 (diff)
downloadpoky-336d70c0adc070d83ba845206818630c7dd316c1.tar.gz
alsa-utils: upgrade to 1.0.26
ncursesfix.patch is no longer necessary, build system fixed upstream. ncursesfix.patch removed. (From OE-Core rev: 1dccd16e29186e7baad6ebcf189b7ea2463c2275) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils-1.0.25/ncursesfix.patch44
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch (renamed from meta/recipes-multimedia/alsa/alsa-utils-1.0.25/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch)0
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils/obsolete_automake_macros.patch (renamed from meta/recipes-multimedia/alsa/alsa-utils-1.0.25/obsolete_automake_macros.patch)0
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils/uclibc-exp10-replacement.patch (renamed from meta/recipes-multimedia/alsa/alsa-utils-1.0.25/uclibc-exp10-replacement.patch)0
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils_1.0.26.bb (renamed from meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb)7
5 files changed, 3 insertions, 48 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/ncursesfix.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/ncursesfix.patch
deleted file mode 100644
index 9936dedf17..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/ncursesfix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1Rebase the patch to fit 1.0.24.2
2
3Upstream-Status: Inappropriate [configuration]
4
5Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
6
7diff -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 @@
11 NCURSESLIBSUFFIX=""
12 CURSES_NLS="no"
13 if test "$curseslib" = "ncursesw" -o \( "$curseslib" = "auto" -a "$USE_NLS" = "yes" \); then
14- AC_CHECK_PROG([ncursesw5_config], [ncursesw5-config], [yes])
15- if test "$ncursesw5_config" = "yes"; then
16- CURSESINC="<ncurses.h>"
17- CURSESLIB=`ncursesw5-config --libs`
18- CURSESLIBDIR=`ncursesw5-config --libdir`
19- CURSES_CFLAGS=`ncursesw5-config --cflags`
20- curseslib="ncursesw"
21- else
22 AC_CHECK_LIB(ncursesw, initscr,
23 [ CURSESINC='<ncurses.h>'; CURSESLIB='-lncursesw'; curseslib="ncursesw"])
24- fi
25 if test -n "$CURSESINC"; then
26 NCURSESLIBSUFFIX="w"
27 CURSES_NLS="yes"
28 fi
29 fi
30 if test "$curseslib" = "ncurses" -o "$curseslib" = "auto"; then
31- AC_CHECK_PROG([ncurses5_config], [ncurses5-config], [yes])
32- if test "$ncurses5_config" = "yes"; then
33- CURSESINC="<ncurses.h>"
34- CURSESLIB=`ncurses5-config --libs`
35- CURSESLIBDIR=`ncurses5-config --libdir`
36- CURSES_CFLAGS=`ncurses5-config --cflags`
37- curseslib="ncurses"
38- else
39 AC_CHECK_LIB(ncurses, initscr,
40 [ CURSESINC='<ncurses.h>'; CURSESLIB='-lncurses'; curseslib="ncurses"])
41- fi
42 fi
43 if test "$curseslib" = "curses" -o "$curseslib" = "auto"; then
44 AC_CHECK_LIB(curses, initscr,
diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
index 1690ca566c..1690ca566c 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
+++ b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/obsolete_automake_macros.patch b/meta/recipes-multimedia/alsa/alsa-utils/obsolete_automake_macros.patch
index 1a20b48fd4..1a20b48fd4 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/obsolete_automake_macros.patch
+++ b/meta/recipes-multimedia/alsa/alsa-utils/obsolete_automake_macros.patch
diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/uclibc-exp10-replacement.patch b/meta/recipes-multimedia/alsa/alsa-utils/uclibc-exp10-replacement.patch
index b2a9a956cc..b2a9a956cc 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/uclibc-exp10-replacement.patch
+++ b/meta/recipes-multimedia/alsa/alsa-utils/uclibc-exp10-replacement.patch
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.26.bb
index ab8d845963..1c537af745 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.26.bb
@@ -6,17 +6,16 @@ LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
7 file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9" 7 file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9"
8DEPENDS = "alsa-lib ncurses libsamplerate0" 8DEPENDS = "alsa-lib ncurses libsamplerate0"
9PR = "r4" 9PR = "r0"
10 10
11SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ 11SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
12 file://ncursesfix.patch \
13 file://uclibc-exp10-replacement.patch \ 12 file://uclibc-exp10-replacement.patch \
14 file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \ 13 file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \
15 file://obsolete_automake_macros.patch \ 14 file://obsolete_automake_macros.patch \
16 " 15 "
17 16
18SRC_URI[md5sum] = "f81f9dcb9a014fd32cb3a70066a5b9a9" 17SRC_URI[md5sum] = "4dcf1017fafc91603af96705c073eca9"
19SRC_URI[sha256sum] = "2e676a2f634bbfe279b260e10a96f617cb72ee63c5bbf6c5f96bb615705b302c" 18SRC_URI[sha256sum] = "f85f2a3aa6e78475bbe35b0cad3a8cabb99f45ebc5f37962f2137b8df8b081e7"
20 19
21# lazy hack. needs proper fixing in gettext.m4, see 20# lazy hack. needs proper fixing in gettext.m4, see
22# http://bugs.openembedded.org/show_bug.cgi?id=2348 21# http://bugs.openembedded.org/show_bug.cgi?id=2348