diff options
Diffstat (limited to 'meta-raspberrypi/recipes-multimedia/omxplayer')
12 files changed, 226 insertions, 85 deletions
diff --git a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0001-Fix-build-with-vc4-driver.patch b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0001-Fix-build-with-vc4-driver.patch new file mode 100644 index 000000000..37d0724a4 --- /dev/null +++ b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0001-Fix-build-with-vc4-driver.patch @@ -0,0 +1,49 @@ +From 25302469b6ceb2fa10ac68c07da25c6068ffd218 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 7 Nov 2018 01:16:59 -0800 +Subject: [PATCH] Fix build with vc4 driver + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + SubtitleRenderer.cpp | 7 ++++++- + SubtitleRenderer.h | 1 + + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/SubtitleRenderer.cpp b/SubtitleRenderer.cpp +index 540162f..fcfc708 100644 +--- a/SubtitleRenderer.cpp ++++ b/SubtitleRenderer.cpp +@@ -36,6 +36,11 @@ + #include <algorithm> + + #include "bcm_host.h" ++typedef struct { ++ DISPMANX_ELEMENT_HANDLE_T element; ++ int width; ++ int height; ++} EGL_DISPMANX_WINDOW_T; + + class BoxRenderer { + VGPath path_; +@@ -618,4 +623,4 @@ void SubtitleRenderer::set_rect(int x1, int y1, int x2, int y2) BOOST_NOEXCEPT + float font_size = height*font_size_; + ENFORCE(!FT_Set_Pixel_Sizes(ft_face_, 0, font_size)); + ENFORCE(!FT_Set_Pixel_Sizes(ft_face_italic_, 0, font_size)); +-} +\ No newline at end of file ++} +diff --git a/SubtitleRenderer.h b/SubtitleRenderer.h +index 3f60798..ebac9a1 100644 +--- a/SubtitleRenderer.h ++++ b/SubtitleRenderer.h +@@ -26,6 +26,7 @@ + // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + // DEALINGS IN THE SOFTWARE. + ++#include <interface/vmcs_host/vc_dispmanx.h> + #include <EGL/egl.h> + #include <VG/openvg.h> + #include <ft2build.h> +-- +2.19.1 + diff --git a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0001-Remove-Makefile.include-which-includes-hardcoded.patch b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0001-Remove-Makefile.include-which-includes-hardcoded.patch index 151c33cce..0c8843e77 100644 --- a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0001-Remove-Makefile.include-which-includes-hardcoded.patch +++ b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0001-Remove-Makefile.include-which-includes-hardcoded.patch @@ -1,4 +1,4 @@ -From a2a28fb7c4e8354cc0f90454e9bd151c16a6bf8b Mon Sep 17 00:00:00 2001 +From 19c9bc5fd8f43d3e9117906c3c48a3891357f8bc Mon Sep 17 00:00:00 2001 From: Andrei Gherzan <andrei@gherzan.ro> Date: Tue, 20 Aug 2013 16:10:51 +0300 Subject: [PATCH] Remove Makefile.include which includes hardcoded @@ -11,8 +11,15 @@ Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Updated patch to apply to c0dd9502ed2c43c487674939195c69680f3d98b0 revision +--- + Makefile | 1 - + Makefile.ffmpeg | 1 - + Makefile.include | 40 ---------------------------------------- + 3 files changed, 42 deletions(-) + delete mode 100644 Makefile.include + diff --git a/Makefile b/Makefile -index f348465..65f7637 100644 +index 2857e94..76ee9bf 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,3 @@ @@ -21,7 +28,7 @@ index f348465..65f7637 100644 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 diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg -index 083e214..3b31a82 100644 +index ea12aad..749f47f 100644 --- a/Makefile.ffmpeg +++ b/Makefile.ffmpeg @@ -1,4 +1,3 @@ diff --git a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0001-Specify-cc-cxx-and-ld-variables-from-environment.patch b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0001-Specify-cc-cxx-and-ld-variables-from-environment.patch new file mode 100644 index 000000000..82dfd3e65 --- /dev/null +++ b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0001-Specify-cc-cxx-and-ld-variables-from-environment.patch @@ -0,0 +1,42 @@ +From 9b4b7f8726171e97f12c587d50e54bab0dc42da5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 12 Sep 2018 22:18:07 -0700 +Subject: [PATCH] Specify --cc, --cxx and --ld variables from environment + +This helps in compiling with non-gcc compilers + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile.ffmpeg | 22 ++++++++++++++-------- + 1 file changed, 14 insertions(+), 8 deletions(-) + +Index: git/Makefile.ffmpeg +=================================================================== +--- git.orig/Makefile.ffmpeg ++++ git/Makefile.ffmpeg +@@ -22,12 +22,15 @@ configure: + CFLAGS="$(CFLAGS) ${INCLUDES}" \ + LDFLAGS="" \ + ./configure \ ++ --ld="${CCLD}" \ ++ --cc="${CC}" \ ++ --cxx="${CXX}" \ + --extra-cflags="$(FFMPEG_EXTRA_CFLAGS)" \ + --extra-ldflags="$(FFMPEG_EXTRA_LDFLAGS)" \ + --enable-shared \ + --disable-static \ + --arch=arm \ +- --cpu=arm1176jzf-s \ ++ --cpu=$(CPU) \ + --target-os=linux \ + --disable-hwaccels \ + --enable-parsers \ +@@ -42,7 +45,7 @@ configure: + --enable-gpl \ + --enable-version3 \ + --enable-protocols \ +- --enable-libsmbclient \ ++ --disable-libsmbclient \ + --enable-libssh \ + --enable-nonfree \ + --enable-openssl \ diff --git a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch index 203f34b2d..dd1d4f3d7 100644 --- a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch +++ b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch @@ -1,4 +1,4 @@ -From 1e92da659375eae1622984d4cc0ffd2a7b082fcf Mon Sep 17 00:00:00 2001 +From e46208c4a3e35da461e0e8f662970339eae47fca Mon Sep 17 00:00:00 2001 From: Andrei Gherzan <andrei@gherzan.ro> Date: Sun, 24 Aug 2014 00:13:13 +0200 Subject: [PATCH] Libraries and headers from ffmpeg are installed in /usr. @@ -9,6 +9,7 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Jonathan Liu <net147@gmail.com> + --- Makefile | 6 +++--- Makefile.ffmpeg | 2 +- @@ -18,30 +19,42 @@ Index: git/Makefile =================================================================== --- git.orig/Makefile +++ git/Makefile -@@ -1,9 +1,9 @@ - +@@ -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 --LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound -+LDFLAGS+=-L./ -Lffmpeg_compiled/usr/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound + LDFLAGS=-L$(SDKSTAGE)/opt/vc/lib/ +-LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound ++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 -+INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/include/ -I=/usr/include/dbus-1.0 +-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 DIST ?= omxplayer-dist - -@@ -88,5 +88,5 @@ dist: omxplayer.bin omxplayer.1 + STRIP ?= strip +@@ -90,7 +90,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 - cp -P ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/ + cp -P ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/ cd $(DIST); tar -czf ../$(DIST).tgz * + + install: Index: git/Makefile.ffmpeg =================================================================== --- git.orig/Makefile.ffmpeg +++ git/Makefile.ffmpeg -@@ -254,5 +254,5 @@ checkout: +@@ -238,7 +238,8 @@ configure: + --disable-decoder=xbin \ + --disable-decoder=idf \ + --disable-decoder=hevc \ +- --enable-decoder=opus ++ --enable-decoder=opus \ ++ --disable-stripping + + .PHONY : clean + clean: +@@ -251,5 +252,5 @@ checkout: .PHONY : install install: cd ffmpeg; make -j9 DESTDIR="$(WORK)/ffmpeg_compiled" install diff --git a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0003-Remove-strip-step-in-Makefile.patch b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0003-Remove-strip-step-in-Makefile.patch index 7f313301e..0b6aafdf4 100644 --- a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0003-Remove-strip-step-in-Makefile.patch +++ b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0003-Remove-strip-step-in-Makefile.patch @@ -1,4 +1,4 @@ -From b738724c6ca45ee5fecebed01c7ac91c92446123 Mon Sep 17 00:00:00 2001 +From 6975d8a902837dd6c604f7fdd2a2f977285855ed Mon Sep 17 00:00:00 2001 From: Andrei Gherzan <andrei@gherzan.ro> Date: Sun, 24 Aug 2014 00:18:05 +0200 Subject: [PATCH] Remove strip step in Makefile @@ -10,30 +10,18 @@ omxplayer was already stripped, this will prevent future debugging! Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> + --- Makefile.ffmpeg | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) + 1 files changed, 2 insertions(+), 3 deletions(-) -diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg -index 9d66a85..00df197 100644 ---- a/Makefile.ffmpeg -+++ b/Makefile.ffmpeg -@@ -243,7 +243,8 @@ configure: - --disable-decoder=xbin \ - --disable-decoder=idf \ - --enable-decoder=opus \ -- --cross-prefix=$(HOST)- -+ --cross-prefix=$(HOST)- \ -+ --disable-stripping - - .PHONY : clean - clean: -@@ -256,5 +257,3 @@ checkout: +Index: git/Makefile.ffmpeg +=================================================================== +--- git.orig/Makefile.ffmpeg ++++ git/Makefile.ffmpeg +@@ -252,5 +252,3 @@ checkout: .PHONY : install install: cd ffmpeg; make -j9 DESTDIR="$(WORK)/ffmpeg_compiled" install - $(HOST)-strip ffmpeg_compiled/usr/lib/*.so - --- -1.9.3 - diff --git a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch index ea8530def..383cdf7cf 100644 --- a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch +++ b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch @@ -1,4 +1,4 @@ -From 100982ee1fc1cb571c7453d14f9acd60e67d4765 Mon Sep 17 00:00:00 2001 +From be007b01e7d91f5f83518c0388c16db8dab31d2e Mon Sep 17 00:00:00 2001 From: Andrei Gherzan <andrei.gherzan@windriver.com> Date: Sun, 25 Jan 2015 11:13:51 +0200 Subject: [PATCH] Add FFMPEG_EXTRA_CFLAGS and FFMPEG_EXTRA_LDFLAGS @@ -8,16 +8,16 @@ In this way we can inject flags to LD and CC using Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> + --- - Makefile.ffmpeg | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + Makefile.ffmpeg | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) Index: git/Makefile.ffmpeg =================================================================== --- git.orig/Makefile.ffmpeg +++ git/Makefile.ffmpeg -@@ -1,6 +1,8 @@ - +@@ -1,5 +1,7 @@ CFLAGS=-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_HAVE_SBRK -D_LARGEFILE64_SOURCE -DHAVE_CMAKE_CONFIG -DHAVE_VMCS_CONFIG -D_REENTRANT -DUSE_VCHIQ_ARM -DVCHI_BULK_ALIGN=1 -DVCHI_BULK_GRANULARITY=1 -DEGL_SERVER_DISPMANX -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D__VIDEOCORE4__ -DGRAPHICS_X_VG=1 -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DOMX -DOMX_SKIP64BIT +FFMPEG_EXTRA_CFLAGS?=-mfpu=vfp -mfloat-abi=$(FLOAT) -mno-apcs-stack-check -mstructure-size-boundary=32 -mno-sched-prolog @@ -25,13 +25,13 @@ Index: git/Makefile.ffmpeg WORK=$(PWD) .PHONY : all -@@ -21,7 +23,8 @@ configure: +@@ -20,7 +22,8 @@ configure: CFLAGS="$(CFLAGS) ${INCLUDES}" \ LDFLAGS="" \ ./configure \ -- --extra-cflags="-mfpu=vfp -mfloat-abi=$(FLOAT) -mno-apcs-stack-check -mstructure-size-boundary=32 -mno-sched-prolog" \ +- --extra-cflags="-mfpu=vfp -mfloat-abi=hard -mno-apcs-stack-check -mstructure-size-boundary=32 -mno-sched-prolog" \ + --extra-cflags="$(FFMPEG_EXTRA_CFLAGS)" \ + --extra-ldflags="$(FFMPEG_EXTRA_LDFLAGS)" \ - --enable-cross-compile \ --enable-shared \ --disable-static \ + --arch=arm \ diff --git a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0005-Don-t-require-internet-connection-during-build.patch b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0005-Don-t-require-internet-connection-during-build.patch index 4f56ad2a5..f6abd7b88 100644 --- a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0005-Don-t-require-internet-connection-during-build.patch +++ b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0005-Don-t-require-internet-connection-during-build.patch @@ -1,4 +1,4 @@ -From 97cb9405f281f54d4083f3126d441c8b44eafb89 Mon Sep 17 00:00:00 2001 +From 81d1f8bc102b23bdfa63a01f252f3e4c74ae7da9 Mon Sep 17 00:00:00 2001 From: Paul Barker <pbarker@toganlabs.com> Date: Thu, 7 Sep 2017 19:14:20 +0000 Subject: [PATCH] Don't require internet connection during build @@ -11,16 +11,17 @@ The following issues break offline builds: Signed-off-by: Paul Barker <pbarker@toganlabs.com> Upstream-status: Inappropriate + --- Makefile | 6 ++---- Makefile.ffmpeg | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) -diff --git a/Makefile b/Makefile -index 60501b1..6471f0f 100644 ---- a/Makefile -+++ b/Makefile -@@ -79,14 +79,12 @@ ffmpeg: +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile +@@ -81,17 +81,14 @@ ffmpeg: make -f Makefile.ffmpeg make -f Makefile.ffmpeg install @@ -36,13 +37,14 @@ index 60501b1..6471f0f 100644 - cp omxplayer.1 $(DIST)/usr/share/man/man1 cp -P ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/ - tar -czf omxplayer-dist.tar.gz $(DIST) -\ No newline at end of file -+ tar -czf omxplayer-dist.tar.gz $(DIST) -diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg -index 22d495c..8651724 100644 ---- a/Makefile.ffmpeg -+++ b/Makefile.ffmpeg -@@ -6,7 +6,7 @@ FFMPEG_EXTRA_CFLAGS?=-mfpu=vfp -mfloat-abi=$(FLOAT) -mno-apcs-stack-check -mstru + + install: + cp -r $(DIST)/* / +Index: git/Makefile.ffmpeg +=================================================================== +--- git.orig/Makefile.ffmpeg ++++ git/Makefile.ffmpeg +@@ -5,7 +5,7 @@ FFMPEG_EXTRA_CFLAGS?=-mfpu=vfp -mfloat-a WORK=$(PWD) .PHONY : all @@ -51,6 +53,3 @@ index 22d495c..8651724 100644 .PHONY : copy copy: --- -2.7.4 - diff --git a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0006-Prevent-ffmpeg-configure-compile-race-condition.patch b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0006-Prevent-ffmpeg-configure-compile-race-condition.patch index 3fac2d1cd..890adde50 100644 --- a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0006-Prevent-ffmpeg-configure-compile-race-condition.patch +++ b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0006-Prevent-ffmpeg-configure-compile-race-condition.patch @@ -1,4 +1,4 @@ -From 4a13419e3805b541fc58e57f1f27c4a388609ef5 Mon Sep 17 00:00:00 2001 +From f570b9985ff2d57d21c1e64ed08c43b6d89fd0b1 Mon Sep 17 00:00:00 2001 From: Paul Barker <pbarker@toganlabs.com> Date: Thu, 7 Sep 2017 20:02:15 +0000 Subject: [PATCH] Prevent ffmpeg configure/compile race condition @@ -8,15 +8,16 @@ the configure stage is finished before the compile stage starts. Signed-off-by: Paul Barker <pbarker@toganlabs.com> Upstream-status: Pending + --- Makefile.ffmpeg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg -index 8651724..619c49a 100644 ---- a/Makefile.ffmpeg -+++ b/Makefile.ffmpeg -@@ -6,7 +6,7 @@ FFMPEG_EXTRA_CFLAGS?=-mfpu=vfp -mfloat-abi=$(FLOAT) -mno-apcs-stack-check -mstru +Index: git/Makefile.ffmpeg +=================================================================== +--- git.orig/Makefile.ffmpeg ++++ git/Makefile.ffmpeg +@@ -5,7 +5,7 @@ FFMPEG_EXTRA_CFLAGS?=-mfpu=vfp -mfloat-a WORK=$(PWD) .PHONY : all @@ -25,15 +26,12 @@ index 8651724..619c49a 100644 .PHONY : copy copy: -@@ -14,7 +14,7 @@ copy: +@@ -13,7 +13,7 @@ copy: $(HOST)-strip *.so* .PHONY : compile -compile: +compile: configure - +$(MAKE) -C ffmpeg + +$(MAKE) -j$(shell nproc) -C ffmpeg .PHONY : configure --- -2.7.4 - diff --git a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/cross-crompile-ffmpeg.patch b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/cross-crompile-ffmpeg.patch new file mode 100644 index 000000000..20ed7c7b9 --- /dev/null +++ b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/cross-crompile-ffmpeg.patch @@ -0,0 +1,12 @@ +Index: git/Makefile.ffmpeg +=================================================================== +--- git.orig/Makefile.ffmpeg ++++ git/Makefile.ffmpeg +@@ -22,6 +22,7 @@ configure: + CFLAGS="$(CFLAGS) ${INCLUDES}" \ + LDFLAGS="" \ + ./configure \ ++ --enable-cross-compile \ + --ld="${CCLD}" \ + --cc="${CC}" \ + --cxx="${CXX}" \ diff --git a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch index ab40e40a2..70859aa49 100644 --- a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch +++ b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch @@ -1,3 +1,8 @@ +From 23a97efde2aef171312000f7859ef4c573ce2ada Mon Sep 17 00:00:00 2001 +From: Andrei Gherzan <andrei@gherzan.ro> +Date: Sun, 19 Jan 2014 20:35:29 +0200 +Subject: [PATCH] omxplayer: Update to remote HEAD + Revert the tar command change introduced in: https://github.com/popcornmix/omxplayer/commit/201c77973155861e60492e45d35467b19b69c1c4 @@ -8,14 +13,20 @@ Upstream-Status: Pending Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Jonathan Liu <net147@gmail.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + Index: git/Makefile =================================================================== --- git.orig/Makefile +++ git/Makefile -@@ -71,4 +71,4 @@ dist: omxplayer.bin - cp COPYING $(DIST)/usr/share/doc/ - cp README.md $(DIST)/usr/share/doc/README +@@ -91,7 +91,7 @@ dist: omxplayer.bin omxplayer.1 + cp README.md $(DIST)/usr/share/doc/omxplayer/README + cp omxplayer.1 $(DIST)/usr/share/man/man1 cp -P ffmpeg_compiled/usr/lib/*.so* $(DIST)/usr/lib/omxplayer/ - cd $(DIST); tar -czf ../$(DIST).tgz * + tar -czf omxplayer-dist.tar.gz $(DIST) -\ No newline at end of file + + install: + cp -r $(DIST)/* / diff --git a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch index ed8199939..e580470c0 100644 --- a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch +++ b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch @@ -1,16 +1,25 @@ +From da6c24a2a87b8cf9692017e32be25d30c0cc7ef4 Mon Sep 17 00:00:00 2001 +From: Andrei Gherzan <andrei@gherzan.ro> +Date: Tue, 10 Feb 2015 00:52:18 +0100 +Subject: [PATCH] omxplayer: Bump SRCREV + Force the pkg-config native tool. Strangely ffmpeg prepends cross_prefix to the default value which obviously is wrong. Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> +--- + Makefile.ffmpeg | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + Index: git/Makefile.ffmpeg =================================================================== --- git.orig/Makefile.ffmpeg +++ git/Makefile.ffmpeg -@@ -245,7 +245,8 @@ configure: +@@ -242,7 +242,8 @@ configure: --disable-decoder=idf \ + --disable-decoder=hevc \ --enable-decoder=opus \ - --cross-prefix=$(HOST)- \ - --disable-stripping + --disable-stripping \ + --pkg-config=pkg-config 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" |