diff options
Diffstat (limited to 'meta-multimedia')
-rw-r--r-- | meta-multimedia/recipes-multimedia/faac/faac_1.29.9.2.bb (renamed from meta-multimedia/recipes-multimedia/faac/faac_1.29.bb) | 11 | ||||
-rw-r--r-- | meta-multimedia/recipes-multimedia/faac/files/0001-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch | 28 |
2 files changed, 4 insertions, 35 deletions
diff --git a/meta-multimedia/recipes-multimedia/faac/faac_1.29.bb b/meta-multimedia/recipes-multimedia/faac/faac_1.29.9.2.bb index d36f2f48d..278bda9ff 100644 --- a/meta-multimedia/recipes-multimedia/faac/faac_1.29.bb +++ b/meta-multimedia/recipes-multimedia/faac/faac_1.29.9.2.bb | |||
@@ -11,19 +11,16 @@ inherit autotools | |||
11 | 11 | ||
12 | SRC_URI = " \ | 12 | SRC_URI = " \ |
13 | ${SOURCEFORGE_MIRROR}/faac/${BP}.tar.gz \ | 13 | ${SOURCEFORGE_MIRROR}/faac/${BP}.tar.gz \ |
14 | file://0001-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch \ | ||
15 | " | 14 | " |
16 | 15 | ||
17 | SRC_URI[md5sum] = "78603720f655180059d6970c582a3005" | 16 | SRC_URI[md5sum] = "2b58d621fad8fda879f07b7cad8bfe10" |
18 | SRC_URI[sha256sum] = "8cc7b03ceb2722223a6457e95d4c994731d80214a03ba33d1af76ba53f4b3197" | 17 | SRC_URI[sha256sum] = "d45f209d837c49dae6deebcdd87b8cc3b04ea290880358faecf5e7737740c771" |
19 | |||
20 | EXTRA_OECONF += "--without-mp4v2" | ||
21 | 18 | ||
22 | PACKAGES =+ "lib${BPN} lib${BPN}-dev" | 19 | PACKAGES =+ "lib${BPN} lib${BPN}-dev" |
23 | 20 | ||
24 | FILES_${PN} = " ${bindir}/faac " | 21 | FILES_${PN} = " ${bindir}/faac " |
25 | FILES_lib${PN} = " ${libdir}/*.so.*" | 22 | FILES_lib${BPN} = " ${libdir}/*.so.*" |
26 | FILES_lib${PN}-dev = " \ | 23 | FILES_lib${BPN}-dev = " \ |
27 | ${includedir} \ | 24 | ${includedir} \ |
28 | ${libdir}/*.so \ | 25 | ${libdir}/*.so \ |
29 | ${libdir}/*.la \ | 26 | ${libdir}/*.la \ |
diff --git a/meta-multimedia/recipes-multimedia/faac/files/0001-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch b/meta-multimedia/recipes-multimedia/faac/files/0001-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch deleted file mode 100644 index d845ddf59..000000000 --- a/meta-multimedia/recipes-multimedia/faac/files/0001-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From 46cc9298c38b9dd735fec3f39aa2d6e56a362410 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 28 Mar 2017 21:33:36 -0700 | ||
4 | Subject: [PATCH 2/2] mp4v2: Define __STRING if cdefs.h does not exist | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | common/mp4v2/mp4util.h | 4 ++++ | ||
9 | 1 file changed, 4 insertions(+) | ||
10 | |||
11 | diff --git a/common/mp4v2/mp4util.h b/common/mp4v2/mp4util.h | ||
12 | index 1f9cb64..1e7aced 100644 | ||
13 | --- a/common/mp4v2/mp4util.h | ||
14 | +++ b/common/mp4v2/mp4util.h | ||
15 | @@ -23,6 +23,10 @@ | ||
16 | #define __MP4_UTIL_INCLUDED__ | ||
17 | #include <assert.h> | ||
18 | |||
19 | +#ifndef __STRING | ||
20 | +#define __STRING(x) #x | ||
21 | +#endif | ||
22 | + | ||
23 | #ifndef ASSERT | ||
24 | #define ASSERT(expr) \ | ||
25 | if (!(expr)) { \ | ||
26 | -- | ||
27 | 2.12.1 | ||
28 | |||