8:47 a.m.
commit a1d2d73ee9e0ff9b9b02bb19ff00c6db871898f0
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Tue Jul 27 10:45:33 2021 +0200
Update to latest snapshot + Drop any dependency to libavresample (fix RHBZ #5352)
.gitignore | 1 +
sources | 2 +-
tvheadend-4.3-libavresample.patch | 22 ++++++++++++++++++++++
tvheadend.spec | 14 ++++++++++----
4 files changed, 34 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ed0984a..95b247f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/tvheadend-4.2.7.tar.gz
/tvheadend-4.2.8.tar.gz
/tvheadend-eb59284.tar.gz
+/tvheadend-6efa411.tar.gz
diff --git a/sources b/sources
index face364..618323c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tvheadend-eb59284.tar.gz) =
5637e16ffd21785a2fe531a1beb615200d95d0361684a559708030dcd830e7d7ae1d39dae93374def1d8cdabb32e16d1184b21c9b24aa5ed6499fdf32a7a6240
+SHA512 (tvheadend-6efa411.tar.gz) =
a5deeed07e4cde36184d26ecaec00ba8240ac88782662a89f92e3b1da54eead4c1909fd7dba3a4b3be98da201b6493c0c7c702e700dd1d65492290c4b2ad0b69
diff --git a/tvheadend-4.3-libavresample.patch b/tvheadend-4.3-libavresample.patch
new file mode 100644
index 0000000..8c025e9
--- /dev/null
+++ b/tvheadend-4.3-libavresample.patch
@@ -0,0 +1,22 @@
+diff -up ./configure.orig ./configure
+--- ./configure.orig 2021-07-09 15:38:00.582174018 +0200
++++ ./configure 2021-07-12 01:54:07.913746285 +0200
+@@ -629,7 +629,6 @@ else
+
+ check_pkg libavfilter ">=6.47.100" || has_libav=false
+ check_pkg libswresample ">=2.1.100" && has_resample=true
+- check_pkg libavresample ">=3.0.0" && has_resample=true
+ check_pkg libswscale ">=4.1.100" || has_libav=false
+ check_pkg libavformat ">=57.41.100" || has_libav=false
+ check_pkg libavcodec ">=57.48.101" || has_libav=false
+diff -up ./Makefile.orig ./Makefile
+--- ./Makefile.orig 2021-06-12 15:56:23.000000000 +0200
++++ ./Makefile 2021-07-12 01:42:31.299151134 +0200
+@@ -95,7 +95,6 @@ ifeq ($(CONFIG_LIBAV),yes)
+ FFMPEG_LIBS := \
+ libavfilter \
+ libswresample \
+- libavresample \
+ libswscale \
+ libavformat \
+ libavcodec \
diff --git a/tvheadend.spec b/tvheadend.spec
index 03164d8..7b4e1a7 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -1,13 +1,13 @@
-%global commit eb59284b8527e3c51eadfeca94ec1e9174cdbdb0
+%global commit 6efa411648cee0b9ca0ce5ab39ee847035c88566
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20210612
+%global commitdate 20210724
# https://tvheadend.org/issues/6026
%global _lto_cflags %nil
Name: tvheadend
Version: 4.3
-Release: 1.%{commitdate}git%{shortcommit}%{?dist}
+Release: 2.%{commitdate}git%{shortcommit}%{?dist}
Summary: TV streaming server and digital video recorder
# - Source code is GPLv3+
@@ -32,6 +32,9 @@ 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
BuildRequires: /usr/bin/pathfix.py
BuildRequires: bzip2
@@ -46,7 +49,6 @@ BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavfilter)
BuildRequires: pkgconfig(libavformat)
-BuildRequires: pkgconfig(libavresample)
BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libpcre2-8)
BuildRequires: pkgconfig(libswresample)
@@ -193,6 +195,10 @@ chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
%changelog
+* Tue Jul 27 2021 Mohamed El Morabity <melmorabity(a)fedoraproject.org> -
4.3-3.20210724git6efa411
+- Update to latest snapshot
+- Drop any dependency to libavresample (fix RHBZ #5352)
+
* Sat Jul 10 2021 Mohamed El Morabity <melmorabity(a)fedoraproject.org> -
4.3-1.20210612giteb59284
- Update to latest snapshot