media-tv/tvheadend: Take upstream patch for libhdhomerun-20190621

Closes: https://bugs.gentoo.org/698592
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi@gentoo.org>

diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch
new file mode 100644 (file)
index 0000000..c30af8a
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch
@@ -0,0 +1,29 @@
+From 13cd23c371e3377973502f8dc65654b6a0ff372b Mon Sep 17 00:00:00 2001
+From: Michael Marley <michael@michaelmarley.com>
+Date: Wed, 26 Jun 2019 19:35:50 -0400
+Subject: [PATCH] Fix compilation with libhdhomerun 20190621
+
+They renamed the symbol that was used to determine whether the
+"hdhomerun_discover_find_devices_custom" needed to be aliased,
+causing an FTBFS.  Instead, recognize both the old and new symbols.
+---
+ src/input/mpegts/tvhdhomerun/tvhdhomerun.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
+index 58dec51ab..18068faf5 100644
+--- a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
++++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
+@@ -32,7 +32,8 @@
+ 
+ #include "config.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
+-- 
+2.23.0
+

diff --git a/media-tv/tvheadend/tvheadend-4.2.8.ebuild b/media-tv/tvheadend/tvheadend-4.2.8.ebuild
index 4a49b1460b59680ed3bd830753829f043aafa96a..a20bac30f228e9b71792167f1df7db42425c7afb 100644 (file)
--- a/media-tv/tvheadend/tvheadend-4.2.8.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8.ebuild
@@ -47,7 +47,7 @@ REQUIRED_USE="dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )"
 
 PATCHES=(
        "${FILESDIR}"/${PN}-4.0.9-use_system_queue.patch
-       "${FILESDIR}"/${PN}-4.2.1-hdhomerun.patch
+       "${FILESDIR}"/${PN}-4.2.{1,8}-hdhomerun.patch
        "${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
        "${FILESDIR}"/${PN}-4.2.7-python3.patch
        "${FILESDIR}"/${PN}-4.2.8-gcc9.patch