From a317793d2c37c3b5a34a74b493cfb3eeb721edcc Mon Sep 17 00:00:00 2001
From: CvH <1355173+CvH@users.noreply.github.com>
Date: Tue, 21 Nov 2023 22:08:40 +0100
Subject: [PATCH] ffmpegx: update to 6.0.1

---
 packages/addons/addon-depends/ffmpegx/package.mk     |  6 +++---
 .../patches/tvheadend43-03-ffmpeg-6.0-support.patch  | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 packages/addons/service/tvheadend43/patches/tvheadend43-03-ffmpeg-6.0-support.patch

diff --git a/packages/addons/addon-depends/ffmpegx/package.mk b/packages/addons/addon-depends/ffmpegx/package.mk
index 63e6ac957f..cb3ba3a7f3 100644
--- a/packages/addons/addon-depends/ffmpegx/package.mk
+++ b/packages/addons/addon-depends/ffmpegx/package.mk
@@ -2,9 +2,9 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="ffmpegx"
-PKG_VERSION="5.1.4"
-PKG_SHA256="54383bb890a1cd62580e9f1eaa8081203196ed53bde9e98fb6b0004423f49063"
-PKG_LICENSE="LGPLv2.1+"
+PKG_VERSION="6.0.1"
+PKG_SHA256="9b16b8731d78e596b4be0d720428ca42df642bb2d78342881ff7f5bc29fc9623"
+PKG_LICENSE="GPL-3.0-only"
 PKG_SITE="https://ffmpeg.org"
 PKG_URL="https://ffmpeg.org/releases/ffmpeg-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain aom bzip2 openssl lame libvorbis opus x264 zlib"
diff --git a/packages/addons/service/tvheadend43/patches/tvheadend43-03-ffmpeg-6.0-support.patch b/packages/addons/service/tvheadend43/patches/tvheadend43-03-ffmpeg-6.0-support.patch
new file mode 100644
index 0000000000..2d6c6f4699
--- /dev/null
+++ b/packages/addons/service/tvheadend43/patches/tvheadend43-03-ffmpeg-6.0-support.patch
@@ -0,0 +1,12 @@
+--- a/src/transcoding/transcode/hwaccels/vaapi.c
++++ b/src/transcoding/transcode/hwaccels/vaapi.c
+@@ -594,7 +594,9 @@ vaapi_decode_setup_context(AVCodecContex
+     }
+ 
+     avctx->get_buffer2 = vaapi_get_buffer2;
++#if LIBAVCODEC_VERSION_MAJOR < 60
+     avctx->thread_safe_callbacks = 0;
++#endif
+ 
+     return 0;
+ }