diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-03-28 21:35:20 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-04-05 19:28:28 +0200 |
commit | c2a7f35398b366e1af04e502708990d0337f3268 (patch) | |
tree | c3391eddb945246a1aa8beb3ff736a968f279f61 /meta-multimedia | |
parent | 09a82e1fb029bbfacf56ff960e026d800a6047bc (diff) | |
download | meta-openembedded-c2a7f35398b366e1af04e502708990d0337f3268.tar.gz |
faac: Fix with with security flags and on musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-multimedia')
3 files changed, 59 insertions, 1 deletions
diff --git a/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb b/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb index 2f048af0e..5c9477f18 100644 --- a/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb +++ b/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb | |||
@@ -9,11 +9,15 @@ inherit autotools-brokensep | |||
9 | SRC_URI = "${SOURCEFORGE_MIRROR}/faac/${BP}.tar.gz \ | 9 | SRC_URI = "${SOURCEFORGE_MIRROR}/faac/${BP}.tar.gz \ |
10 | file://build-fix.patch \ | 10 | file://build-fix.patch \ |
11 | file://address-gcc-6-narrowing-errors.patch \ | 11 | file://address-gcc-6-narrowing-errors.patch \ |
12 | " | 12 | file://0001-frontend-Fix-format-string-security-error.patch \ |
13 | file://0002-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch \ | ||
14 | " | ||
13 | 15 | ||
14 | SRC_URI[md5sum] = "80763728d392c7d789cde25614c878f6" | 16 | SRC_URI[md5sum] = "80763728d392c7d789cde25614c878f6" |
15 | SRC_URI[sha256sum] = "c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df" | 17 | SRC_URI[sha256sum] = "c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df" |
16 | 18 | ||
19 | EXTRA_OECONF += "--without-mp4v2" | ||
20 | |||
17 | PACKAGES =+ "lib${BPN} lib${BPN}-dev" | 21 | PACKAGES =+ "lib${BPN} lib${BPN}-dev" |
18 | 22 | ||
19 | FILES_${PN} = " ${bindir}/faac " | 23 | FILES_${PN} = " ${bindir}/faac " |
diff --git a/meta-multimedia/recipes-multimedia/faac/files/0001-frontend-Fix-format-string-security-error.patch b/meta-multimedia/recipes-multimedia/faac/files/0001-frontend-Fix-format-string-security-error.patch new file mode 100644 index 000000000..75e003eac --- /dev/null +++ b/meta-multimedia/recipes-multimedia/faac/files/0001-frontend-Fix-format-string-security-error.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From c1d7a8b992dc36d0012cc3d54b7d3abf4ad4d5d8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 28 Mar 2017 21:33:01 -0700 | ||
4 | Subject: [PATCH 1/2] frontend: Fix format string security error | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | frontend/main.c | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/frontend/main.c b/frontend/main.c | ||
12 | index 02146a8..cb9329c 100644 | ||
13 | --- a/frontend/main.c | ||
14 | +++ b/frontend/main.c | ||
15 | @@ -715,7 +715,7 @@ int main(int argc, char *argv[]) | ||
16 | break; | ||
17 | #endif | ||
18 | case 'L': | ||
19 | - fprintf(stderr, faac_copyright_string); | ||
20 | + fprintf(stderr, "%s", faac_copyright_string); | ||
21 | dieMessage = license; | ||
22 | break; | ||
23 | case 'X': | ||
24 | -- | ||
25 | 2.12.1 | ||
26 | |||
diff --git a/meta-multimedia/recipes-multimedia/faac/files/0002-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch b/meta-multimedia/recipes-multimedia/faac/files/0002-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch new file mode 100644 index 000000000..d845ddf59 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/faac/files/0002-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch | |||
@@ -0,0 +1,28 @@ | |||
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 | |||