commit 5cc89a94fc7385b86a16dc1828c56bdc46cc8ca9 Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; Date: Sun Apr 9 10:10:56 2023 +0200 - Update to latest snapshot - Fix build with FFmpeg 6 - Switch to SPDX license identifiers .gitignore | 1 + sources | 2 +- tvheadend-4.3-ffmpeg6.patch | 29 +++++++++++++++++++++++++++++ tvheadend.spec | 40 +++++++++++++++++++++++++++------------- 4 files changed, 58 insertions(+), 14 deletions(-) --- diff --git a/.gitignore b/.gitignore index 5cc38a7..4cd4a53 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /tvheadend-eb59284.tar.gz /tvheadend-6efa411.tar.gz /tvheadend-2bf1629.tar.gz +/tvheadend-f32c7c5.tar.gz diff --git a/sources b/sources index d684479..afdfa0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tvheadend-2bf1629.tar.gz) = 69cf151a5e9b32cf0e63b4ded953a129e684ef187b14b9e33d0a96a82f514fa722ebd81cadb4f78436f84855099fa6788ecd08a357b792db32fb72359622c890 +SHA512 (tvheadend-f32c7c5.tar.gz) = 855eb127e6e49eb54dace731b790d721f97d29c51b63cea78766fdfe7cd2cdf688f1e8914eb141703e37f7dacb63f5ea641a2e276340de74f34ea221d5d358c1 diff --git a/tvheadend-4.3-ffmpeg6.patch b/tvheadend-4.3-ffmpeg6.patch new file mode 100644 index 0000000..b253421 --- /dev/null +++ b/tvheadend-4.3-ffmpeg6.patch @@ -0,0 +1,29 @@ +diff -up ./Makefile.ffmpeg.orig ./Makefile.ffmpeg +--- ./Makefile.ffmpeg.orig 2023-04-08 21:56:27.000000000 +0200 ++++ ./Makefile.ffmpeg 2023-04-09 09:50:57.204835203 +0200 +@@ -108,10 +108,10 @@ FFNVCODEC_TB = $(FFNVCODEC).tar.gz + FFNVCODEC_URL = https://github.com/FFmpeg/nv-codec-headers/releases/download/n$(FFNVCODEC... + FFNVCODEC_SHA1 = 89bee0d3025b813c513084ad8546b0261623fbb0 + +-FFMPEG = ffmpeg-5.1.2 ++FFMPEG = ffmpeg-6.0 + FFMPEG_TB = $(FFMPEG).tar.bz2 + FFMPEG_URL = https://ffmpeg.org/releases/$(FFMPEG_TB) +-FFMPEG_SHA1 = f5215c15ca50a43856f641c714c6070aa148dd66 ++FFMPEG_SHA1 = 7ce79a1806f3f19b6b044f83d0cec39309dab0ee + + + # ############################################################################## +diff -up ./src/transcoding/transcode/hwaccels/vaapi.c.orig ./src/transcoding/transcode/hwaccels/vaapi.c +--- ./src/transcoding/transcode/hwaccels/vaapi.c.orig 2023-04-08 21:56:27.000000000 +0200 ++++ ./src/transcoding/transcode/hwaccels/vaapi.c 2023-04-09 09:50:57.205835218 +0200 +@@ -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; + } diff --git a/tvheadend.spec b/tvheadend.spec index 062d64e..a1faf7a 100644 --- a/tvheadend.spec +++ b/tvheadend.spec @@ -1,21 +1,21 @@ -%global commit 2bf1629280bcd7d33e93df165985f3f6253c4b70 +%global commit f32c7c59a19a276648d7b068041738e4e8337638 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20220330 +%global commitdate 20230408 # https://tvheadend.org/issues/6026 %global _lto_cflags %nil Name: tvheadend -Version: 4.3 -Release: 9.%{commitdate}git%{shortcommit}%{?dist} +Version: 4.3^%{commitdate}git%{shortcommit} +Release: 1%{?dist} Summary: TV streaming server and digital video recorder -# - Source code is GPLv3+ -# - Silk icons in vendor/famfamsilk/ are CC-BY +# - Source code is GPL-3.0-or-later +# - Silk icons in vendor/famfamsilk/ are CC-BY-2.5 # - Noto icons in vendor/noto/ are ASL -License: GPLv3+ and CC-BY and ASL 2.0 +License: GPL-3.0-or-later and CC-BY-2.5 and Apache-2.0 URL: https://tvheadend.org/ -Source0: https://github.com/tvheadend/%{name}/archive/%{shortcommit}/%{name}-%{sho... +Source0: https://github.com/%{name}/%{name}/archive/%{shortcommit}/%{name}-%{short... Source1: %{name}.sysusers # Use system queue.h header Patch0: %{name}-4.3-use_system_queue.patch @@ -32,12 +32,10 @@ Patch4: %{name}-4.3-dtv_scan_tables.patch # Enforcing system crypto policies, see # https://fedoraproject.org/wiki/Packaging:CryptoPolicies Patch5: %{name}-4.3-crypto_policies.patch -# Disable libavresample (see -# https://bugzilla.rpmfusion.org/show_bug.cgi?id=5352) -Patch6: %{name}-4.3-libavresample.patch +# Add support for FFmpeg 6 (see https://github.com/tvheadend/tvheadend/pull/1522) +Patch6: %{name}-4.3-ffmpeg6.patch BuildRequires: bzip2 -BuildRequires: compat-ffmpeg4-devel BuildRequires: gcc BuildRequires: gettext BuildRequires: gzip @@ -46,7 +44,13 @@ BuildRequires: libdvbcsa-devel BuildRequires: make BuildRequires: pkgconfig(avahi-client) BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavfilter) +BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libpcre2-8) +BuildRequires: pkgconfig(libswresample) +BuildRequires: pkgconfig(libswscale) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(liburiparser) BuildRequires: pkgconfig(libva) @@ -108,10 +112,10 @@ done %build -export CFLAGS="$RPM_OPT_FLAGS -Wno-error=array-bounds -Wno-error=use-after-free -Wno-error=address" echo "%{version}-%{release}" >rpm/version %configure \ --disable-dvbscan \ + --disable-libfdkaac_static \ --disable-ffmpeg_static \ --disable-hdhomerun_static \ --disable-libfdkaac_static \ @@ -121,6 +125,7 @@ echo "%{version}-%{release}" >rpm/version --disable-libvpx_static \ --disable-libx264_static \ --disable-libx265_static \ + --enable-libfdkaac \ --enable-hdhomerun_client \ --enable-libsystemd_daemon \ --python=%{python3} @@ -153,6 +158,10 @@ rm $RPM_BUILD_ROOT%{python3_sitelib}/tvh/tv_meta_*.py chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 +%check +%py3_check_import tvh + + %pre %sysusers_create_compat %{SOURCE1} @@ -190,6 +199,11 @@ chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 %changelog +* Tue Apr 04 2023 Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; - 4.3^20230408gitf32c7c5-1 +- Update to latest snapshot +- Fix build with FFmpeg 6 +- Switch to SPDX license identifiers + * Wed Aug 17 2022 Leigh Scott <leigh123linux(a)gmail.com&gt; - 4.3-9.20220330git2bf1629 - Set pkgconfig path for compat-ffmpeg4