summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrei Gherzan <andrei@gherzan.ro>2015-01-25 20:25:53 +0200
committerAndrei Gherzan <andrei@gherzan.ro>2015-01-25 20:30:25 +0200
commit2dea23c4fb48897476a57a5653bd03fd12ffaec5 (patch)
tree92e861d64b211883f421200a8524e4b4c6ef6e8e
parent6c6f44136f7e1c97bc45be118a48bd9b1fef1072 (diff)
downloadmeta-raspberrypi-2dea23c4fb48897476a57a5653bd03fd12ffaec5.tar.gz
omxplayer: Add patch to fix lflags and cflags
This patch fixes the following package build break: | arm-poky-linux-gnueabi-gcc is unable to create an executable file. | C compiler test failed. Change-Id: I9f0bf47e4bf969a793718e915fc6c5f4eab012bb Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
-rw-r--r--recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch31
-rw-r--r--recipes-multimedia/omxplayer/omxplayer_git.bb3
2 files changed, 34 insertions, 0 deletions
diff --git a/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch b/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch
new file mode 100644
index 0000000..edb388e
--- /dev/null
+++ b/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch
@@ -0,0 +1,31 @@
1From 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
15diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
16index abe4b26..c9d42d7 100644
17--- a/Makefile.ffmpeg
18+++ b/Makefile.ffmpeg
19@@ -22,7 +22,8 @@ configure:
20 CFLAGS="$(CFLAGS) ${INCLUDES}" \
21 LDFLAGS="" \
22 ./configure \
23- --extra-cflags="-mfpu=vfp -mfloat-abi=$(FLOAT) -mno-apcs-stack-check -mstructure-size-boundary=32 -mno-sched-prolog" \
24+ --extra-cflags="-mfpu=vfp -mfloat-abi=$(FLOAT) -mno-apcs-stack-check -mstructure-size-boundary=32 -mno-sched-prolog $(FFMPEG_EXTRA_CFLAGS)" \
25+ --extra-ldflags="$(FFMPEG_EXTRA_LDFLAGS)" \
26 --enable-cross-compile \
27 --enable-shared \
28 --disable-static \
29--
302.1.0
31
diff --git a/recipes-multimedia/omxplayer/omxplayer_git.bb b/recipes-multimedia/omxplayer/omxplayer_git.bb
index 8f346f5..2c8e4b5 100644
--- a/recipes-multimedia/omxplayer/omxplayer_git.bb
+++ b/recipes-multimedia/omxplayer/omxplayer_git.bb
@@ -15,6 +15,7 @@ SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master
15 file://0001-Remove-Makefile.include-which-includes-hardcoded.patch \ 15 file://0001-Remove-Makefile.include-which-includes-hardcoded.patch \
16 file://0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch \ 16 file://0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch \
17 file://0003-Remove-strip-step-in-Makefile.patch \ 17 file://0003-Remove-strip-step-in-Makefile.patch \
18 file://0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch \
18 file://fix-tar-command-with-DIST.patch \ 19 file://fix-tar-command-with-DIST.patch \
19 " 20 "
20S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
@@ -30,6 +31,8 @@ export TEMPDIR = "${S}/tmp"
30export HOST = "${HOST_SYS}" 31export HOST = "${HOST_SYS}"
31export WORK = "${S}" 32export WORK = "${S}"
32export FLOAT = "${@bb.utils.contains("TUNE_FEATURES", "callconvention-hard", "hard", "softfp", d)}" 33export FLOAT = "${@bb.utils.contains("TUNE_FEATURES", "callconvention-hard", "hard", "softfp", d)}"
34export FFMPEG_EXTRA_CFLAGS = "--sysroot=${STAGING_DIR_TARGET}"
35export FFMPEG_EXTRA_LDFLAGS = "--sysroot=${STAGING_DIR_TARGET}"
33 36
34export LDFLAGS = "-L${S}/ffmpeg_compiled/usr/lib \ 37export LDFLAGS = "-L${S}/ffmpeg_compiled/usr/lib \
35 -L${STAGING_DIR_HOST}/lib \ 38 -L${STAGING_DIR_HOST}/lib \