blob: ea8530defeb522389c73bad1be44b9c4cf010ace [file] [log] [blame]
Patrick Williams8b8bc412016-08-17 15:02:23 -05001From 100982ee1fc1cb571c7453d14f9acd60e67d4765 Mon Sep 17 00:00:00 2001
2From: Andrei Gherzan <andrei.gherzan@windriver.com>
3Date: Sun, 25 Jan 2015 11:13:51 +0200
4Subject: [PATCH] Add FFMPEG_EXTRA_CFLAGS and FFMPEG_EXTRA_LDFLAGS
5
6In this way we can inject flags to LD and CC using
7--extra-cflags and --extra-ldflags.
8
9Upstream-Status: Inappropriate [embedded specific]
10Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
11---
12 Makefile.ffmpeg | 3 ++-
13 1 file changed, 2 insertions(+), 1 deletion(-)
14
Brad Bishop6e60e8b2018-02-01 10:27:11 -050015Index: git/Makefile.ffmpeg
16===================================================================
17--- git.orig/Makefile.ffmpeg
18+++ git/Makefile.ffmpeg
19@@ -1,6 +1,8 @@
20
21 CFLAGS=-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_HAVE_SBRK -D_LARGEFILE64_SOURCE -DHAVE_CMAKE_CONFIG -DHAVE_VMCS_CONFIG -D_REENTRANT -DUSE_VCHIQ_ARM -DVCHI_BULK_ALIGN=1 -DVCHI_BULK_GRANULARITY=1 -DEGL_SERVER_DISPMANX -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D__VIDEOCORE4__ -DGRAPHICS_X_VG=1 -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DOMX -DOMX_SKIP64BIT
22
23+FFMPEG_EXTRA_CFLAGS?=-mfpu=vfp -mfloat-abi=$(FLOAT) -mno-apcs-stack-check -mstructure-size-boundary=32 -mno-sched-prolog
24+
25 WORK=$(PWD)
26
27 .PHONY : all
28@@ -21,7 +23,8 @@ configure:
Patrick Williams8b8bc412016-08-17 15:02:23 -050029 CFLAGS="$(CFLAGS) ${INCLUDES}" \
30 LDFLAGS="" \
31 ./configure \
32- --extra-cflags="-mfpu=vfp -mfloat-abi=$(FLOAT) -mno-apcs-stack-check -mstructure-size-boundary=32 -mno-sched-prolog" \
Brad Bishop6e60e8b2018-02-01 10:27:11 -050033+ --extra-cflags="$(FFMPEG_EXTRA_CFLAGS)" \
Patrick Williams8b8bc412016-08-17 15:02:23 -050034+ --extra-ldflags="$(FFMPEG_EXTRA_LDFLAGS)" \
35 --enable-cross-compile \
36 --enable-shared \
37 --disable-static \