summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2014-08-29 20:06:32 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-31 23:40:47 +0100
commitb72ce8202439d8fdb8a9129bec82359edb954133 (patch)
tree5bae0263a406a077aac2c2fd528959113be2ef89 /meta
parentcc0a0614e873ecdd08c704147361db2a7fff55ca (diff)
downloadpoky-b72ce8202439d8fdb8a9129bec82359edb954133.tar.gz
alsa-lib: upgrade to 1.0.28
Changelog: http://www.alsa-project.org/main/index.php/Changes_v1.0.27.2_v1.0.28 Update-iatomic.h-functions-definitions-for-mips.patch removed, integrated upstream. Check-if-wordexp-function-is-supported.patch updated. (From OE-Core rev: 736dc0abd22be122cac053e8934e8bfd5b82eec0) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch31
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib/Update-iatomic.h-functions-definitions-for-mips.patch68
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib_1.0.28.bb (renamed from meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb)7
3 files changed, 19 insertions, 87 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch b/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch
index 41b3c23a40..75a6eb8a3c 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch
+++ b/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch
@@ -1,6 +1,6 @@
1From 2555c5d62229cf269974f6ec6e4689ab97bbda42 Mon Sep 17 00:00:00 2001 1From e33357b59a10d44e9bec5d24100ce23ca300cc79 Mon Sep 17 00:00:00 2001
2From: "Hong H. Pham" <hong.pham@windriver.com> 2From: "Hong H. Pham" <hong.pham@windriver.com>
3Date: Tue, 26 Feb 2013 19:40:04 -0500 3Date: Fri, 29 Aug 2014 17:13:55 +0300
4Subject: [PATCH] Check if wordexp function is supported 4Subject: [PATCH] Check if wordexp function is supported
5 5
6eglibc could be configured to build without wordexp, so it is not enough 6eglibc could be configured to build without wordexp, so it is not enough
@@ -8,24 +8,25 @@ to check if wordexp.h exists (the header file could be installed, but it's
8possible that the wordexp() function is not supported). An additional 8possible that the wordexp() function is not supported). An additional
9check if wordexp() is supported by the system C library is needed. 9check if wordexp() is supported by the system C library is needed.
10 10
11Upstream-Status: Pending 11Upstream-Status: Inappropriate [configuration]
12 12
13Signed-off-by: Hong H. Pham <hong.pham@windriver.com> 13Signed-off-by: Hong H. Pham <hong.pham@windriver.com>
14Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
14--- 15---
15 configure.in | 5 ++++- 16 configure.ac | 5 ++++-
16 src/userfile.c | 2 +- 17 src/userfile.c | 2 +-
17 2 files changed, 5 insertions(+), 2 deletions(-) 18 2 files changed, 5 insertions(+), 2 deletions(-)
18 19
19diff --git a/configure.in b/configure.in 20diff --git a/configure.ac b/configure.ac
20index 4bcb0d6..ba1c2dd 100644 21index b8353a0..773b72f 100644
21--- a/configure.in 22--- a/configure.ac
22+++ b/configure.in 23+++ b/configure.ac
23@@ -333,7 +333,10 @@ arm*) 24@@ -311,7 +311,10 @@ fi
24 esac 25 AC_SUBST(ALSA_DEPLIBS)
25 26
26 dnl Check for wordexp.h 27 dnl Check for headers
27-AC_CHECK_HEADERS([wordexp.h]) 28-AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h])
28+AC_CHECK_HEADERS([wordexp.h], 29+AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h],
29+ dnl Make sure wordexp is supported by the C library 30+ dnl Make sure wordexp is supported by the C library
30+ AC_CHECK_FUNCS([wordexp]) 31+ AC_CHECK_FUNCS([wordexp])
31+) 32+)
@@ -46,5 +47,5 @@ index 3a73836..b8ce809 100644
46 #include <assert.h> 47 #include <assert.h>
47 int snd_user_file(const char *file, char **result) 48 int snd_user_file(const char *file, char **result)
48-- 49--
491.7.10.4 501.9.1
50 51
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/Update-iatomic.h-functions-definitions-for-mips.patch b/meta/recipes-multimedia/alsa/alsa-lib/Update-iatomic.h-functions-definitions-for-mips.patch
deleted file mode 100644
index f1a7947c2b..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-lib/Update-iatomic.h-functions-definitions-for-mips.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1Upstream-Status: Backport
2
3Signed-off-by: Kai Kang <kai.kang@windriver.com>
4
5From f21f48a70f8437a671b58fcab75e54222a9eea16 Mon Sep 17 00:00:00 2001
6From: Kai Kang <jiashuo.kang at gmail.com>
7Date: Thu, 15 Aug 2013 17:17:19 +0800
8Subject: [PATCH] Update iatomic.h functions definitions for mips
9
10Functions atomic_add(s) and atomic_sub(s) are defined with 'extern
11__inline__' that may cause compile fails when cross compile for mips.
12The error message looks like:
13
14| pcm/.libs/libpcm.a(pcm_meter.o): In function `snd_pcm_meter_update_scope':
15| .../alsa-lib-1.0.27.2/src/pcm/pcm_meter.c:139: undefined reference to `atomic_sub'
16
17Replace the 'extern __inline__' with 'static __inline__' to fix this
18issue.
19
20Signed-off-by: Kai Kang <jiashuo.kang at gmail.com>
21Signed-off-by: Takashi Iwai <tiwai@suse.de>
22---
23 include/iatomic.h | 8 ++++----
24 1 file changed, 4 insertions(+), 4 deletions(-)
25
26diff --git a/include/iatomic.h b/include/iatomic.h
27index 5711fe8..2393297 100644
28--- a/include/iatomic.h
29+++ b/include/iatomic.h
30@@ -720,7 +720,7 @@ typedef struct { volatile int counter; } atomic_t;
31 * Atomically adds @i to @v. Note that the guaranteed useful range
32 * of an atomic_t is only 24 bits.
33 */
34-extern __inline__ void atomic_add(int i, atomic_t * v)
35+static __inline__ void atomic_add(int i, atomic_t * v)
36 {
37 unsigned long temp;
38
39@@ -744,7 +744,7 @@ extern __inline__ void atomic_add(int i, atomic_t * v)
40 * Atomically subtracts @i from @v. Note that the guaranteed
41 * useful range of an atomic_t is only 24 bits.
42 */
43-extern __inline__ void atomic_sub(int i, atomic_t * v)
44+static __inline__ void atomic_sub(int i, atomic_t * v)
45 {
46 unsigned long temp;
47
48@@ -763,7 +763,7 @@ extern __inline__ void atomic_sub(int i, atomic_t * v)
49 /*
50 * Same as above, but return the result value
51 */
52-extern __inline__ int atomic_add_return(int i, atomic_t * v)
53+static __inline__ int atomic_add_return(int i, atomic_t * v)
54 {
55 unsigned long temp, result;
56
57@@ -784,7 +784,7 @@ extern __inline__ int atomic_add_return(int i, atomic_t * v)
58 return result;
59 }
60
61-extern __inline__ int atomic_sub_return(int i, atomic_t * v)
62+static __inline__ int atomic_sub_return(int i, atomic_t * v)
63 {
64 unsigned long temp, result;
65
66--
671.8.1.2
68
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.28.bb
index fc0847d3a2..d509da29f4 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.0.28.bb
@@ -14,16 +14,15 @@ BBCLASSEXTEND = "native nativesdk"
14#FIXME: remove the following 14#FIXME: remove the following
15ARM_INSTRUCTION_SET = "arm" 15ARM_INSTRUCTION_SET = "arm"
16 16
17SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ 17SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2 \
18 file://Check-if-wordexp-function-is-supported.patch \ 18 file://Check-if-wordexp-function-is-supported.patch \
19 file://fix-tstamp-declaration.patch \ 19 file://fix-tstamp-declaration.patch \
20 file://Update-iatomic.h-functions-definitions-for-mips.patch \
21 file://0001-pcm-route-Use-get32-for-multi-source-route-calculati.patch \ 20 file://0001-pcm-route-Use-get32-for-multi-source-route-calculati.patch \
22 file://0001-pcm-rate-fix-hw_ptr-exceed-the-boundary.patch \ 21 file://0001-pcm-rate-fix-hw_ptr-exceed-the-boundary.patch \
23 file://0001-pcm-pcm_local.h-include-time.h-to-enable-CLOCK_MONOT.patch \ 22 file://0001-pcm-pcm_local.h-include-time.h-to-enable-CLOCK_MONOT.patch \
24" 23"
25SRC_URI[md5sum] = "69129a7c37697f81ac092335e9fa452b" 24SRC_URI[md5sum] = "c9e21b88a2b3e6e12ea7ba0f3b271fc3"
26SRC_URI[sha256sum] = "690ed393e7efd4fc7e3a2d2cda5449298ca0c895197e5914e350882012430d19" 25SRC_URI[sha256sum] = "3c074b85dde1b30e78ef4995579765833e5b693fbbd8f834c335e080cb734a6d"
27 26
28inherit autotools pkgconfig 27inherit autotools pkgconfig
29 28