mirrors/meta-raspberrypi
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-raspberrypi synced 2026-07-27 07:26:57 +00:00
Code Issues Projects Releases Wiki Activity

omxplayer: Fix build when using vc4graphics driver

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2018-11-07 08:47:26 -08:00
committed by Andrei Gherzan
parent 229363bbac
commit f661406e2d
2 changed files with 57 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes-multimedia/omxplayer/omxplayer_git.bb
+8 -3
View File
@@ -8,6 +8,8 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl libssh libomxil coreutils-native curl-native"
DEPENDS += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", " userland-nogl", "", d)}"
PR = "r4"
SRCREV_default = "7f3faf6cadac913013248de759462bcff92f0102"
@@ -35,11 +37,11 @@ SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master
file://0001-swresample-arm-avoid-conditional-branch-to-PLT-in-TH.patch;patchdir=ffmpeg \
file://0001-rtmpdh-Stop-using-OpenSSL-provided-DH-functions-to-s.patch;patchdir=ffmpeg \
file://cross-crompile-ffmpeg.patch \
file://0001-Fix-build-with-vc4-driver.patch \
"
S = "${WORKDIR}/git"
COMPATIBLE_HOST ?= "null"
COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'null', '(.*)', d)}"
COMPATIBLE_MACHINE = "^rpi$"
def cpu(d):
for arg in (d.getVar('TUNE_CCARGS') or '').split():
@@ -66,11 +68,13 @@ export FFMPEG_EXTRA_CFLAGS = "${TUNE_CCARGS} ${TOOLCHAIN_OPTIONS}"
export FFMPEG_EXTRA_LDFLAGS = "${TUNE_CCARGS} ${TOOLCHAIN_OPTIONS}"
# 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/interface/vcos/pthreads \
export INCLUDES = "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", " -D__GBM__", "", d)} \
-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 \
-isystem${STAGING_DIR_HOST}/usr/include/dbus-1.0 \
@@ -102,3 +106,4 @@ FILES_${PN} = "${bindir}/omxplayer* \
FILES_${PN}-dev += "${libdir}/omxplayer/*.so"
RDEPENDS_${PN} += "bash procps"
RDEPENDS_${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", " userland-nogl", "", d)}"