From 75d6dcadcd9f95179630c789b4e904edc85f1d23 Mon Sep 17 00:00:00 2001 From: CvH Date: Sat, 11 Nov 2023 19:41:32 +0100 Subject: [PATCH] ffmpegx: update to 5.1.4 --- .../addons/addon-depends/ffmpegx/package.mk | 11 ++- .../ffmpegx/patches/ffmpeg-openssl3.patch | 44 ---------- ...xes-assembling-with-binutils-as-2.41.patch | 84 ------------------- 3 files changed, 5 insertions(+), 134 deletions(-) delete mode 100644 packages/addons/addon-depends/ffmpegx/patches/ffmpeg-openssl3.patch delete mode 100644 packages/addons/addon-depends/ffmpegx/patches/fmpegx-0001-Fixes-assembling-with-binutils-as-2.41.patch diff --git a/packages/addons/addon-depends/ffmpegx/package.mk b/packages/addons/addon-depends/ffmpegx/package.mk index 7e887ebcfc..63e6ac957f 100644 --- a/packages/addons/addon-depends/ffmpegx/package.mk +++ b/packages/addons/addon-depends/ffmpegx/package.mk @@ -1,9 +1,9 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="ffmpegx" -PKG_VERSION="4.4.3" -PKG_SHA256="6c5b6c195e61534766a0b5fe16acc919170c883362612816d0a1c7f4f947006e" +PKG_VERSION="5.1.4" +PKG_SHA256="54383bb890a1cd62580e9f1eaa8081203196ed53bde9e98fb6b0004423f49063" PKG_LICENSE="LGPLv2.1+" PKG_SITE="https://ffmpeg.org" PKG_URL="https://ffmpeg.org/releases/ffmpeg-${PKG_VERSION}.tar.xz" @@ -64,9 +64,9 @@ pre_configure_target() { PKG_FFMPEG_X26x_GENERIC="\ --enable-libx264 \ - --enable-encoder=x264 \ + --enable-encoder=libx264 \ --enable-libx265 \ - --enable-encoder=x265" + --enable-encoder=libx265" fi # Encoders @@ -134,7 +134,6 @@ configure_target() { ${PKG_FFMPEG_ENCODERS} \ \ `#General options` \ - --enable-avresample \ --disable-lzma \ --disable-alsa \ ${PKG_FFMPEG_X11_GRAB} \ diff --git a/packages/addons/addon-depends/ffmpegx/patches/ffmpeg-openssl3.patch b/packages/addons/addon-depends/ffmpegx/patches/ffmpeg-openssl3.patch deleted file mode 100644 index 59e78ab369..0000000000 --- a/packages/addons/addon-depends/ffmpegx/patches/ffmpeg-openssl3.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1d23e125b6f76e74b754560c3b6931507cacddce Mon Sep 17 00:00:00 2001 -From: Timo Rothenpieler -Date: Tue, 7 Sep 2021 19:35:31 +0200 -Subject: [PATCH] configure: account for openssl3 license change - ---- - configure | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index c87a010387..ed7345b2c1 100755 ---- a/configure -+++ b/configure -@@ -1765,7 +1765,6 @@ EXTERNAL_LIBRARY_GPL_LIST=" - EXTERNAL_LIBRARY_NONFREE_LIST=" - decklink - libfdk_aac -- openssl - libtls - " - -@@ -1857,6 +1856,7 @@ EXTERNAL_LIBRARY_LIST=" - mediacodec - openal - opengl -+ openssl - pocketsphinx - vapoursynth - " -@@ -6572,7 +6572,10 @@ enabled omx_rpi && { test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoR - die "ERROR: OpenMAX IL headers from raspberrypi/firmware not found"; } && - enable omx - enabled omx && require_headers OMX_Core.h --enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl || -+enabled openssl && { { check_pkg_config openssl "openssl >= 3.0.0" openssl/ssl.h OPENSSL_init_ssl && -+ { enabled gplv3 || ! enabled gpl || enabled nonfree || die "ERROR: OpenSSL >=3.0.0 requires --enable-version3"; }; } || -+ { enabled gpl && ! enabled nonfree && die "ERROR: OpenSSL <3.0.0 is incompatible with the gpl"; } || -+ check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl || - check_pkg_config openssl openssl openssl/ssl.h SSL_library_init || - check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto || - check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto || --- -2.34.1 - diff --git a/packages/addons/addon-depends/ffmpegx/patches/fmpegx-0001-Fixes-assembling-with-binutils-as-2.41.patch b/packages/addons/addon-depends/ffmpegx/patches/fmpegx-0001-Fixes-assembling-with-binutils-as-2.41.patch deleted file mode 100644 index 6c81971cbe..0000000000 --- a/packages/addons/addon-depends/ffmpegx/patches/fmpegx-0001-Fixes-assembling-with-binutils-as-2.41.patch +++ /dev/null @@ -1,84 +0,0 @@ -From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001 -From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= -Date: Sun, 16 Jul 2023 18:18:02 +0300 -Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift - instructions within inline assembly - -Fixes assembling with binutils as >= 2.41 - -Upstream: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=effadce6c756247ea8bae32dc13bb3e6f464f0eb - -Bug reports for this change in binutils: -https://fftrac-bg.ffmpeg.org/ticket/10405 -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108941 -https://sourceware.org/bugzilla/show_bug.cgi?id=30578 - -Signed-off-by: James Almer -Signed-off-by: Bernd Kuhls ---- - libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++--- - 1 file changed, 23 insertions(+), 3 deletions(-) - -diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h -index 6298f5ed19..ca7e2dffc1 100644 ---- a/libavcodec/x86/mathops.h -+++ b/libavcodec/x86/mathops.h -@@ -35,12 +35,20 @@ - static av_always_inline av_const int MULL(int a, int b, unsigned shift) - { - int rt, dummy; -+ if (__builtin_constant_p(shift)) - __asm__ ( - "imull %3 \n\t" - "shrdl %4, %%edx, %%eax \n\t" - :"=a"(rt), "=d"(dummy) -- :"a"(a), "rm"(b), "ci"((uint8_t)shift) -+ :"a"(a), "rm"(b), "i"(shift & 0x1F) - ); -+ else -+ __asm__ ( -+ "imull %3 \n\t" -+ "shrdl %4, %%edx, %%eax \n\t" -+ :"=a"(rt), "=d"(dummy) -+ :"a"(a), "rm"(b), "c"((uint8_t)shift) -+ ); - return rt; - } - -@@ -113,19 +121,31 @@ __asm__ volatile(\ - // avoid +32 for shift optimization (gcc should do that ...) - #define NEG_SSR32 NEG_SSR32 - static inline int32_t NEG_SSR32( int32_t a, int8_t s){ -+ if (__builtin_constant_p(s)) - __asm__ ("sarl %1, %0\n\t" - : "+r" (a) -- : "ic" ((uint8_t)(-s)) -+ : "i" (-s & 0x1F) - ); -+ else -+ __asm__ ("sarl %1, %0\n\t" -+ : "+r" (a) -+ : "c" ((uint8_t)(-s)) -+ ); - return a; - } - - #define NEG_USR32 NEG_USR32 - static inline uint32_t NEG_USR32(uint32_t a, int8_t s){ -+ if (__builtin_constant_p(s)) - __asm__ ("shrl %1, %0\n\t" - : "+r" (a) -- : "ic" ((uint8_t)(-s)) -+ : "i" (-s & 0x1F) - ); -+ else -+ __asm__ ("shrl %1, %0\n\t" -+ : "+r" (a) -+ : "c" ((uint8_t)(-s)) -+ ); - return a; - } - --- -2.30.2 -