| 1 |
commit: 7cafcb0803138fba20bc535c732115d6658a9b93 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 2 12:02:57 2019 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 2 12:04:21 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cafcb08 |
| 7 |
|
| 8 |
media-tv/tvheadend: Take upstream patch for libhdhomerun-20190621 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/698592 |
| 11 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
| 12 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/tvheadend-4.2.8-hdhomerun.patch | 29 ++++++++++++++++++++++ |
| 15 |
media-tv/tvheadend/tvheadend-4.2.8.ebuild | 2 +- |
| 16 |
2 files changed, 30 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..c30af8aba2a |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch |
| 23 |
@@ -0,0 +1,29 @@ |
| 24 |
+From 13cd23c371e3377973502f8dc65654b6a0ff372b Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Michael Marley <michael@×××××××××××××.com> |
| 26 |
+Date: Wed, 26 Jun 2019 19:35:50 -0400 |
| 27 |
+Subject: [PATCH] Fix compilation with libhdhomerun 20190621 |
| 28 |
+ |
| 29 |
+They renamed the symbol that was used to determine whether the |
| 30 |
+"hdhomerun_discover_find_devices_custom" needed to be aliased, |
| 31 |
+causing an FTBFS. Instead, recognize both the old and new symbols. |
| 32 |
+--- |
| 33 |
+ src/input/mpegts/tvhdhomerun/tvhdhomerun.c | 3 ++- |
| 34 |
+ 1 file changed, 2 insertions(+), 1 deletion(-) |
| 35 |
+ |
| 36 |
+diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c |
| 37 |
+index 58dec51ab..18068faf5 100644 |
| 38 |
+--- a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c |
| 39 |
++++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c |
| 40 |
+@@ -32,7 +32,8 @@ |
| 41 |
+ |
| 42 |
+ #include "config.h" |
| 43 |
+ |
| 44 |
+-#ifdef HDHOMERUN_TAG_DEVICE_AUTH_BIN |
| 45 |
++#if defined(HDHOMERUN_TAG_DEVICE_AUTH_BIN) \ |
| 46 |
++ || defined(HDHOMERUN_TAG_DEVICE_AUTH_BIN_DEPRECATED) |
| 47 |
+ #define hdhomerun_discover_find_devices_custom \ |
| 48 |
+ hdhomerun_discover_find_devices_custom_v2 |
| 49 |
+ #endif |
| 50 |
+-- |
| 51 |
+2.23.0 |
| 52 |
+ |
| 53 |
|
| 54 |
diff --git a/media-tv/tvheadend/tvheadend-4.2.8.ebuild b/media-tv/tvheadend/tvheadend-4.2.8.ebuild |
| 55 |
index 4a49b1460b5..a20bac30f22 100644 |
| 56 |
--- a/media-tv/tvheadend/tvheadend-4.2.8.ebuild |
| 57 |
+++ b/media-tv/tvheadend/tvheadend-4.2.8.ebuild |
| 58 |
@@ -47,7 +47,7 @@ REQUIRED_USE="dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )" |
| 59 |
|
| 60 |
PATCHES=( |
| 61 |
"${FILESDIR}"/${PN}-4.0.9-use_system_queue.patch |
| 62 |
- "${FILESDIR}"/${PN}-4.2.1-hdhomerun.patch |
| 63 |
+ "${FILESDIR}"/${PN}-4.2.{1,8}-hdhomerun.patch |
| 64 |
"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch |
| 65 |
"${FILESDIR}"/${PN}-4.2.7-python3.patch |
| 66 |
"${FILESDIR}"/${PN}-4.2.8-gcc9.patch |
Archives