diff --git a/packages/addons/service/tvheadend42/patches/tvheadend42-03-hdhomerun-fix.patch b/packages/addons/service/tvheadend42/patches/tvheadend42-03-hdhomerun-fix.patch new file mode 100644 index 0000000000..418e8ca1dc --- /dev/null +++ b/packages/addons/service/tvheadend42/patches/tvheadend42-03-hdhomerun-fix.patch @@ -0,0 +1,27 @@ +https://github.com/tvheadend/tvheadend/commit/13cd23c371e3377973502f8dc65654b6a0ff372b + +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 +--- 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 diff --git a/packages/multimedia/libhdhomerun/package.mk b/packages/multimedia/libhdhomerun/package.mk index 4dea9bc3d6..6c0cf26557 100644 --- a/packages/multimedia/libhdhomerun/package.mk +++ b/packages/multimedia/libhdhomerun/package.mk @@ -3,11 +3,11 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libhdhomerun" -PKG_VERSION="20180817" -PKG_SHA256="437888b27206f526827ee7a4c57c1c167a36483b0445232e07fb7bb7ee854b42" +PKG_VERSION="b0e5d5f5c8e2bf37dea34beb014e08ebb598ebf6" #20190625 +PKG_SHA256="ac39e03090c148678e1a8d4f928a728caccd2d29a0555287e7e5ece28c876959" PKG_LICENSE="LGPL" PKG_SITE="http://www.silicondust.com" -PKG_URL="http://download.silicondust.com/hdhomerun/${PKG_NAME}_${PKG_VERSION}.tgz" +PKG_URL="https://github.com/Silicondust/libhdhomerun/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="The library provides functionality to setup the HDHomeRun." diff --git a/packages/multimedia/libhdhomerun/patches/libhdhomerun-pr19-fix-gcc-8.3.0-build.patch b/packages/multimedia/libhdhomerun/patches/libhdhomerun-pr19-fix-gcc-8.3.0-build.patch deleted file mode 100644 index 71065d14fe..0000000000 --- a/packages/multimedia/libhdhomerun/patches/libhdhomerun-pr19-fix-gcc-8.3.0-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a83ec0c045d3fadb78a879d0ac8ae999b89786df Mon Sep 17 00:00:00 2001 -From: fuzzard -Date: Sun, 24 Feb 2019 07:47:31 +1000 -Subject: [PATCH] alignas c++ fix - -alignas is a keyword in c++. Dont define. -Change is in windows header already, and GCC 8.3.0 is erroring on this now. ---- - hdhomerun_os_posix.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hdhomerun_os_posix.h b/hdhomerun_os_posix.h -index baab8e5..d3dc5cb 100644 ---- a/hdhomerun_os_posix.h -+++ b/hdhomerun_os_posix.h -@@ -53,7 +53,7 @@ typedef struct { - - #define LIBHDHOMERUN_API - --#if !defined(alignas) -+#if !defined(alignas) && !defined(__cplusplus) - #define alignas(n) __attribute__((aligned(n))) - #endif -