diff options
Diffstat (limited to 'meta/recipes-multimedia/alsa/alsa-lib')
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib/Update-iatomic.h-functions-definitions-for-mips.patch | 68 |
2 files changed, 16 insertions, 83 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 @@ -From 2555c5d62229cf269974f6ec6e4689ab97bbda42 Mon Sep 17 00:00:00 2001 +From e33357b59a10d44e9bec5d24100ce23ca300cc79 Mon Sep 17 00:00:00 2001 From: "Hong H. Pham" <hong.pham@windriver.com> -Date: Tue, 26 Feb 2013 19:40:04 -0500 +Date: Fri, 29 Aug 2014 17:13:55 +0300 Subject: [PATCH] Check if wordexp function is supported eglibc 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 possible that the wordexp() function is not supported). An additional check if wordexp() is supported by the system C library is needed. -Upstream-Status: Pending +Upstream-Status: Inappropriate [configuration] Signed-off-by: Hong H. Pham <hong.pham@windriver.com> +Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> --- - configure.in | 5 ++++- - src/userfile.c | 2 +- + configure.ac | 5 ++++- + src/userfile.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) -diff --git a/configure.in b/configure.in -index 4bcb0d6..ba1c2dd 100644 ---- a/configure.in -+++ b/configure.in -@@ -333,7 +333,10 @@ arm*) - esac +diff --git a/configure.ac b/configure.ac +index b8353a0..773b72f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -311,7 +311,10 @@ fi + AC_SUBST(ALSA_DEPLIBS) - dnl Check for wordexp.h --AC_CHECK_HEADERS([wordexp.h]) -+AC_CHECK_HEADERS([wordexp.h], + dnl Check for headers +-AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h]) ++AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h], + dnl Make sure wordexp is supported by the C library + AC_CHECK_FUNCS([wordexp]) +) @@ -46,5 +47,5 @@ index 3a73836..b8ce809 100644 #include <assert.h> int snd_user_file(const char *file, char **result) -- -1.7.10.4 +1.9.1 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 @@ -Upstream-Status: Backport - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - -From f21f48a70f8437a671b58fcab75e54222a9eea16 Mon Sep 17 00:00:00 2001 -From: Kai Kang <jiashuo.kang at gmail.com> -Date: Thu, 15 Aug 2013 17:17:19 +0800 -Subject: [PATCH] Update iatomic.h functions definitions for mips - -Functions atomic_add(s) and atomic_sub(s) are defined with 'extern -__inline__' that may cause compile fails when cross compile for mips. -The error message looks like: - -| pcm/.libs/libpcm.a(pcm_meter.o): In function `snd_pcm_meter_update_scope': -| .../alsa-lib-1.0.27.2/src/pcm/pcm_meter.c:139: undefined reference to `atomic_sub' - -Replace the 'extern __inline__' with 'static __inline__' to fix this -issue. - -Signed-off-by: Kai Kang <jiashuo.kang at gmail.com> -Signed-off-by: Takashi Iwai <tiwai@suse.de> ---- - include/iatomic.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/include/iatomic.h b/include/iatomic.h -index 5711fe8..2393297 100644 ---- a/include/iatomic.h -+++ b/include/iatomic.h -@@ -720,7 +720,7 @@ typedef struct { volatile int counter; } atomic_t; - * Atomically adds @i to @v. Note that the guaranteed useful range - * of an atomic_t is only 24 bits. - */ --extern __inline__ void atomic_add(int i, atomic_t * v) -+static __inline__ void atomic_add(int i, atomic_t * v) - { - unsigned long temp; - -@@ -744,7 +744,7 @@ extern __inline__ void atomic_add(int i, atomic_t * v) - * Atomically subtracts @i from @v. Note that the guaranteed - * useful range of an atomic_t is only 24 bits. - */ --extern __inline__ void atomic_sub(int i, atomic_t * v) -+static __inline__ void atomic_sub(int i, atomic_t * v) - { - unsigned long temp; - -@@ -763,7 +763,7 @@ extern __inline__ void atomic_sub(int i, atomic_t * v) - /* - * Same as above, but return the result value - */ --extern __inline__ int atomic_add_return(int i, atomic_t * v) -+static __inline__ int atomic_add_return(int i, atomic_t * v) - { - unsigned long temp, result; - -@@ -784,7 +784,7 @@ extern __inline__ int atomic_add_return(int i, atomic_t * v) - return result; - } - --extern __inline__ int atomic_sub_return(int i, atomic_t * v) -+static __inline__ int atomic_sub_return(int i, atomic_t * v) - { - unsigned long temp, result; - --- -1.8.1.2 - |