From cfbb192e5ca303a5ca3731d9b1efce879dec873a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Apr 2022 12:09:47 -0700 Subject: [PATCH] omxplayer: Use internal version of ffmpeg OE-Core's ffmpeg has moved to 5.x version whose headers are not directly compatible with what omxplayer expects anymore. Therefore use captured version of ffmpeg and point the header search paths accordingly. Add missing dependency on alsa-lib for libasound headers Fixes build with master/kirkstone Signed-off-by: Khem Raj --- ...-headers-from-ffmpeg-are-installed-in-u.patch | 16 ++++++---------- recipes-multimedia/omxplayer/omxplayer_git.bb | 2 +- 2 files changed, 7 insertions(+), 11 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 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_git.bb b/recipes-multimedia/omxplayer/omxplayer_git.bb index 2519692..c15b40b 100644 --- a/recipes-multimedia/omxplayer/omxplayer_git.bb +++ b/recipes-multimedia/omxplayer/omxplayer_git.bb @@ -7,7 +7,7 @@ SECTION = "console/utils" 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"