From 3f5102deda3765b1a16268879885d827faa9a63b Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Tue, 8 Nov 2022 21:11:31 +0100
Subject: [PATCH] ffmpeg: update to 5.1.2

Signed-off-by: Matthias Reichl <hias@horus.com>
---
 packages/multimedia/ffmpeg/package.mk         | 15 ++-----
 .../ffmpeg/patches/ffmpeg-openssl3.patch      | 44 -------------------
 2 files changed, 4 insertions(+), 55 deletions(-)
 delete mode 100644 packages/multimedia/ffmpeg/patches/ffmpeg-openssl3.patch

diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk
index 3b354f5b46..2acc1b5782 100644
--- a/packages/multimedia/ffmpeg/package.mk
+++ b/packages/multimedia/ffmpeg/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="ffmpeg"
-PKG_VERSION="4.4.1"
-PKG_SHA256="eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02"
+PKG_VERSION="5.1.2"
+PKG_SHA256="619e706d662c8420859832ddc259cd4d4096a48a2ce1eefd052db9e440eef3dc"
 PKG_LICENSE="GPL-3.0-only"
 PKG_SITE="https://ffmpeg.org"
 PKG_URL="http://ffmpeg.org/releases/ffmpeg-${PKG_VERSION}.tar.xz"
@@ -18,10 +18,9 @@ case "${PROJECT}" in
     PKG_FFMPEG_BRANCH="dev/4.4/rpi_import_1"
     PKG_SHA256="3b42cbffd15d95d59e402475fcdb1aaac9ae6a8404a521b95d1fe79c6b2baad4"
     PKG_URL="https://github.com/jc-kynesim/rpi-ffmpeg/archive/${PKG_VERSION}.tar.gz"
-    PKG_PATCH_DIRS="libreelec dav1d"
     ;;
   RPi)
-    PKG_FFMPEG_RPI="--disable-mmal --disable-rpi --enable-sand"
+    PKG_FFMPEG_RPI="--disable-mmal --enable-sand"
     PKG_PATCH_DIRS+=" rpi"
     ;;
   *)
@@ -48,14 +47,8 @@ if [ "${V4L2_SUPPORT}" = "yes" ]; then
   PKG_NEED_UNPACK+=" $(get_pkg_directory libdrm)"
   PKG_FFMPEG_V4L2="--enable-v4l2_m2m --enable-libdrm"
 
-  if [ "${PROJECT}" = "Allwinner" -o "${PROJECT}" = "Rockchip" -o "${DEVICE}" = "iMX8" ]; then
+  if [ "${PROJECT}" = "Allwinner" -o "${PROJECT}" = "Rockchip" -o "${DEVICE}" = "iMX8" -o "${DEVICE}" = "RPi4" ]; then
     PKG_V4L2_REQUEST="yes"
-  elif [ "${PROJECT}" = "RPi" -a "${DEVICE}" = "RPi4" ]; then
-    PKG_V4L2_REQUEST="yes"
-    PKG_FFMPEG_HWACCEL="--disable-hwaccel=h264_v4l2request \
-                        --disable-hwaccel=mpeg2_v4l2request \
-                        --disable-hwaccel=vp8_v4l2request \
-                        --disable-hwaccel=vp9_v4l2request"
   else
     PKG_V4L2_REQUEST="no"
   fi
diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-openssl3.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-openssl3.patch
deleted file mode 100644
index 59e78ab369..0000000000
--- a/packages/multimedia/ffmpeg/patches/ffmpeg-openssl3.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 1d23e125b6f76e74b754560c3b6931507cacddce Mon Sep 17 00:00:00 2001
-From: Timo Rothenpieler <timo@rothenpieler.org>
-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
-