omxplayer: Update to 2013-08-20 master's snapshot

* Use DIST for install path as used in package's makefile.
* Set FLOAT based on callconvention-hard TUNE_FEATURE.
* Add an include path to avoid a header error.

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
This commit is contained in:
Andrei Gherzan
2013-08-20 19:42:41 +03:00
parent 78d3a9d68d
commit ca4e4659f6
6 changed files with 161 additions and 88 deletions
+11 -13
View File
@@ -7,29 +7,26 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "libpcre libav virtual/egl boost freetype"
PR = "r0"
PR = "r1"
SRCREV = "231c08b42005e3de565013bc1cee18bd5a349c1f"
SRCREV = "dae98a8bba9dc7410b0621134f6ebdb406adb1bd"
SRC_URI = "git://github.com/huceke/omxplayer.git;protocol=git;branch=master \
file://remove-makefile-include.patch \
file://libraries-are-installed-in-usr-lib.patch \
file://remove-hardcoded-directory-omxplayer-dist.patch \
file://don-t-strip-while-installing.patch \
"
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"
S = "${WORKDIR}/git"
COMPATIBLE_MACHINE = "raspberrypi"
inherit autotools
# Variable added in Makefile to INCLUDE
export ADD_INCDIR = "-I${STAGING_INCDIR}/interface/vcos/pthreads -I${STAGING_INCDIR}/freetype2"
# Needed in ffmpeg configure
export TEMPDIR = "${S}/tmp"
# Needed in configure from Makefile.ffmpeg
# Needed in Makefile.ffmpeg
export HOST = "${HOST_SYS}"
export WORK = "${S}"
export TEMPDIR = "${S}/tmp"
export FLOAT = "softfp"
export FLOAT = "${@bb.utils.contains("TUNE_FEATURES", "callconvention-hard", "hard", "softfp", d)}"
export LDFLAGS = "-L${S}/ffmpeg_compiled/usr/lib \
-L${STAGING_DIR_HOST}/lib \
@@ -39,10 +36,11 @@ export LDFLAGS = "-L${S}/ffmpeg_compiled/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 \
-isystem${STAGING_DIR_HOST}/usr/include/interface/vmcs_host/linux \
"
# Install in ${D}
export DEST = "${D}"
export DIST = "${D}"
do_compile() {
# Needed for compiler test in ffmpeg's configure