[tvheadend] Fix build with hdhomerun >= 20190621

commit 54e16915e46ba8ad747dd220917dfe53a1df575f Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; Date: Tue Mar 10 10:27:23 2020 +0100 Fix build with hdhomerun >= 20190621 sources | 2 +- tvheadend-4.2.8-hdhomerun20190621.patch | 12 ++++++++++++ tvheadend.spec | 7 ++++++- 3 files changed, 19 insertions(+), 2 deletions(-) --- diff --git a/sources b/sources index 071dc3a..8bca8cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9571efa46dd489f9fe87acdb391d591 tvheadend-4.2.8.tar.gz +SHA512 (tvheadend-4.2.8.tar.gz) = e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f diff --git a/tvheadend-4.2.8-hdhomerun20190621.patch b/tvheadend-4.2.8-hdhomerun20190621.patch new file mode 100644 index 0000000..f23efd3 --- /dev/null +++ b/tvheadend-4.2.8-hdhomerun20190621.patch @@ -0,0 +1,12 @@ +diff -up ./src/input/mpegts/tvhdhomerun/tvhdhomerun.c.orig ./src/input/mpegts/tvhdhomerun/tvhdhomerun.c +--- ./src/input/mpegts/tvhdhomerun/tvhdhomerun.c.orig 2019-01-12 09:58:47.000000000 +0100 ++++ ./src/input/mpegts/tvhdhomerun/tvhdhomerun.c 2020-03-10 10:10:22.429845330 +0100 +@@ -28,7 +28,7 @@ + #include <arpa/inet.h> + #include <openssl/sha.h> + +-#ifdef HDHOMERUN_TAG_DEVICE_AUTH_BIN ++#if defined(HDHOMERUN_TAG_DEVICE_AUTH_BIN) || defined(HDHOMERUN_TAG_DEVICE_AUTH_BIN_DEPRECATED) + #define hdhomerun_discover_find_devices_custom \ + hdhomerun_discover_find_devices_custom_v2 + #endif diff --git a/tvheadend.spec b/tvheadend.spec index 39b1984..bef92c4 100644 --- a/tvheadend.spec +++ b/tvheadend.spec @@ -20,7 +20,7 @@ Name: tvheadend Version: 4.2.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: TV streaming server and digital video recorder License: GPLv3+ @@ -43,6 +43,8 @@ Patch4: %{name}-4.2.1-crypto_policies.patch Patch5: %{name}-4.2.7-python3.patch # Fix build with GCC 9 Patch6: %{name}-4.2.8-gcc9.patch +# Fix build with hdhomerun >= 20190621 +Patch7: %{name}-4.2.8-hdhomerun20190621.patch BuildRequires: bzip2 BuildRequires: gcc @@ -232,6 +234,9 @@ exit 0 %changelog +* Tue Mar 10 2020 Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; - 4.2.8-8 +- Fix build with hdhomerun >= 20190621 + * Sat Feb 22 2020 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com&gt; - 4.2.8-7 - Rebuild for ffmpeg-4.3 git