diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 15:02:23 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:34 +0000 |
commit | 8b8bc41cac34759602dc7668df9edb038839b238 (patch) | |
tree | cb5bafb877a39832d5f27534dbf796567d9d78bc /import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch | |
parent | b48b7b4109868a8c0ddda090992e936e821c7ea6 (diff) | |
download | talos-openbmc-8b8bc41cac34759602dc7668df9edb038839b238.tar.gz talos-openbmc-8b8bc41cac34759602dc7668df9edb038839b238.zip |
Squashed 'import-layers/meta-raspberrypi/' content from commit 2745399
Change-Id: I8a89d81813dea98209d089ef500a403ea4da5d9d
git-subtree-dir: import-layers/meta-raspberrypi
git-subtree-split: 2745399f75d7564fcc586d0365ff73be47849d0e
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch')
-rw-r--r-- | import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch b/import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch new file mode 100644 index 000000000..edb388e4f --- /dev/null +++ b/import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch @@ -0,0 +1,31 @@ +From 100982ee1fc1cb571c7453d14f9acd60e67d4765 Mon Sep 17 00:00:00 2001 +From: Andrei Gherzan <andrei.gherzan@windriver.com> +Date: Sun, 25 Jan 2015 11:13:51 +0200 +Subject: [PATCH] Add FFMPEG_EXTRA_CFLAGS and FFMPEG_EXTRA_LDFLAGS + +In this way we can inject flags to LD and CC using +--extra-cflags and --extra-ldflags. + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> +--- + Makefile.ffmpeg | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg +index abe4b26..c9d42d7 100644 +--- a/Makefile.ffmpeg ++++ b/Makefile.ffmpeg +@@ -22,7 +22,8 @@ configure: + CFLAGS="$(CFLAGS) ${INCLUDES}" \ + LDFLAGS="" \ + ./configure \ +- --extra-cflags="-mfpu=vfp -mfloat-abi=$(FLOAT) -mno-apcs-stack-check -mstructure-size-boundary=32 -mno-sched-prolog" \ ++ --extra-cflags="-mfpu=vfp -mfloat-abi=$(FLOAT) -mno-apcs-stack-check -mstructure-size-boundary=32 -mno-sched-prolog $(FFMPEG_EXTRA_CFLAGS)" \ ++ --extra-ldflags="$(FFMPEG_EXTRA_LDFLAGS)" \ + --enable-cross-compile \ + --enable-shared \ + --disable-static \ +-- +2.1.0 + |