diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch | 45 | ||||
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch | 14 | ||||
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb (renamed from meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb) | 5 |
3 files changed, 9 insertions, 55 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch deleted file mode 100644 index 583bc3daab..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From 17aeb3565f411e7796cabe403f92d15948a8ca95 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 21 Aug 2015 14:42:45 -0700 | ||
4 | Subject: [PATCH] build: Do not try to detect cross-compiler | ||
5 | |||
6 | cross compilers are passed via path may not be a gcc based cross | ||
7 | compiler in such cases this check fails and try's to force gcc based | ||
8 | cross compiler detection, This code is a convenience that limits the | ||
9 | build system | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | Upstream-Status: Pending | ||
14 | |||
15 | configure.ac | 14 -------------- | ||
16 | 1 file changed, 14 deletions(-) | ||
17 | |||
18 | diff --git a/configure.ac b/configure.ac | ||
19 | index 3022cf8..9d77440 100644 | ||
20 | --- a/configure.ac | ||
21 | +++ b/configure.ac | ||
22 | @@ -27,20 +27,6 @@ AC_PREFIX_DEFAULT(/usr) | ||
23 | |||
24 | dnl Checks for programs. | ||
25 | |||
26 | -dnl try to gues cross-compiler if not set | ||
27 | -if test "x$host" != "x$build" -a -z "`echo $CC | grep -e '-gcc'`"; | ||
28 | -then | ||
29 | - AC_MSG_CHECKING(for cross-compiler) | ||
30 | - | ||
31 | - which ${program_prefix}gcc >/dev/null 2>&1 && CC=${program_prefix}gcc | ||
32 | - which ${host_cpu}-${host_os}-gcc >/dev/null 2>&1 \ | ||
33 | - && CC=${host_cpu}-${host_os}-gcc | ||
34 | - which ${host_cpu}-${host_vendor}-${host_os}-gcc >/dev/null 2>&1 \ | ||
35 | - && CC=${host_cpu}-${host_vendor}-${host_os}-gcc | ||
36 | - | ||
37 | - AC_MSG_RESULT($CC) | ||
38 | -fi | ||
39 | - | ||
40 | CFLAGS="$CFLAGS -D_GNU_SOURCE" | ||
41 | |||
42 | |||
43 | -- | ||
44 | 2.1.4 | ||
45 | |||
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 75a6eb8a3c..795e48ab2e 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,4 +1,4 @@ | |||
1 | From e33357b59a10d44e9bec5d24100ce23ca300cc79 Mon Sep 17 00:00:00 2001 | 1 | From 3408f8e78776b12f131e433749721602f87e0a70 Mon Sep 17 00:00:00 2001 |
2 | From: "Hong H. Pham" <hong.pham@windriver.com> | 2 | From: "Hong H. Pham" <hong.pham@windriver.com> |
3 | Date: Fri, 29 Aug 2014 17:13:55 +0300 | 3 | Date: Fri, 29 Aug 2014 17:13:55 +0300 |
4 | Subject: [PATCH] Check if wordexp function is supported | 4 | Subject: [PATCH] Check if wordexp function is supported |
@@ -18,15 +18,15 @@ Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> | |||
18 | 2 files changed, 5 insertions(+), 2 deletions(-) | 18 | 2 files changed, 5 insertions(+), 2 deletions(-) |
19 | 19 | ||
20 | diff --git a/configure.ac b/configure.ac | 20 | diff --git a/configure.ac b/configure.ac |
21 | index b8353a0..773b72f 100644 | 21 | index 9490d39..b08a90a 100644 |
22 | --- a/configure.ac | 22 | --- a/configure.ac |
23 | +++ b/configure.ac | 23 | +++ b/configure.ac |
24 | @@ -311,7 +311,10 @@ fi | 24 | @@ -295,7 +295,10 @@ fi |
25 | AC_SUBST(ALSA_DEPLIBS) | 25 | AC_SUBST(ALSA_DEPLIBS) |
26 | 26 | ||
27 | dnl Check for headers | 27 | dnl Check for headers |
28 | -AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h]) | 28 | -AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h sys/shm.h]) |
29 | +AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h], | 29 | +AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h sys/shm.h], |
30 | + dnl Make sure wordexp is supported by the C library | 30 | + dnl Make sure wordexp is supported by the C library |
31 | + AC_CHECK_FUNCS([wordexp]) | 31 | + AC_CHECK_FUNCS([wordexp]) |
32 | +) | 32 | +) |
@@ -34,7 +34,7 @@ index b8353a0..773b72f 100644 | |||
34 | dnl Check for resmgr support... | 34 | dnl Check for resmgr support... |
35 | AC_MSG_CHECKING(for resmgr support) | 35 | AC_MSG_CHECKING(for resmgr support) |
36 | diff --git a/src/userfile.c b/src/userfile.c | 36 | diff --git a/src/userfile.c b/src/userfile.c |
37 | index 3a73836..b8ce809 100644 | 37 | index 72779da..e9d13e6 100644 |
38 | --- a/src/userfile.c | 38 | --- a/src/userfile.c |
39 | +++ b/src/userfile.c | 39 | +++ b/src/userfile.c |
40 | @@ -32,7 +32,7 @@ | 40 | @@ -32,7 +32,7 @@ |
@@ -47,5 +47,5 @@ index 3a73836..b8ce809 100644 | |||
47 | #include <assert.h> | 47 | #include <assert.h> |
48 | int snd_user_file(const char *file, char **result) | 48 | int snd_user_file(const char *file, char **result) |
49 | -- | 49 | -- |
50 | 1.9.1 | 50 | 2.6.4 |
51 | 51 | ||
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb index 8eaeff4b2a..d62c1fc31c 100644 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb | |||
@@ -16,10 +16,9 @@ ARM_INSTRUCTION_SET = "arm" | |||
16 | 16 | ||
17 | SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2 \ | 17 | SRC_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://0001-build-Do-not-try-to-detect-cross-compiler.patch \ | ||
20 | " | 19 | " |
21 | SRC_URI[md5sum] = "de67e0eca72474d6b1121037dafe1024" | 20 | SRC_URI[md5sum] = "69515ca73c3c4a212ef45160dea846c1" |
22 | SRC_URI[sha256sum] = "73043c35eb9636be0f4af6a240235c213f12a25feb1f04aeeac8cb7e30fcbdd0" | 21 | SRC_URI[sha256sum] = "dfde65d11e82b68f82e562ab6228c1fb7c78854345d3c57e2c68a9dd3dae1f15" |
23 | 22 | ||
24 | inherit autotools pkgconfig | 23 | inherit autotools pkgconfig |
25 | 24 | ||