diff options
author | Cristian Iorga <cristian.iorga@intel.com> | 2014-08-29 20:06:33 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-31 23:40:47 +0100 |
commit | c74a6dd34d9d9493b420560be3675ee29ba88114 (patch) | |
tree | 731c0186b5173092572f5409c15adf4d5c938b59 | |
parent | b72ce8202439d8fdb8a9129bec82359edb954133 (diff) | |
download | poky-c74a6dd34d9d9493b420560be3675ee29ba88114.tar.gz |
alsa-tools: upgrade to 1.0.28
mips_has_no_io_h.patch removed, no longer necessary.
Changelog:
http://www.alsa-project.org/main/index.php/Changes_v1.0.27.2_v1.0.28
(From OE-Core rev: f28e6f4131e675a60795156012851b8367ac1b4d)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch | 16 | ||||
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-tools_1.0.28.bb (renamed from meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb) | 7 |
2 files changed, 3 insertions, 20 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch b/meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch deleted file mode 100644 index 09b10f17e6..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
3 | |||
4 | Index: alsa-tools-1.0.26.1/hda-verb/hda-verb.c | ||
5 | =================================================================== | ||
6 | --- alsa-tools-1.0.26.1.orig/hda-verb/hda-verb.c | ||
7 | +++ alsa-tools-1.0.26.1/hda-verb/hda-verb.c | ||
8 | @@ -13,7 +13,7 @@ | ||
9 | #include <ctype.h> | ||
10 | #include <unistd.h> | ||
11 | #include <sys/ioctl.h> | ||
12 | -#ifndef __PPC__ | ||
13 | +#if !(__PPC__ || __mips__) | ||
14 | #include <sys/io.h> | ||
15 | #endif | ||
16 | #include <sys/types.h> | ||
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.28.bb index bca7170a28..4b9509e863 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.28.bb | |||
@@ -8,14 +8,13 @@ DEPENDS = "alsa-lib ncurses" | |||
8 | LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | 8 | LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ |
9 | file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" | 9 | file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" |
10 | 10 | ||
11 | SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \ | 11 | SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/${BP}.tar.bz2 \ |
12 | file://mips_has_no_io_h.patch \ | ||
13 | file://autotools.patch \ | 12 | file://autotools.patch \ |
14 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \ | 13 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \ |
15 | 'file://makefile_no_gtk.patch', d)}" | 14 | 'file://makefile_no_gtk.patch', d)}" |
16 | 15 | ||
17 | SRC_URI[md5sum] = "1ea381d00a6069a98613aa7effa4cb51" | 16 | SRC_URI[md5sum] = "e6c929175d8ee729c06d49b51439bad6" |
18 | SRC_URI[sha256sum] = "6562611b5a6560712f109e09740a9d4fa47296b07ed9590cb44139c5f154ada2" | 17 | SRC_URI[sha256sum] = "76e59711c6d0f39cbddce83ce1ed8da00bad112fee021f94fa990d8685cc3761" |
19 | 18 | ||
20 | inherit autotools-brokensep pkgconfig | 19 | inherit autotools-brokensep pkgconfig |
21 | 20 | ||