diff options
author | Cristian Iorga <cristian.iorga@intel.com> | 2013-07-31 17:49:18 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-03 10:33:09 +0100 |
commit | 6d5d0c41a7cc52e429bfd69ea0ec9215f8150b51 (patch) | |
tree | aa574090b578c15e30bc73b6a7c6622d9257edf5 /meta/recipes-multimedia/alsa | |
parent | 8d68f1695c7a57bb5b3d5635a48cf2987d589cd3 (diff) | |
download | poky-6d5d0c41a7cc52e429bfd69ea0ec9215f8150b51.tar.gz |
alsa-lib: upgrade to v1.0.27.2
fix-O0-Optimize-unable-inline-function.patch,
obsolete_automake_macros.patch patches
included in upstream; removed.
unbreak_plugindir.patch not used, removed.
(From OE-Core rev: d438c87012a03bf556fe306b178a68ff41d19bc0)
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/recipes-multimedia/alsa')
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib/fix-O0-Optimize-unable-inline-function.patch | 63 | ||||
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib/obsolete_automake_macros.patch | 15 | ||||
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib/unbreak_plugindir.patch | 14 | ||||
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb (renamed from meta/recipes-multimedia/alsa/alsa-lib_1.0.26.bb) | 12 |
4 files changed, 4 insertions, 100 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/fix-O0-Optimize-unable-inline-function.patch b/meta/recipes-multimedia/alsa/alsa-lib/fix-O0-Optimize-unable-inline-function.patch deleted file mode 100644 index 1e43c256ad..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib/fix-O0-Optimize-unable-inline-function.patch +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | Change function type from "extern __inline__" to "static __inline__" | ||
2 | |||
3 | "extern __inline__ function()" is the inlined version that | ||
4 | can be used in this compilation unit, but there will be another | ||
5 | definition of this function somewhere, so compiler will not emit | ||
6 | any code for the function body. This causes problem in -O0, | ||
7 | where functions are never inlined, the function call is preserved, | ||
8 | but linker can't find the symbol, thus the error happens. | ||
9 | |||
10 | since no packages provide atomic_add and atomic_sub, and -O0 | ||
11 | Optimize is hoped to keep for debug, we can change extern to | ||
12 | static to fix this problem. | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> | ||
17 | --- | ||
18 | include/iatomic.h | 8 ++++---- | ||
19 | 1 files changed, 4 insertions(+), 4 deletions(-) | ||
20 | |||
21 | diff --git a/include/iatomic.h b/include/iatomic.h | ||
22 | index e92dbfd..364bc5c 100644 | ||
23 | --- a/include/iatomic.h | ||
24 | +++ b/include/iatomic.h | ||
25 | @@ -720,7 +720,7 @@ typedef struct { volatile int counter; } atomic_t; | ||
26 | * Atomically adds @i to @v. Note that the guaranteed useful range | ||
27 | * of an atomic_t is only 24 bits. | ||
28 | */ | ||
29 | -extern __inline__ void atomic_add(int i, atomic_t * v) | ||
30 | +static __inline__ void atomic_add(int i, atomic_t * v) | ||
31 | { | ||
32 | unsigned long temp; | ||
33 | |||
34 | @@ -744,7 +744,7 @@ extern __inline__ void atomic_add(int i, atomic_t * v) | ||
35 | * Atomically subtracts @i from @v. Note that the guaranteed | ||
36 | * useful range of an atomic_t is only 24 bits. | ||
37 | */ | ||
38 | -extern __inline__ void atomic_sub(int i, atomic_t * v) | ||
39 | +static __inline__ void atomic_sub(int i, atomic_t * v) | ||
40 | { | ||
41 | unsigned long temp; | ||
42 | |||
43 | @@ -763,7 +763,7 @@ extern __inline__ void atomic_sub(int i, atomic_t * v) | ||
44 | /* | ||
45 | * Same as above, but return the result value | ||
46 | */ | ||
47 | -extern __inline__ int atomic_add_return(int i, atomic_t * v) | ||
48 | +static __inline__ int atomic_add_return(int i, atomic_t * v) | ||
49 | { | ||
50 | unsigned long temp, result; | ||
51 | |||
52 | @@ -784,7 +784,7 @@ extern __inline__ int atomic_add_return(int i, atomic_t * v) | ||
53 | return result; | ||
54 | } | ||
55 | |||
56 | -extern __inline__ int atomic_sub_return(int i, atomic_t * v) | ||
57 | +static __inline__ int atomic_sub_return(int i, atomic_t * v) | ||
58 | { | ||
59 | unsigned long temp, result; | ||
60 | |||
61 | -- | ||
62 | 1.7.4.1 | ||
63 | |||
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/obsolete_automake_macros.patch b/meta/recipes-multimedia/alsa/alsa-lib/obsolete_automake_macros.patch deleted file mode 100644 index 95c29dac7c..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib/obsolete_automake_macros.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | Upstream-Status: Submitted [alsa-devel@alsa-project.org] | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -Nurd alsa-lib-1.0.25/configure.in alsa-lib-1.0.25/configure.in | ||
5 | --- alsa-lib-1.0.25/configure.in 2012-01-25 09:56:56.000000000 +0200 | ||
6 | +++ alsa-lib-1.0.25/configure.in 2013-01-02 17:00:31.468090167 +0200 | ||
7 | @@ -53,7 +53,7 @@ | ||
8 | |||
9 | dnl Checks for header files. | ||
10 | AC_HEADER_STDC | ||
11 | -AM_CONFIG_HEADER(include/config.h) | ||
12 | +AC_CONFIG_HEADERS(include/config.h) | ||
13 | |||
14 | dnl Checks for typedefs, structures, and compiler characteristics. | ||
15 | AC_C_CONST | ||
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/unbreak_plugindir.patch b/meta/recipes-multimedia/alsa/alsa-lib/unbreak_plugindir.patch deleted file mode 100644 index 1f3edd06aa..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib/unbreak_plugindir.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | diff -Nur alsa-lib-1.0.14.orig/configure.in alsa-lib-1.0.14/configure.in | ||
4 | --- alsa-lib-1.0.14.orig/configure.in 2007-05-31 03:05:13.000000000 -0500 | ||
5 | +++ alsa-lib-1.0.14/configure.in 2007-08-18 13:05:49.000000000 -0500 | ||
6 | @@ -93,7 +93,7 @@ | ||
7 | esac | ||
8 | plugindir="$dir/$PACKAGE" | ||
9 | fi | ||
10 | -AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "plugindir", [directory containing ALSA add-on modules]) | ||
11 | +AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "${plugindir}", [directory containing ALSA add-on modules]) | ||
12 | ALSA_PLUGIN_DIR="$plugindir" | ||
13 | AC_SUBST(ALSA_PLUGIN_DIR) | ||
14 | |||
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.26.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb index 6f22d06c03..545594466c 100644 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.26.bb +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | DESCRIPTION = "Alsa sound library" | 1 | DESCRIPTION = "ALSA sound library" |
2 | HOMEPAGE = "http://www.alsa-project.org" | 2 | HOMEPAGE = "http://www.alsa-project.org" |
3 | BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php" | 3 | BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php" |
4 | SECTION = "libs/multimedia" | 4 | SECTION = "libs/multimedia" |
@@ -14,16 +14,12 @@ BBCLASSEXTEND = "native nativesdk" | |||
14 | #FIXME: remove the following | 14 | #FIXME: remove the following |
15 | ARM_INSTRUCTION_SET = "arm" | 15 | ARM_INSTRUCTION_SET = "arm" |
16 | 16 | ||
17 | PR = "r0" | ||
18 | |||
19 | SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ | 17 | SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ |
20 | file://fix-tstamp-declaration.patch \ | ||
21 | file://obsolete_automake_macros.patch \ | ||
22 | file://fix-O0-Optimize-unable-inline-function.patch \ | ||
23 | file://Check-if-wordexp-function-is-supported.patch \ | 18 | file://Check-if-wordexp-function-is-supported.patch \ |
19 | file://fix-tstamp-declaration.patch \ | ||
24 | " | 20 | " |
25 | SRC_URI[md5sum] = "2dfa35d28471d721e592b616beedf965" | 21 | SRC_URI[md5sum] = "69129a7c37697f81ac092335e9fa452b" |
26 | SRC_URI[sha256sum] = "8c9f8161603cc3db640619650401292c3e110da63429ab6938aac763319f6e7d" | 22 | SRC_URI[sha256sum] = "690ed393e7efd4fc7e3a2d2cda5449298ca0c895197e5914e350882012430d19" |
27 | 23 | ||
28 | inherit autotools pkgconfig | 24 | inherit autotools pkgconfig |
29 | 25 | ||