Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 26bdd44576f25d63bf32632369b0cbdd94c93d7a / . / meta-raspberrypi / recipes-multimedia / omxplayer / omxplayer / 0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch
blob: d137592cf08ffffa55cb99e58f16bc8bbf5484d2 [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]1From be007b01e7d91f5f83518c0388c16db8dab31d2e Mon Sep 17 00:00:00 2001
Patrick Williams8b8bc412016-08-17 15:02:23 -0500[diff] [blame]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>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]11
Patrick Williams8b8bc412016-08-17 15:02:23 -0500[diff] [blame]12---
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]13 Makefile.ffmpeg | 5 ++++-
14 1 file changed, 4 insertions(+), 1 deletion(-)
Patrick Williams8b8bc412016-08-17 15:02:23 -0500[diff] [blame]15
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]16Index: git/Makefile.ffmpeg
17===================================================================
18--- git.orig/Makefile.ffmpeg
19+++ git/Makefile.ffmpeg
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]20@@ -1,5 +1,7 @@
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]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
Brad Bishop26bdd442019-08-16 17:08:17 -0400[diff] [blame^]23+FFMPEG_EXTRA_CFLAGS?=-mfpu=vfp -mfloat-abi=$(FLOAT)
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]24+
25 WORK=$(PWD)
26
27 .PHONY : all
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]28@@ -20,7 +22,8 @@ configure:
Patrick Williams8b8bc412016-08-17 15:02:23 -0500[diff] [blame]29 CFLAGS="$(CFLAGS) ${INCLUDES}" \
30 LDFLAGS="" \
31 ./configure \
Brad Bishop26bdd442019-08-16 17:08:17 -0400[diff] [blame^]32- --extra-cflags="-mfpu=vfp -mfloat-abi=hard" \
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]33+ --extra-cflags="$(FFMPEG_EXTRA_CFLAGS)" \
Patrick Williams8b8bc412016-08-17 15:02:23 -0500[diff] [blame]34+ --extra-ldflags="$(FFMPEG_EXTRA_LDFLAGS)" \
Patrick Williams8b8bc412016-08-17 15:02:23 -0500[diff] [blame]35 --enable-shared \
36 --disable-static \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]37 --arch=arm \