From 4cb6cf3b76253a2f32a8c2ea6b350cf2d96d5f39 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 8 Nov 2022 20:07:03 +0100 Subject: [PATCH] ffmpeg: update patch handling Use upstream ffmpeg as a base version and apply kodi patches via a patchset. This doesn't change the ffmpeg source code we build from ATM but allows us to easily drop kodi patches if they cause issues, update to a newer point release or test with different ffmpeg versions in the future. Signed-off-by: Matthias Reichl --- packages/multimedia/ffmpeg/package.mk | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk index bb4345646f..ccbcced0ed 100644 --- a/packages/multimedia/ffmpeg/package.mk +++ b/packages/multimedia/ffmpeg/package.mk @@ -8,6 +8,11 @@ PKG_SITE="https://ffmpeg.org" PKG_DEPENDS_TARGET="toolchain zlib bzip2 openssl speex" PKG_LONGDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video." +PKG_VERSION="4.4.1" +PKG_SHA256="eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02" +PKG_URL="http://ffmpeg.org/releases/ffmpeg-${PKG_VERSION}.tar.xz" +PKG_PATCH_DIRS="kodi libreelec" + case "${PROJECT}" in Amlogic) PKG_VERSION="f9638b6331277e53ecd9276db5fe6dcd91d44c57" @@ -17,17 +22,11 @@ case "${PROJECT}" in PKG_PATCH_DIRS="libreelec dav1d" ;; RPi) - PKG_VERSION="4.4.1-Nexus-Alpha1" - PKG_SHA256="abbce62231baffe237e412689c71ffe01bfc83135afd375f1e538caae87729ed" - PKG_URL="https://github.com/xbmc/FFmpeg/archive/${PKG_VERSION}.tar.gz" PKG_FFMPEG_RPI="--disable-mmal --disable-rpi --enable-sand" - PKG_PATCH_DIRS="libreelec rpi" + PKG_PATCH_DIRS+=" rpi" ;; *) - PKG_VERSION="4.4.1-Nexus-Alpha1" - PKG_SHA256="abbce62231baffe237e412689c71ffe01bfc83135afd375f1e538caae87729ed" - PKG_URL="https://github.com/xbmc/FFmpeg/archive/${PKG_VERSION}.tar.gz" - PKG_PATCH_DIRS="libreelec v4l2-request v4l2-drmprime" + PKG_PATCH_DIRS+=" v4l2-request v4l2-drmprime" ;; esac