Skip to contentSkip to conversation

omxplayer: Add patch to fix lflags and cflags

PATCH In review Andrei Gherzan 1 participant 3 messages Jan 25, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 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
---
 ...PEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch | 31 ++++++++++++++++++++++
 recipes-multimedia/omxplayer/omxplayer_git.bb      |  3 +++
 2 files changed, 34 insertions(+)
 create mode 100644 recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch
recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch new file +31 -0
new file mode 100644
index 0000000..edb388e
@@ -0,0 +1,31 @@
+From 100982ee1fc1cb571c7453d14f9acd60e67d4765 Mon Sep 17 00:00:00 2001
+From: Andrei Gherzan <[email protected]>
+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 <[email protected]>
+---
+ 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
+
recipes-multimedia/omxplayer/omxplayer_git.bb +3 -0
index 8f346f5..2c8e4b5 100644
@@ -15,6 +15,7 @@ SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master
            file://0001-Remove-Makefile.include-which-includes-hardcoded.patch \
            file://0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch \
            file://0003-Remove-strip-step-in-Makefile.patch \
+           file://0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch \
            file://fix-tar-command-with-DIST.patch \
            "
 S = "${WORKDIR}/git"
@@ -30,6 +31,8 @@ export TEMPDIR = "${S}/tmp"
 export HOST = "${HOST_SYS}"
 export WORK = "${S}"
 export FLOAT = "${@bb.utils.contains("TUNE_FEATURES", "callconvention-hard", "hard", "softfp", d)}"
+export FFMPEG_EXTRA_CFLAGS  = "--sysroot=${STAGING_DIR_TARGET}"
+export FFMPEG_EXTRA_LDFLAGS = "--sysroot=${STAGING_DIR_TARGET}"
 
 export LDFLAGS = "-L${S}/ffmpeg_compiled/usr/lib \
                   -L${STAGING_DIR_HOST}/lib \
Signature · 1 line
2.1.0
#1 lore raw

PATCH 2/2 omxplayer: Minor tweaks

Change-Id Ic88656f2efba3d976918a4c556931b294bd00ed5
---
 recipes-multimedia/omxplayer/omxplayer_git.bb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
recipes-multimedia/omxplayer/omxplayer_git.bb +1 -3
index 2c8e4b5..41ef339 100644
@@ -34,11 +34,11 @@ export FLOAT = "${@bb.utils.contains("TUNE_FEATURES", "callconvention-hard", "ha
 export FFMPEG_EXTRA_CFLAGS  = "--sysroot=${STAGING_DIR_TARGET}"
 export FFMPEG_EXTRA_LDFLAGS = "--sysroot=${STAGING_DIR_TARGET}"
 
+# Needed in top Makefile
 export LDFLAGS = "-L${S}/ffmpeg_compiled/usr/lib \
                   -L${STAGING_DIR_HOST}/lib \
                   -L${STAGING_DIR_HOST}/usr/lib \
                  "
-
 export INCLUDES = "-isystem${STAGING_DIR_HOST}/usr/include \
                    -isystem${STAGING_DIR_HOST}/usr/include/interface/vcos/pthreads \
                    -isystem${STAGING_DIR_HOST}/usr/include/freetype2 \
@@ -46,8 +46,6 @@ export INCLUDES = "-isystem${STAGING_DIR_HOST}/usr/include \
                    -isystem${STAGING_DIR_HOST}/usr/include/dbus-1.0 \
                    -isystem${STAGING_DIR_HOST}/usr/lib/dbus-1.0/include \
                   "
-
-# Install in ${D}
 export DIST = "${D}"
 
 do_compile() {
Signature · 1 line
2.1.0
#2 lore raw
In reply to Andrei Gherzan
Quoted 3 lines · Andrei Gherzan

This patch fixes the following package build break:
| arm-poky-linux-gnueabi-gcc is unable to create an executable file. | C compiler test failed.

Both patches merged.

Signature · 1 line
*Andrei Gherzan*