From c20df431ff6fb27a645b18a9c708e9c5bd05e741 Mon Sep 17 00:00:00 2001 From: Bernhard Froehlich Date: Thu, 26 Sep 2019 09:20:46 +0000 Subject: [PATCH] multimedia/tvheadend: Fix compilation after update of multimedia/libhdhomerun to 20190621 Obtained from: https://github.com/tvheadend/tvheadend/pull/1281 MFH: 2019Q3 --- multimedia/tvheadend/Makefile | 2 +- ...src_input_mpegts_tvhdhomerun_tvhdhomerun.c | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 multimedia/tvheadend/files/patch-src_input_mpegts_tvhdhomerun_tvhdhomerun.c diff --git a/multimedia/tvheadend/Makefile b/multimedia/tvheadend/Makefile index b3b55064b17f..ef9644ac159a 100644 --- a/multimedia/tvheadend/Makefile +++ b/multimedia/tvheadend/Makefile @@ -4,7 +4,7 @@ PORTNAME= tvheadend PORTVERSION= 4.2.8 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MAINTAINER= decke@FreeBSD.org diff --git a/multimedia/tvheadend/files/patch-src_input_mpegts_tvhdhomerun_tvhdhomerun.c b/multimedia/tvheadend/files/patch-src_input_mpegts_tvhdhomerun_tvhdhomerun.c new file mode 100644 index 000000000000..b77ab4bde6e3 --- /dev/null +++ b/multimedia/tvheadend/files/patch-src_input_mpegts_tvhdhomerun_tvhdhomerun.c @@ -0,0 +1,26 @@ +From 6f494ce84b77de092447dbb793eca8cc7b5296ee Mon Sep 17 00:00:00 2001 +From: Michael Marley +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 58dec51ab3..18068faf5d 100644 +--- src/input/mpegts/tvhdhomerun/tvhdhomerun.c ++++ 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