diff --git a/recipes-multimedia/omxplayer/omxplayer/0001-Remove-Makefile.include-which-includes-hardcoded.patch b/recipes-multimedia/omxplayer/omxplayer/0001-Remove-Makefile.include-which-includes-hardcoded.patch index 151c33cce..0c8843e77 100644 --- a/recipes-multimedia/omxplayer/omxplayer/0001-Remove-Makefile.include-which-includes-hardcoded.patch +++ b/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 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 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/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 203f34b2d..22d83b3de 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 @@ -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 Date: Sun, 24 Aug 2014 00:13:13 +0200 Subject: [PATCH] Libraries and headers from ffmpeg are installed in /usr. @@ -9,15 +9,16 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andrei Gherzan Signed-off-by: Jonathan Liu + --- Makefile | 6 +++--- Makefile.ffmpeg | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) -Index: git/Makefile -=================================================================== ---- git.orig/Makefile -+++ git/Makefile +diff --git a/Makefile b/Makefile +index 76ee9bf..cb59249 100644 +--- a/Makefile ++++ b/Makefile @@ -1,9 +1,9 @@ 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 @@ -37,10 +38,10 @@ Index: git/Makefile - 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 * -Index: git/Makefile.ffmpeg -=================================================================== ---- git.orig/Makefile.ffmpeg -+++ git/Makefile.ffmpeg +diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg +index 749f47f..d712f6c 100644 +--- a/Makefile.ffmpeg ++++ b/Makefile.ffmpeg @@ -254,5 +254,5 @@ checkout: .PHONY : install install: diff --git a/recipes-multimedia/omxplayer/omxplayer/0003-Remove-strip-step-in-Makefile.patch b/recipes-multimedia/omxplayer/omxplayer/0003-Remove-strip-step-in-Makefile.patch index 7f313301e..2f29066b4 100644 --- a/recipes-multimedia/omxplayer/omxplayer/0003-Remove-strip-step-in-Makefile.patch +++ b/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 Date: Sun, 24 Aug 2014 00:18:05 +0200 Subject: [PATCH] Remove strip step in Makefile @@ -10,17 +10,18 @@ omxplayer was already stripped, this will prevent future debugging! Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andrei Gherzan + --- 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 +index d712f6c..0dbe87c 100644 --- a/Makefile.ffmpeg +++ b/Makefile.ffmpeg -@@ -243,7 +243,8 @@ configure: - --disable-decoder=xbin \ +@@ -241,7 +241,8 @@ configure: --disable-decoder=idf \ + --disable-decoder=hevc \ --enable-decoder=opus \ - --cross-prefix=$(HOST)- + --cross-prefix=$(HOST)- \ @@ -28,12 +29,9 @@ index 9d66a85..00df197 100644 .PHONY : clean clean: -@@ -256,5 +257,3 @@ checkout: +@@ -254,5 +255,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/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch b/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch index ea8530def..338b560d4 100644 --- a/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch +++ b/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 Date: Sun, 25 Jan 2015 11:13:51 +0200 Subject: [PATCH] Add FFMPEG_EXTRA_CFLAGS and FFMPEG_EXTRA_LDFLAGS @@ -8,14 +8,15 @@ In this way we can inject flags to LD and CC using Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andrei Gherzan + --- - 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 +diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg +index 0dbe87c..e120d47 100644 +--- a/Makefile.ffmpeg ++++ b/Makefile.ffmpeg @@ -1,6 +1,8 @@ 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 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 4f56ad2a5..14f9efe30 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 @@ -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 Date: Thu, 7 Sep 2017 19:14:20 +0000 Subject: [PATCH] Don't require internet connection during build @@ -11,6 +11,7 @@ The following issues break offline builds: Signed-off-by: Paul Barker Upstream-status: Inappropriate + --- Makefile | 6 ++---- Makefile.ffmpeg | 2 +- @@ -51,6 +52,3 @@ index 22d495c..8651724 100644 .PHONY : copy copy: --- -2.7.4 - 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 3fac2d1cd..9413f92c1 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 @@ -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 Date: Thu, 7 Sep 2017 20:02:15 +0000 Subject: [PATCH] Prevent ffmpeg configure/compile race condition @@ -8,6 +8,7 @@ the configure stage is finished before the compile stage starts. Signed-off-by: Paul Barker Upstream-status: Pending + --- Makefile.ffmpeg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -34,6 +35,3 @@ index 8651724..619c49a 100644 +$(MAKE) -C ffmpeg .PHONY : configure --- -2.7.4 - diff --git a/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch b/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch index ab40e40a2..2e9168d20 100644 --- a/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch +++ b/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 +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,13 +13,17 @@ Upstream-Status: Pending Signed-off-by: Andrei Gherzan Signed-off-by: Jonathan Liu -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 +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index cb59249..60501b1 100644 +--- a/Makefile ++++ b/Makefile +@@ -89,4 +89,4 @@ 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) diff --git a/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch b/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch index ed8199939..4d599c785 100644 --- a/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch +++ b/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch @@ -1,14 +1,23 @@ +From da6c24a2a87b8cf9692017e32be25d30c0cc7ef4 Mon Sep 17 00:00:00 2001 +From: Andrei Gherzan +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 -Index: git/Makefile.ffmpeg -=================================================================== ---- git.orig/Makefile.ffmpeg -+++ git/Makefile.ffmpeg +--- + Makefile.ffmpeg | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg +index e120d47..22d495c 100644 +--- a/Makefile.ffmpeg ++++ b/Makefile.ffmpeg @@ -245,7 +245,8 @@ configure: - --disable-decoder=idf \ + --disable-decoder=hevc \ --enable-decoder=opus \ --cross-prefix=$(HOST)- \ - --disable-stripping