diff options
Diffstat (limited to 'recipes-multimedia/omxplayer')
9 files changed, 33 insertions, 23 deletions
diff --git a/recipes-multimedia/omxplayer/omxplayer/0001-Fix-build-with-vc4-driver.patch b/recipes-multimedia/omxplayer/omxplayer/0001-Fix-build-with-vc4-driver.patch index 37d0724..f65c421 100644 --- a/recipes-multimedia/omxplayer/omxplayer/0001-Fix-build-with-vc4-driver.patch +++ b/recipes-multimedia/omxplayer/omxplayer/0001-Fix-build-with-vc4-driver.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Fix build with vc4 driver Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + SubtitleRenderer.cpp | 7 ++++++- SubtitleRenderer.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/recipes-multimedia/omxplayer/omxplayer/0001-Specify-cc-cxx-and-ld-variables-from-environment.patch b/recipes-multimedia/omxplayer/omxplayer/0001-Specify-cc-cxx-and-ld-variables-from-environment.patch index 82dfd3e..9e12bf3 100644 --- a/recipes-multimedia/omxplayer/omxplayer/0001-Specify-cc-cxx-and-ld-variables-from-environment.patch +++ b/recipes-multimedia/omxplayer/omxplayer/0001-Specify-cc-cxx-and-ld-variables-from-environment.patch @@ -7,6 +7,8 @@ This helps in compiling with non-gcc compilers Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile.ffmpeg | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch b/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch index dd1d4f3..e494650 100644 --- a/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch +++ b/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch @@ -15,10 +15,8 @@ Signed-off-by: Jonathan Liu <net147@gmail.com> Makefile.ffmpeg | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) -Index: git/Makefile -=================================================================== ---- git.orig/Makefile -+++ git/Makefile +--- a/Makefile ++++ b/Makefile @@ -2,9 +2,9 @@ CFLAGS=-pipe -mfloat-abi=hard -mcpu=arm1 CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST @@ -27,11 +25,11 @@ Index: git/Makefile +LDFLAGS+=-L./ -Lffmpeg_compiled/usr/lib/ -lc -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound -INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include -I/usr/include/freetype2 -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -+INCLUDES+=-I./ -Ilinux ++INCLUDES+=-I./ -Ilinux -I./ffmpeg DIST ?= omxplayer-dist STRIP ?= strip -@@ -90,7 +90,7 @@ dist: omxplayer.bin omxplayer.1 +@@ -91,7 +91,7 @@ dist: omxplayer.bin omxplayer.1 cp COPYING $(DIST)/usr/share/doc/omxplayer cp README.md $(DIST)/usr/share/doc/omxplayer/README cp omxplayer.1 $(DIST)/usr/share/man/man1 @@ -40,10 +38,8 @@ Index: git/Makefile cd $(DIST); tar -czf ../$(DIST).tgz * install: -Index: git/Makefile.ffmpeg -=================================================================== ---- git.orig/Makefile.ffmpeg -+++ git/Makefile.ffmpeg +--- a/Makefile.ffmpeg ++++ b/Makefile.ffmpeg @@ -238,7 +238,8 @@ configure: --disable-decoder=xbin \ --disable-decoder=idf \ diff --git a/recipes-multimedia/omxplayer/omxplayer/0005-Don-t-require-internet-connection-during-build.patch b/recipes-multimedia/omxplayer/omxplayer/0005-Don-t-require-internet-connection-during-build.patch index f6abd7b..0dd8c62 100644 --- a/recipes-multimedia/omxplayer/omxplayer/0005-Don-t-require-internet-connection-during-build.patch +++ b/recipes-multimedia/omxplayer/omxplayer/0005-Don-t-require-internet-connection-during-build.patch @@ -10,7 +10,7 @@ The following issues break offline builds: * Makefile.ffmpeg explicitly does a "git clone" from the internet. Signed-off-by: Paul Barker <pbarker@toganlabs.com> -Upstream-status: Inappropriate +Upstream-Status: Inappropriate --- Makefile | 6 ++---- diff --git a/recipes-multimedia/omxplayer/omxplayer/0006-Prevent-ffmpeg-configure-compile-race-condition.patch b/recipes-multimedia/omxplayer/omxplayer/0006-Prevent-ffmpeg-configure-compile-race-condition.patch index 890adde..81dab07 100644 --- a/recipes-multimedia/omxplayer/omxplayer/0006-Prevent-ffmpeg-configure-compile-race-condition.patch +++ b/recipes-multimedia/omxplayer/omxplayer/0006-Prevent-ffmpeg-configure-compile-race-condition.patch @@ -7,7 +7,7 @@ Additional dependency information is needed in Makefile.ffmpeg to ensure that the configure stage is finished before the compile stage starts. Signed-off-by: Paul Barker <pbarker@toganlabs.com> -Upstream-status: Pending +Upstream-Status: Pending --- Makefile.ffmpeg | 4 ++-- diff --git a/recipes-multimedia/omxplayer/omxplayer/0007-Remove-Makefile-hardcoded-arch-tune.patch b/recipes-multimedia/omxplayer/omxplayer/0007-Remove-Makefile-hardcoded-arch-tune.patch index a8c51d5..02844db 100644 --- a/recipes-multimedia/omxplayer/omxplayer/0007-Remove-Makefile-hardcoded-arch-tune.patch +++ b/recipes-multimedia/omxplayer/omxplayer/0007-Remove-Makefile-hardcoded-arch-tune.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/Makefile 2019-06-20 15:04:53.390282996 +0200 +++ b/Makefile 2019-06-20 15:03:45.538763872 +0200 @@ -1,4 +1,4 @@ diff --git a/recipes-multimedia/omxplayer/omxplayer/cross-crompile-ffmpeg.patch b/recipes-multimedia/omxplayer/omxplayer/cross-crompile-ffmpeg.patch index 20ed7c7..5d7e1e0 100644 --- a/recipes-multimedia/omxplayer/omxplayer/cross-crompile-ffmpeg.patch +++ b/recipes-multimedia/omxplayer/omxplayer/cross-crompile-ffmpeg.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: git/Makefile.ffmpeg =================================================================== --- git.orig/Makefile.ffmpeg diff --git a/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch b/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch index e580470..e778561 100644 --- a/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch +++ b/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch @@ -9,6 +9,8 @@ to the default value which obviously is wrong. Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> --- +Upstream-Status: Pending + Makefile.ffmpeg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-multimedia/omxplayer/omxplayer_git.bb b/recipes-multimedia/omxplayer/omxplayer_git.bb index 55e5a1c..b7eaf40 100644 --- a/recipes-multimedia/omxplayer/omxplayer_git.bb +++ b/recipes-multimedia/omxplayer/omxplayer_git.bb @@ -4,14 +4,16 @@ Raspberry PI implementation and is quite handy to use standalone" HOMEPAGE = "https://github.com/popcornmix/omxplayer" SECTION = "console/utils" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=00a27da7ac0f9bcd17320ec29ef4bbf6" -DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl libssh virtual/libomxil coreutils-native curl-native userland" +DEPENDS = "alsa-lib libpcre virtual/egl boost freetype dbus openssl libssh virtual/libomxil coreutils-native curl-native userland" -PR = "r5" +PR = "r6" -SRCREV_default = "f543a0d0e707ab56415f17b0ca6d397394ee8b63" +SRCREV_FORMAT = "_ffmpeg" + +SRCREV_default = "1f1d0ccd65d3a1caa86dc79d2863a8f067c8e3f8" # 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 @@ -22,8 +24,8 @@ SRCREV_default = "f543a0d0e707ab56415f17b0ca6d397394ee8b63" # 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://github.com/FFmpeg/FFmpeg;branch=release/4.0;protocol=git;depth=1;name=ffmpeg;destsuffix=git/ffmpeg \ +SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=https;branch=master \ + git://github.com/FFmpeg/FFmpeg;branch=release/4.0;protocol=https;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 \ @@ -36,12 +38,12 @@ SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=git;branch=master file://0007-Remove-Makefile-hardcoded-arch-tune.patch \ " -SRC_URI_append = "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", " file://0001-Fix-build-with-vc4-driver.patch ", "", d)}" +SRC_URI:append = "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", " file://0001-Fix-build-with-vc4-driver.patch ", "", d)}" S = "${WORKDIR}/git" COMPATIBLE_MACHINE = "^rpi$" -COMPATIBLE_HOST_aarch64 = "null" +COMPATIBLE_HOST:aarch64 = "null" def cpu(d): for arg in (d.getVar('TUNE_CCARGS') or '').split(): @@ -83,6 +85,8 @@ export INCLUDES = "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", " -D_ export DIST = "${D}" do_compile() { + bbwarn "omxplayer is being deprecated and resources are directed at improving vlc." + # Needed for compiler test in ffmpeg's configure mkdir -p tmp @@ -99,10 +103,10 @@ do_install() { install ${S}/fonts/* ${D}${datadir}/fonts/truetype/freefont/ } -FILES_${PN} = "${bindir}/omxplayer* \ +FILES:${PN} = "${bindir}/omxplayer* \ ${libdir}/omxplayer/lib*${SOLIBS} \ ${datadir}/fonts" -FILES_${PN}-dev += "${libdir}/omxplayer/*.so" +FILES:${PN}-dev += "${libdir}/omxplayer/*.so" -RDEPENDS_${PN} += "bash procps userland" +RDEPENDS:${PN} += "bash procps userland" |