From 47b50b64b6fe69ddc292702a4207b44a25bab42b Mon Sep 17 00:00:00 2001
From: CvH <1355173+CvH@users.noreply.github.com>
Date: Sat, 9 Dec 2023 22:47:31 +0100
Subject: [PATCH] tvheadend43: update to 4.3-2180

---
 packages/addons/service/tvheadend43/package.mk       |  6 +++---
 .../patches/tvheadend43-01-dvb-scan-path.patch       |  2 +-
 .../patches/tvheadend43-02-hdhomerun-includes.patch  |  2 +-
 .../patches/tvheadend43-03-ffmpeg-6.0-support.patch  | 12 ------------
 4 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 packages/addons/service/tvheadend43/patches/tvheadend43-03-ffmpeg-6.0-support.patch

diff --git a/packages/addons/service/tvheadend43/package.mk b/packages/addons/service/tvheadend43/package.mk
index 774a99e75b..888ad05233 100644
--- a/packages/addons/service/tvheadend43/package.mk
+++ b/packages/addons/service/tvheadend43/package.mk
@@ -2,9 +2,9 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="tvheadend43"
-PKG_VERSION="905b4f0d0387818cbbf7012bf4dffb25e9893748"
-PKG_SHA256="3decc29681e7eefac7a734116078b6f36fa125d81c8b9c9998b96070fcbe53a0"
-PKG_VERSION_NUMBER="4.3-2091"
+PKG_VERSION="3dcb7ecf36666dcb43211a84141b1b645c9ca757"
+PKG_SHA256="c7c8414bca5304276cc8f07aa291e36b50e1190d441f2af2ce256631b7c033c2"
+PKG_VERSION_NUMBER="4.3-2180"
 PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/addons/service/tvheadend43/patches/tvheadend43-01-dvb-scan-path.patch b/packages/addons/service/tvheadend43/patches/tvheadend43-01-dvb-scan-path.patch
index 6acc023bd9..bbd98bc28d 100644
--- a/packages/addons/service/tvheadend43/patches/tvheadend43-01-dvb-scan-path.patch
+++ b/packages/addons/service/tvheadend43/patches/tvheadend43-01-dvb-scan-path.patch
@@ -1,6 +1,6 @@
 --- a/src/input/mpegts/scanfile.c
 +++ b/src/input/mpegts/scanfile.c
-@@ -921,7 +921,7 @@ scanfile_init ( const char *muxconf_path
+@@ -922,7 +922,7 @@ scanfile_init ( const char *muxconf_path
  #elif defined(PLATFORM_FREEBSD)
      path = "/usr/local/share/dtv-scan-tables";
  #else
diff --git a/packages/addons/service/tvheadend43/patches/tvheadend43-02-hdhomerun-includes.patch b/packages/addons/service/tvheadend43/patches/tvheadend43-02-hdhomerun-includes.patch
index f5fd399e2d..95275c5c0c 100644
--- a/packages/addons/service/tvheadend43/patches/tvheadend43-02-hdhomerun-includes.patch
+++ b/packages/addons/service/tvheadend43/patches/tvheadend43-02-hdhomerun-includes.patch
@@ -2,7 +2,7 @@ fix libhdhomerun includes
 
 --- a/configure
 +++ b/configure
-@@ -419,7 +419,7 @@ if enabled hdhomerun_static; then
+@@ -481,7 +481,7 @@ if enabled hdhomerun_static; then
  else
  
    if enabled_or_auto hdhomerun_client; then
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
deleted file mode 100644
index 2d6c6f4699..0000000000
--- a/packages/addons/service/tvheadend43/patches/tvheadend43-03-ffmpeg-6.0-support.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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;
- }