CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

faac: Fix with with security flags and on musl

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2017-03-28 21:35:20 -07:00 committed by Martin Jansa
parent 09a82e1fb0
commit c2a7f35398
3 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta-multimedia/recipes-multimedia/faac/faac_1.28.bb
View File

@ -9,11 +9,15 @@ inherit autotools-brokensep
SRC_URI = "${SOURCEFORGE_MIRROR}/faac/${BP}.tar.gz \
file://build-fix.patch \
file://address-gcc-6-narrowing-errors.patch \
"
file://0001-frontend-Fix-format-string-security-error.patch \
file://0002-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch \
"
SRC_URI[md5sum] = "80763728d392c7d789cde25614c878f6"
SRC_URI[sha256sum] = "c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df"
EXTRA_OECONF += "--without-mp4v2"
PACKAGES =+ "lib${BPN} lib${BPN}-dev"
FILES_${PN} = " ${bindir}/faac "

26
meta-multimedia/recipes-multimedia/faac/files/0001-frontend-Fix-format-string-security-error.patch Normal file
View File

@ -0,0 +1,26 @@
From c1d7a8b992dc36d0012cc3d54b7d3abf4ad4d5d8 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 28 Mar 2017 21:33:01 -0700
Subject: [PATCH 1/2] frontend: Fix format string security error
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
frontend/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontend/main.c b/frontend/main.c
index 02146a8..cb9329c 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -715,7 +715,7 @@ int main(int argc, char *argv[])
break;
#endif
case 'L':
- fprintf(stderr, faac_copyright_string);
+ fprintf(stderr, "%s", faac_copyright_string);
dieMessage = license;
break;
case 'X':
--
2.12.1

28
meta-multimedia/recipes-multimedia/faac/files/0002-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch Normal file
View File

@ -0,0 +1,28 @@
From 46cc9298c38b9dd735fec3f39aa2d6e56a362410 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 28 Mar 2017 21:33:36 -0700
Subject: [PATCH 2/2] mp4v2: Define __STRING if cdefs.h does not exist
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
common/mp4v2/mp4util.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/mp4v2/mp4util.h b/common/mp4v2/mp4util.h
index 1f9cb64..1e7aced 100644
--- a/common/mp4v2/mp4util.h
+++ b/common/mp4v2/mp4util.h
@@ -23,6 +23,10 @@
#define __MP4_UTIL_INCLUDED__
#include <assert.h>
+#ifndef __STRING
+#define __STRING(x) #x
+#endif
+
#ifndef ASSERT
#define ASSERT(expr) \
if (!(expr)) { \
--
2.12.1