diff options
Diffstat (limited to 'media-tv/tvheadend')
| -rw-r--r-- | media-tv/tvheadend/Manifest | 5 | ||||
| -rw-r--r-- | media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch | 55 | ||||
| -rw-r--r-- | media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild | 1 | ||||
| -rw-r--r-- | media-tv/tvheadend/tvheadend-9999.ebuild | 1 |
4 files changed, 60 insertions, 2 deletions
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest index c8dbf8d9400e..f8cf42657373 100644 --- a/media-tv/tvheadend/Manifest +++ b/media-tv/tvheadend/Manifest @@ -2,6 +2,7 @@ AUX tvheadend-4.0.9-use_system_queue.patch 296 BLAKE2B 0986117969d9bb3463123e984 AUX tvheadend-4.2.1-hdhomerun.patch 1045 BLAKE2B cad3922efbdd20c457c9570ecc75a786a997cafbe698226e31e4175394c38b79071ed7a165194ddc31e318ed015a0253dfb1f978695db35721749077154534f4 SHA512 416af870e5070001fbd0e09ec8c14160ff7c54b716564f708c6a983ca529cdf5963678c05551ad676a23c3347b4932bd7ae65e8eeea47a5f9f3955b46292c3f9 AUX tvheadend-4.2.2-dtv_scan_tables.patch 463 BLAKE2B 4e52d89d75c05d8a3cc645280794dd4570953bb5452d1067442177d7eb4c85779a8bcb96f1f8d3fbbcb6a34e770ff014bb262103eae5a92556ac4586038cdd9e SHA512 9bdecbac57ee1f30be91f9145e32f89949b5631090edc85cd5383915b09949ec9211f62474bd06afb4600e431093ce2ee5550d204b08c64b5b2e1a1cd38a517d AUX tvheadend-4.2.7-python3.patch 2952 BLAKE2B c6eee8aea74abd9a6eaacd3206a4b0191a45ce63e9e18bb213f1f6c85702a3836c44c55dd7131df4d739fb1f689c8bd97e24f4924e113649b7b0c9d349d471c7 SHA512 f031a06e5d4db4ea265a3e99bb07bee983ab40e5b028d9e69457971090e538b2057d49258cadda75db7816c2e4e9609819e59ab8a30d3ce848444774bfa1a02f +AUX tvheadend-4.2.8-fno-common.patch 1771 BLAKE2B a9c52afedc3c145fdd3bb3b67abf6890228b3083c56ba29abd86288fbf6b71d2960e6b4ed7aec383830f45db1cd637e8ef6124aa305166e301c49f52b3e65cbf SHA512 c2378d2f76dea88f2e987d9c62ca67f40cefd467c050dc30ab5d7127bc530642e78ccca9f36371373f2bd2101e451148310db41770e932f592484a119cae16fb AUX tvheadend-4.2.8-gcc9.patch 1772 BLAKE2B dc0033d7f61b8099d3f352cf8f05ff9073f3d6196c10ecac97c1cb1e7af7e01712478b2ef78b991336127ffbfcc9faf49b30b92f9af5e3c500783bc580a8908a SHA512 9b9d74a7d88187dd7895302b3c6142a14a136823fda5840fa464a5d3f3f97c8b59d4f839d10da14bd13bb6b346b75cac07069dab8ae626f68bc3000a70484834 AUX tvheadend-4.2.8-hdhomerun.patch 1067 BLAKE2B bbbac3dfc8e533770d096bf726c40429358307d5134186693fca5bb69ea7a291afc0f2aa24fb2744d330e72bdfb78ec44ed96f2f2c9a625d9ac63ed2bc913a5c SHA512 118d9086f52c727dd64c0a10471857b12f8c0798887bcd712383823ffcaa0a12a3b487b7941871f8120bc00672608eca596d6ca09cfd47abb9684deef4611faa AUX tvheadend-4.2.8-no-dvb-fix.patch 817 BLAKE2B d07b38662175f64c29c166c16aa0fc76240aa86d325a1b715dee3de4733287a615566d9cb53fce9da37cc69ff66992eb228c45e8b7dce77cc125a8dfc303ece8 SHA512 37fe828b3a878913468bd06e115dfd9eec29df840455872019414187bb4a904c50d2476fc0508c465a92029f28068a6e6da54d9089ca2c5957f34a94835dc04a @@ -10,6 +11,6 @@ AUX tvheadend.confd 359 BLAKE2B 3b44e47b9216daaa2defa69254700693015619e8b0196060 AUX tvheadend.initd 375 BLAKE2B 6fbf53a0a67957ee5756b56189d42b741adb7603b5590aa5fa0fd6b2a1d1ba930af05de8ebedba343302aa861f7fb42d3eb25b67acf6b43aa7c956d4965ab944 SHA512 6f17fa6bee502f586b4500c5f5541c9c6ce095deed7ddb3c1d1ad129a2e22fa66de0e72b712866659f7080753c73f67154d6dcdbf8539d6c8a942bea29bb1aa7 AUX tvheadend.service 575 BLAKE2B cc332347736f9dccc34ece966311899307d03e3bf852fa8052dd86f4bfe02e0b927da7b3b8b9d78c6fcb85d77ca889ac22c8106636cac825b8550e7bd5e38176 SHA512 c9c0f52dda9f325189f99fd275cd806f6b818761ab1bc00a36ddb934418d5cff4b9dcf594aaa446ec47f3b0004ab8fc75b221a4fb76ac8730c365f751056c522 DIST tvheadend-4.2.8.tar.gz 21875281 BLAKE2B fdd99ca6aff56f8daa073394f9c58e9cba4ea988a2884e24c2288fd4870dd0460624fb700838ba92867a57473cc4133fed5fbd56f0e40f02a0878ffcd0642c00 SHA512 e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f -EBUILD tvheadend-4.2.8-r1.ebuild 3448 BLAKE2B 9aaefa31ffcec4762a6cdee5e7b77d17ea1d5b22ddd7a8f9b73746e2eb889b95226b2210bbd4f1c3c6e454752ed1da50fda9ba24c9def282619d1181b534ab71 SHA512 c19ae734fa3942876023e98a7a83f9cf651d60feb8f5cbf2eae92cc4ca42e6006fefdd262333d797824b276c1198765a30245e8b937aba1b3a395e7fd65bd093 -EBUILD tvheadend-9999.ebuild 4145 BLAKE2B d9c98a52acb88fef1bc66bfec2ba740006b73c8154dbf2b3a050c3ad766ba5094ff8e441e36e320ca5b0190d1c0240564e12822220069c74d65df24063bd90db SHA512 29fc9ff9763c24444ced296365b0ae9eab9eb9e010865942772469a94867094adba31588969408969eb55bd66f55fd4ff5efffeb534e48c2688e7999e3d5de49 +EBUILD tvheadend-4.2.8-r1.ebuild 3492 BLAKE2B c279bcc365e15d6cd2c8651993722cef1c0e2919dd90a13645fd19a5e775cbff92871447b217d25d9e938b1b6cd7f0d7bd06a0edb440344317f64ac7ddea0367 SHA512 1d268651f62c08d240db0eaf0fc8105d124ce33ba13a1a7f58e2f9b11d7978649ffa30f91e132844764c351baebce1f87de16acadc45776011a9599eebe815b4 +EBUILD tvheadend-9999.ebuild 4189 BLAKE2B c6ce41179522cb6f51d72aa7f8060857d27cfd6b58738b6a6040893a7d825883aab68910911f72a98a0d2b256bf3662778a67953093e012970de5f41f08e351a SHA512 0e1e1a226aaee4acf962c9ee3132cb86b3a6a8b2a444ebe694bdb1f7c76cd44a750ab8e9160985487d6482e11fd6b46f4b17086a6122730d94bd9700634656b7 MISC metadata.xml 1445 BLAKE2B f71dc280d5fce7c0945939bcaf75d0d7f294aea6055c956b04e9e439199c2a6c107c800be6d18a0c58d154bdf7cdd0cd7d874e5cde5fc93f9b24160f536d21d8 SHA512 e26b94f14a619051e637b018d0f47ce86381821dd5207ba5b34429e0c0f83c55bfa9c37871e722af85719cf3e06322703d4709cbbd771b8f092efb8e85cb5b72 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 new file mode 100644 index 000000000000..23f48652f9de --- /dev/null +++ b/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch @@ -0,0 +1,55 @@ +From 1f2a0a59e3acaef88509d3ac899b905c73b7b8f8 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Fri, 15 May 2020 17:45:30 +0100 +Subject: [PATCH] Fix building with -fno-common (default from GCC 10) + +--- + src/input.h | 4 ++-- + src/input/mpegts.c | 2 ++ + src/input/mpegts.h | 2 +- + 3 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/input.h b/src/input.h +index a9c96df04..3dce355c6 100644 +--- a/src/input.h ++++ b/src/input.h +@@ -133,8 +133,8 @@ void tvh_hardware_delete ( tvh_hardware_t *th ); + extern const idclass_t tvh_input_class; + extern const idclass_t tvh_input_instance_class; + +-tvh_input_list_t tvh_inputs; +-tvh_hardware_list_t tvh_hardware; ++extern tvh_input_list_t tvh_inputs; ++extern tvh_hardware_list_t tvh_hardware; + + #define TVH_INPUT_FOREACH(x) LIST_FOREACH(x, &tvh_inputs, ti_link) + #define TVH_HARDWARE_FOREACH(x) LIST_FOREACH(x, &tvh_hardware, th_link) +diff --git a/src/input/mpegts.c b/src/input/mpegts.c +index e02d491f1..fca4f3429 100644 +--- a/src/input/mpegts.c ++++ b/src/input/mpegts.c +@@ -20,6 +20,8 @@ + #include "mpegts/fastscan.h" + #include "memoryinfo.h" + ++struct mpegts_listeners mpegts_listeners; ++ + extern memoryinfo_t mpegts_input_queue_memoryinfo; + extern memoryinfo_t mpegts_input_table_memoryinfo; + +diff --git a/src/input/mpegts.h b/src/input/mpegts.h +index 9dda3baca..9c4c57b73 100644 +--- a/src/input/mpegts.h ++++ b/src/input/mpegts.h +@@ -1149,7 +1149,7 @@ typedef struct mpegts_listener + void (*ml_mux_delete) (mpegts_mux_t *mm, void *p); + } mpegts_listener_t; + +-LIST_HEAD(,mpegts_listener) mpegts_listeners; ++extern LIST_HEAD(mpegts_listeners, mpegts_listener) mpegts_listeners; + + #define mpegts_add_listener(ml)\ + LIST_INSERT_HEAD(&mpegts_listeners, ml, ml_link) +-- +2.26.2 + diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild index 7886d755c7d5..9c12a6de1a1d 100644 --- a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild +++ b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild @@ -53,6 +53,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.2.7-python3.patch "${FILESDIR}"/${PN}-4.2.8-gcc9.patch "${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch + "${FILESDIR}"/${PN}-4.2.8-fno-common.patch ) DOCS=( README.md ) diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild index e8e5c2814ed8..43d6c88ec8d1 100644 --- a/media-tv/tvheadend/tvheadend-9999.ebuild +++ b/media-tv/tvheadend/tvheadend-9999.ebuild @@ -62,6 +62,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch "${FILESDIR}"/${PN}-4.2.7-python3.patch "${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch + "${FILESDIR}"/${PN}-4.2.8-fno-common.patch ) DOCS=( README.md ) |