From f1e2bf782f5906f05dfe7c1a9260ce5b4744f5bc Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Mon, 11 Sep 2017 13:47:59 +0000 Subject: [PATCH] omxplayer: Explain inclusion of ffmpeg Signed-off-by: Paul Barker --- recipes-multimedia/omxplayer/omxplayer_git.bb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/recipes-multimedia/omxplayer/omxplayer_git.bb b/recipes-multimedia/omxplayer/omxplayer_git.bb index 8079a40..db01d74 100644 --- a/recipes-multimedia/omxplayer/omxplayer_git.bb +++ b/recipes-multimedia/omxplayer/omxplayer_git.bb @@ -11,7 +11,16 @@ DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl samba libssh li PR = "r4" SRCREV_default = "b8ff59dccd9307f10dad71bec2525a95bd6c603b" + +# 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 +# want to keep control of the exact version of ffmpeg used instead of just +# 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" + 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 \