| 1 |
commit: 774e5570787961d0c03ae16185095c3f5bc9b72e |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 24 16:19:14 2020 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 24 16:19:14 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=774e5570 |
| 7 |
|
| 8 |
media-tv/tvheadend: Fix building with -fno-common |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/707768 |
| 11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 12 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/tvheadend-4.2.8-fno-common.patch | 55 ++++++++++++++++++++++ |
| 15 |
media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild | 1 + |
| 16 |
media-tv/tvheadend/tvheadend-9999.ebuild | 1 + |
| 17 |
3 files changed, 57 insertions(+) |
| 18 |
|
| 19 |
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..23f48652f9d |
| 22 |
--- /dev/null |
| 23 |
+++ b/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch |
| 24 |
@@ -0,0 +1,55 @@ |
| 25 |
+From 1f2a0a59e3acaef88509d3ac899b905c73b7b8f8 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: James Le Cuirot <chewi@g.o> |
| 27 |
+Date: Fri, 15 May 2020 17:45:30 +0100 |
| 28 |
+Subject: [PATCH] Fix building with -fno-common (default from GCC 10) |
| 29 |
+ |
| 30 |
+--- |
| 31 |
+ src/input.h | 4 ++-- |
| 32 |
+ src/input/mpegts.c | 2 ++ |
| 33 |
+ src/input/mpegts.h | 2 +- |
| 34 |
+ 3 files changed, 5 insertions(+), 3 deletions(-) |
| 35 |
+ |
| 36 |
+diff --git a/src/input.h b/src/input.h |
| 37 |
+index a9c96df04..3dce355c6 100644 |
| 38 |
+--- a/src/input.h |
| 39 |
++++ b/src/input.h |
| 40 |
+@@ -133,8 +133,8 @@ void tvh_hardware_delete ( tvh_hardware_t *th ); |
| 41 |
+ extern const idclass_t tvh_input_class; |
| 42 |
+ extern const idclass_t tvh_input_instance_class; |
| 43 |
+ |
| 44 |
+-tvh_input_list_t tvh_inputs; |
| 45 |
+-tvh_hardware_list_t tvh_hardware; |
| 46 |
++extern tvh_input_list_t tvh_inputs; |
| 47 |
++extern tvh_hardware_list_t tvh_hardware; |
| 48 |
+ |
| 49 |
+ #define TVH_INPUT_FOREACH(x) LIST_FOREACH(x, &tvh_inputs, ti_link) |
| 50 |
+ #define TVH_HARDWARE_FOREACH(x) LIST_FOREACH(x, &tvh_hardware, th_link) |
| 51 |
+diff --git a/src/input/mpegts.c b/src/input/mpegts.c |
| 52 |
+index e02d491f1..fca4f3429 100644 |
| 53 |
+--- a/src/input/mpegts.c |
| 54 |
++++ b/src/input/mpegts.c |
| 55 |
+@@ -20,6 +20,8 @@ |
| 56 |
+ #include "mpegts/fastscan.h" |
| 57 |
+ #include "memoryinfo.h" |
| 58 |
+ |
| 59 |
++struct mpegts_listeners mpegts_listeners; |
| 60 |
++ |
| 61 |
+ extern memoryinfo_t mpegts_input_queue_memoryinfo; |
| 62 |
+ extern memoryinfo_t mpegts_input_table_memoryinfo; |
| 63 |
+ |
| 64 |
+diff --git a/src/input/mpegts.h b/src/input/mpegts.h |
| 65 |
+index 9dda3baca..9c4c57b73 100644 |
| 66 |
+--- a/src/input/mpegts.h |
| 67 |
++++ b/src/input/mpegts.h |
| 68 |
+@@ -1149,7 +1149,7 @@ typedef struct mpegts_listener |
| 69 |
+ void (*ml_mux_delete) (mpegts_mux_t *mm, void *p); |
| 70 |
+ } mpegts_listener_t; |
| 71 |
+ |
| 72 |
+-LIST_HEAD(,mpegts_listener) mpegts_listeners; |
| 73 |
++extern LIST_HEAD(mpegts_listeners, mpegts_listener) mpegts_listeners; |
| 74 |
+ |
| 75 |
+ #define mpegts_add_listener(ml)\ |
| 76 |
+ LIST_INSERT_HEAD(&mpegts_listeners, ml, ml_link) |
| 77 |
+-- |
| 78 |
+2.26.2 |
| 79 |
+ |
| 80 |
|
| 81 |
diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild |
| 82 |
index 7886d755c7d..9c12a6de1a1 100644 |
| 83 |
--- a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild |
| 84 |
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild |
| 85 |
@@ -53,6 +53,7 @@ PATCHES=( |
| 86 |
"${FILESDIR}"/${PN}-4.2.7-python3.patch |
| 87 |
"${FILESDIR}"/${PN}-4.2.8-gcc9.patch |
| 88 |
"${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch |
| 89 |
+ "${FILESDIR}"/${PN}-4.2.8-fno-common.patch |
| 90 |
) |
| 91 |
|
| 92 |
DOCS=( README.md ) |
| 93 |
|
| 94 |
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild |
| 95 |
index e8e5c2814ed..43d6c88ec8d 100644 |
| 96 |
--- a/media-tv/tvheadend/tvheadend-9999.ebuild |
| 97 |
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild |
| 98 |
@@ -62,6 +62,7 @@ PATCHES=( |
| 99 |
"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch |
| 100 |
"${FILESDIR}"/${PN}-4.2.7-python3.patch |
| 101 |
"${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch |
| 102 |
+ "${FILESDIR}"/${PN}-4.2.8-fno-common.patch |
| 103 |
) |
| 104 |
|
| 105 |
DOCS=( README.md ) |
Archives