From b5baddc1af36aeb492fad699619f9590c0161e59 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Sun, 18 Oct 2026 23:39:35 +0100 Subject: [PATCH] omxplayer: remove deprecated component omxplayer is deprecated upstream in favour of VLC and relies on the legacy OMX/MMAL userland stack. It also depends on libssh and libpcre from meta-oe while living outside dynamic-layers, which breaks world on 32-bit machines without meta-oe (yocto-check-layer test_machine_world). Use rpidistro-ffmpeg or GStreamer with the default vc4 stack instead. Signed-off-by: Andrei Gherzan --- docs/contributing.md | 2 +- docs/extra-apps.md | 9 -- docs/index.rst | 1 - .../packagegroups/packagegroup-rpi-test.bb | 3 - .../0001-Fix-build-with-vc4-driver.patch | 51 -------- ...xx-and-ld-variables-from-environment.patch | 44 ------- ...aders-from-ffmpeg-are-installed-in-u.patch | 59 ---------- .../0003-Remove-strip-step-in-Makefile.patch | 27 ----- ...XTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch | 37 ------ ...ire-internet-connection-during-build.patch | 55 --------- ...peg-configure-compile-race-condition.patch | 37 ------ ...-Remove-Makefile-hardcoded-arch-tune.patch | 10 -- .../omxplayer/cross-crompile-ffmpeg.patch | 14 --- .../omxplayer/fix-tar-command-with-DIST.patch | 32 ----- .../omxplayer/use-native-pkg-config.patch | 30 ----- recipes-multimedia/omxplayer/omxplayer_git.bb | 110 ------------------ 16 files changed, 1 insertion(+), 520 deletions(-) delete mode 100644 docs/extra-apps.md delete mode 100644 recipes-multimedia/omxplayer/omxplayer/0001-Fix-build-with-vc4-driver.patch delete mode 100644 recipes-multimedia/omxplayer/omxplayer/0001-Specify-cc-cxx-and-ld-variables-from-environment.patch delete mode 100644 recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch delete mode 100644 recipes-multimedia/omxplayer/omxplayer/0003-Remove-strip-step-in-Makefile.patch delete mode 100644 recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch delete mode 100644 recipes-multimedia/omxplayer/omxplayer/0005-Don-t-require-internet-connection-during-build.patch delete mode 100644 recipes-multimedia/omxplayer/omxplayer/0006-Prevent-ffmpeg-configure-compile-race-condition.patch delete mode 100644 recipes-multimedia/omxplayer/omxplayer/0007-Remove-Makefile-hardcoded-arch-tune.patch delete mode 100644 recipes-multimedia/omxplayer/omxplayer/cross-crompile-ffmpeg.patch delete mode 100644 recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch delete mode 100644 recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch delete mode 100644 recipes-multimedia/omxplayer/omxplayer_git.bb diff --git a/docs/contributing.md b/docs/contributing.md index 9ecb6cb..effc2a3 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -37,7 +37,7 @@ a good component name is the following: * For changes that affect *layer recipes*, please just use the **base names** of the affected recipes, separated by commas (`,`), as the component name. - For example: use `omxplayer` instead of `omxplayer_git.bb`. If you are + For example: use `userland` instead of `userland_git.bb`. If you are adding new recipe(s), just use the new recipe(s) base name(s). An example for changes to multiple recipes would be `userland,vc-graphics,wayland`. * For changes that affect the *layer documentation*, please just use `docs` diff --git a/docs/extra-apps.md b/docs/extra-apps.md deleted file mode 100644 index dbbfb8d..0000000 --- a/docs/extra-apps.md +++ /dev/null @@ -1,9 +0,0 @@ -# Extra apps - -## omxplayer - -omxplayer depends on libav which has a commercial license. So in order to be -able to compile omxplayer you will need to whiteflag the commercial -license in your local.conf: - - LICENSE_FLAGS_ACCEPTED = "commercial" diff --git a/docs/index.rst b/docs/index.rst index 3f8a088..5d1c627 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -14,7 +14,6 @@ Contents: readme layer-contents extra-build-config - extra-apps ipcompliance contributing diff --git a/recipes-core/packagegroups/packagegroup-rpi-test.bb b/recipes-core/packagegroups/packagegroup-rpi-test.bb index 35a2e4f..d8245d6 100644 --- a/recipes-core/packagegroups/packagegroup-rpi-test.bb +++ b/recipes-core/packagegroups/packagegroup-rpi-test.bb @@ -8,10 +8,7 @@ inherit packagegroup COMPATIBLE_MACHINE = "^rpi$" -OMXPLAYER = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'omxplayer', d)}" - RDEPENDS:${PN} = "\ - ${OMXPLAYER} \ bcm2835-tests \ raspi-gpio \ rpio \ 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 deleted file mode 100644 index f65c421..0000000 --- a/recipes-multimedia/omxplayer/omxplayer/0001-Fix-build-with-vc4-driver.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 25302469b6ceb2fa10ac68c07da25c6068ffd218 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 7 Nov 2018 01:16:59 -0800 -Subject: [PATCH] Fix build with vc4 driver - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - 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 - - #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 - #include - #include - #include --- -2.19.1 - 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 deleted file mode 100644 index 9e12bf3..0000000 --- a/recipes-multimedia/omxplayer/omxplayer/0001-Specify-cc-cxx-and-ld-variables-from-environment.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9b4b7f8726171e97f12c587d50e54bab0dc42da5 Mon Sep 17 00:00:00 2001 -From: Khem Raj -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 ---- -Upstream-Status: Pending - - 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/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 deleted file mode 100644 index e494650..0000000 --- a/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch +++ /dev/null @@ -1,59 +0,0 @@ -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. - -Don't search for libraries and headers in /usr/local. - -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(-) - ---- 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 - - 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 -I/usr/include/freetype2 -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -+INCLUDES+=-I./ -Ilinux -I./ffmpeg - - DIST ?= omxplayer-dist - STRIP ?= strip -@@ -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 -- 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: ---- a/Makefile.ffmpeg -+++ b/Makefile.ffmpeg -@@ -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 -- $(HOST)-strip ffmpeg_compiled/usr/local/lib/*.so -+ $(HOST)-strip ffmpeg_compiled/usr/lib/*.so - 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 deleted file mode 100644 index 0b6aafd..0000000 --- a/recipes-multimedia/omxplayer/omxplayer/0003-Remove-strip-step-in-Makefile.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 - -Build system will strip binaries so remove strip step in Makefile. -Avoid warnings/errors like: -WARNING: File '/usr/lib/omxplayer/libavutil.so.51.56.100' from -omxplayer was already stripped, this will prevent future debugging! - -Upstream-Status: Inappropriate [embedded specific] -Signed-off-by: Andrei Gherzan - ---- - Makefile.ffmpeg | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -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 -- 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 deleted file mode 100644 index d137592..0000000 --- a/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 - -In this way we can inject flags to LD and CC using ---extra-cflags and --extra-ldflags. - -Upstream-Status: Inappropriate [embedded specific] -Signed-off-by: Andrei Gherzan - ---- - Makefile.ffmpeg | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -Index: git/Makefile.ffmpeg -=================================================================== ---- git.orig/Makefile.ffmpeg -+++ git/Makefile.ffmpeg -@@ -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) -+ - WORK=$(PWD) - - .PHONY : all -@@ -20,7 +22,8 @@ configure: - CFLAGS="$(CFLAGS) ${INCLUDES}" \ - LDFLAGS="" \ - ./configure \ -- --extra-cflags="-mfpu=vfp -mfloat-abi=hard" \ -+ --extra-cflags="$(FFMPEG_EXTRA_CFLAGS)" \ -+ --extra-ldflags="$(FFMPEG_EXTRA_LDFLAGS)" \ - --enable-shared \ - --disable-static \ - --arch=arm \ 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 deleted file mode 100644 index 0dd8c62..0000000 --- a/recipes-multimedia/omxplayer/omxplayer/0005-Don-t-require-internet-connection-during-build.patch +++ /dev/null @@ -1,55 +0,0 @@ -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 - -The following issues break offline builds: - -* Building the man page uses a web service hosted on heroku. - -* Makefile.ffmpeg explicitly does a "git clone" from the internet. - -Signed-off-by: Paul Barker -Upstream-Status: Inappropriate - ---- - Makefile | 6 ++---- - Makefile.ffmpeg | 2 +- - 2 files changed, 3 insertions(+), 5 deletions(-) - -Index: git/Makefile -=================================================================== ---- git.orig/Makefile -+++ git/Makefile -@@ -81,17 +81,14 @@ ffmpeg: - make -f Makefile.ffmpeg - make -f Makefile.ffmpeg install - --dist: omxplayer.bin omxplayer.1 -+dist: omxplayer.bin - mkdir -p $(DIST)/usr/lib/omxplayer - mkdir -p $(DIST)/usr/bin - mkdir -p $(DIST)/usr/share/doc/omxplayer -- mkdir -p $(DIST)/usr/share/man/man1 - cp omxplayer omxplayer.bin $(DIST)/usr/bin - 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/lib/*.so* $(DIST)/usr/lib/omxplayer/ -- tar -czf omxplayer-dist.tar.gz $(DIST) - - 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 --all: checkout configure compile -+all: configure compile - - .PHONY : copy - copy: 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 deleted file mode 100644 index 81dab07..0000000 --- a/recipes-multimedia/omxplayer/omxplayer/0006-Prevent-ffmpeg-configure-compile-race-condition.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 - -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 -Upstream-Status: Pending - ---- - Makefile.ffmpeg | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -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 --all: configure compile -+all: compile - - .PHONY : copy - copy: -@@ -13,7 +13,7 @@ copy: - $(HOST)-strip *.so* - - .PHONY : compile --compile: -+compile: configure - +$(MAKE) -j$(shell nproc) -C ffmpeg - - .PHONY : configure 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 deleted file mode 100644 index 02844db..0000000 --- a/recipes-multimedia/omxplayer/omxplayer/0007-Remove-Makefile-hardcoded-arch-tune.patch +++ /dev/null @@ -1,10 +0,0 @@ -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 @@ --CFLAGS=-pipe -mfloat-abi=hard -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -g -+CFLAGS+= -fomit-frame-pointer -mabi=aapcs-linux -Wno-psabi -g - 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$(SDKSTAGE)/opt/vc/lib/ diff --git a/recipes-multimedia/omxplayer/omxplayer/cross-crompile-ffmpeg.patch b/recipes-multimedia/omxplayer/omxplayer/cross-crompile-ffmpeg.patch deleted file mode 100644 index 5d7e1e0..0000000 --- a/recipes-multimedia/omxplayer/omxplayer/cross-crompile-ffmpeg.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Pending - -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/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch b/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch deleted file mode 100644 index 70859aa..0000000 --- a/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 - -This fails if DIST is an absolute path. The old command was working just fine. - -Upstream-Status: Pending - -Signed-off-by: Andrei Gherzan -Signed-off-by: Jonathan Liu - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: git/Makefile -=================================================================== ---- git.orig/Makefile -+++ git/Makefile -@@ -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) - - install: - cp -r $(DIST)/* / diff --git a/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch b/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch deleted file mode 100644 index e778561..0000000 --- a/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 - ---- -Upstream-Status: Pending - - Makefile.ffmpeg | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -Index: git/Makefile.ffmpeg -=================================================================== ---- git.orig/Makefile.ffmpeg -+++ git/Makefile.ffmpeg -@@ -242,7 +242,8 @@ configure: - --disable-decoder=idf \ - --disable-decoder=hevc \ - --enable-decoder=opus \ -- --disable-stripping -+ --disable-stripping \ -+ --pkg-config=pkg-config - - .PHONY : clean - clean: diff --git a/recipes-multimedia/omxplayer/omxplayer_git.bb b/recipes-multimedia/omxplayer/omxplayer_git.bb deleted file mode 100644 index d2dfc89..0000000 --- a/recipes-multimedia/omxplayer/omxplayer_git.bb +++ /dev/null @@ -1,110 +0,0 @@ -SUMMARY = "A commandline OMX player for the Raspberry Pi" -DESCRIPTION = "This player was developed as a testbed for the XBMC \ -Raspberry PI implementation and is quite handy to use standalone" -HOMEPAGE = "https://github.com/popcornmix/omxplayer" -SECTION = "console/utils" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=00a27da7ac0f9bcd17320ec29ef4bbf6" - -DEPENDS = "alsa-lib libpcre virtual/egl boost freetype dbus openssl libssh virtual/libomxil coreutils-native curl-native userland" - -PR = "r6" - -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 -# 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 v4.0.3 release of ffmpeg. -SRCREV_ffmpeg = "fcbd117df3077bad495e99e20f01cf93737bce76" - -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=${BB_GIT_DEFAULT_DESTSUFFIX}/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 \ - file://fix-tar-command-with-DIST.patch \ - 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 \ - 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)}" - -COMPATIBLE_MACHINE = "^rpi$" -COMPATIBLE_HOST:aarch64 = "null" - -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 - -# This isn't used directly by omxplayer, but applied to Makefile.ffmpeg which -# runs the ffmpeg configuration -PACKAGECONFIG ??= "" -PACKAGECONFIG[samba] = "--enable-libsmbclient,--disable-libsmbclient,samba" - -# Needed in ffmpeg configure -export TEMPDIR = "${S}/tmp" - -# Needed in Makefile.ffmpeg -export HOST = "${HOST_SYS}" -export WORK = "${S}" -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 = "${@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 \ - -isystem${STAGING_DIR_HOST}/usr/lib/dbus-1.0/include \ - " -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 - - sed -i 's/--enable-libsmbclient/${@bb.utils.contains("PACKAGECONFIG", "samba", "--enable-libsmbclient", "--disable-libsmbclient", d)}/g' Makefile.ffmpeg - - oe_runmake -f Makefile.ffmpeg - oe_runmake -f Makefile.ffmpeg install - oe_runmake -} - -do_install() { - oe_runmake STRIP='echo skipping strip' dist - mkdir -p ${D}${datadir}/fonts/truetype/freefont/ - install ${S}/fonts/* ${D}${datadir}/fonts/truetype/freefont/ -} - -FILES:${PN} = "${bindir}/omxplayer* \ - ${libdir}/omxplayer/lib*${SOLIBS} \ - ${datadir}/fonts" - -FILES:${PN}-dev += "${libdir}/omxplayer/*.so" - -RDEPENDS:${PN} += "bash procps userland"