From 946db665485d302e625d13fce27290d69dd68f56 Mon Sep 17 00:00:00 2001
From: Jan Palus <atler@pld-linux.org>
Date: Sat, 6 Apr 2024 20:48:45 +0200
Subject: [PATCH] up to 20240324 snap

---
 ffmpeg6.patch  | 20 --------------------
 tvheadend.spec | 10 ++++------
 2 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 ffmpeg6.patch

diff --git a/ffmpeg6.patch b/ffmpeg6.patch
deleted file mode 100644
index 7648a99..0000000
--- a/ffmpeg6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- tvheadend-c531383ca6654639dc112db67fd8dc893c1f5272/src/transcoding/transcode/hwaccels/vaapi.c.orig	2023-07-19 21:53:15.000000000 +0200
-+++ tvheadend-c531383ca6654639dc112db67fd8dc893c1f5272/src/transcoding/transcode/hwaccels/vaapi.c	2023-10-22 00:24:48.608611141 +0200
-@@ -21,6 +21,7 @@
- #include "../internals.h"
- #include "vaapi.h"
- 
-+#include <libavcodec/version.h>
- #include <libavutil/hwcontext.h>
- #include <libavutil/hwcontext_vaapi.h>
- #include <libavutil/pixdesc.h>
-@@ -594,7 +595,9 @@
-     }
- 
-     avctx->get_buffer2 = vaapi_get_buffer2;
-+#if LIBAVCODEC_VERSION_MAJOR < 60
-     avctx->thread_safe_callbacks = 0;
-+#endif
- 
-     return 0;
- }
diff --git a/tvheadend.spec b/tvheadend.spec
index 7b84b5b..36a410f 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -2,9 +2,9 @@
 # Conditional build:
 %bcond_without	systemd		# without systemd support
 
-%define		gitref	c531383ca6654639dc112db67fd8dc893c1f5272
-%define		snap	20230719
-%define		rel	2
+%define		gitref	ab6ea89b11b1f1a8dcbfd7cfc29d65b3013f2702
+%define		snap	20240324
+%define		rel	1
 
 Summary:	TV streaming server
 Name:		tvheadend
@@ -14,12 +14,11 @@ Release:	0.%{snap}.%{rel}
 License:	GPL v3
 Group:		Applications/Multimedia
 Source0:	https://github.com/tvheadend/tvheadend/archive/%{gitref}/%{name}-%{snap}.tar.gz
-# Source0-md5:	145d05de790f785f8f1d8f2166d4ce41
+# Source0-md5:	551697c45195b4cee9178ef0e6ebb8e2
 Source1:	%{name}.service
 Source2:	%{name}.sysconfig
 Source3:	%{name}.init
 Patch0:		x32.patch
-Patch1:		ffmpeg6.patch
 URL:		https://tvheadend.org/projects/tvheadend
 BuildRequires:	avahi-devel
 BuildRequires:	dbus-devel
@@ -56,7 +55,6 @@ DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources.
 %ifarch x32
 %patch0 -p1
 %endif
-%patch1 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python3$,%{__python3},' lib/py/tvh/tv_meta_{tm,tv}db.py support/tvhmeta
 
-- 
2.44.0