From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- .../recipes-multimedia/omxplayer/omxplayer_git.bb | 35 +++++++++++++++------- 1 file changed, 24 insertions(+), 11 deletions(-) (limited to 'meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb') diff --git a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb index 1df41a5b1..aad2fed04 100644 --- a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb +++ b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb @@ -7,10 +7,11 @@ SECTION = "console/utils" 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 = "libpcre libav virtual/egl boost freetype dbus openssl libssh libomxil coreutils-native curl-native userland" + PR = "r4" -SRCREV_default = "b8ff59dccd9307f10dad71bec2525a95bd6c603b" +SRCREV_default = "b4bbef8fac5e8c2ddafa895f98456ba715b39c6b" # omxplayer builds its own copy of ffmpeg from source instead of using the # system's ffmpeg library. This isn't ideal but it's ok for now. We do however @@ -18,12 +19,11 @@ SRCREV_default = "b8ff59dccd9307f10dad71bec2525a95bd6c603b" # fetching the latest commit on a release branch (which is what the checkout job # in Makefile.ffmpeg in the omxplayer source tree does). # -# This SRCREV corresponds to the v3.1.10 release of ffmpeg. -SRCREV_ffmpeg = "afa34cb36edca0ff809b7e58474bbce12271ecba" +# This SRCREV corresponds to the v4.0.3 release of ffmpeg. +SRCREV_ffmpeg = "fcbd117df3077bad495e99e20f01cf93737bce76" SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master \ - git://source.ffmpeg.org/ffmpeg;branch=release/3.1;protocol=git;depth=1;name=ffmpeg;destsuffix=git/ffmpeg \ - file://0001-Remove-Makefile.include-which-includes-hardcoded.patch \ + git://github.com/FFmpeg/FFmpeg;branch=release/4.0;protocol=git;depth=1;name=ffmpeg;destsuffix=git/ffmpeg \ 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 \ @@ -31,12 +31,23 @@ SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master file://use-native-pkg-config.patch \ file://0005-Don-t-require-internet-connection-during-build.patch \ file://0006-Prevent-ffmpeg-configure-compile-race-condition.patch \ + file://0001-Specify-cc-cxx-and-ld-variables-from-environment.patch \ + file://cross-crompile-ffmpeg.patch \ " + +SRC_URI_append = "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", " file://0001-Fix-build-with-vc4-driver.patch ", "", d)}" + S = "${WORKDIR}/git" -COMPATIBLE_MACHINE ?= "null" -COMPATIBLE_MACHINE_rpi_aarch64 = "null" -COMPATIBLE_MACHINE_rpi = "(.*)" +COMPATIBLE_MACHINE = "^rpi$" + +def cpu(d): + for arg in (d.getVar('TUNE_CCARGS') or '').split(): + if arg.startswith('-mcpu='): + return arg[6:] + return 'generic' + +export CPU = "${@cpu(d)}" inherit autotools-brokensep pkgconfig @@ -55,11 +66,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 \ @@ -90,4 +103,4 @@ FILES_${PN} = "${bindir}/omxplayer* \ FILES_${PN}-dev += "${libdir}/omxplayer/*.so" -RDEPENDS_${PN} += "bash procps" +RDEPENDS_${PN} += "bash procps userland" -- cgit v1.2.3