diff options
Diffstat (limited to 'media-tv')
-rw-r--r-- | media-tv/Manifest.gz | bin | 3926 -> 3938 bytes | |||
-rw-r--r-- | media-tv/gtk-v4l/Manifest | 2 | ||||
-rw-r--r-- | media-tv/gtk-v4l/gtk-v4l-0.4.ebuild | 4 | ||||
-rw-r--r-- | media-tv/kodi/Manifest | 6 | ||||
-rw-r--r-- | media-tv/kodi/kodi-18.3-r1.ebuild | 2 | ||||
-rw-r--r-- | media-tv/kodi/kodi-18.4.ebuild | 2 | ||||
-rw-r--r-- | media-tv/kodi/kodi-9999.ebuild | 2 | ||||
-rw-r--r-- | media-tv/tvheadend/Manifest | 7 | ||||
-rw-r--r-- | media-tv/tvheadend/files/tvheadend-4.2.7-python3.patch | 91 | ||||
-rw-r--r-- | media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch | 36 | ||||
-rw-r--r-- | media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch | 29 | ||||
-rw-r--r-- | media-tv/tvheadend/tvheadend-4.2.8.ebuild | 4 | ||||
-rw-r--r-- | media-tv/tvheadend/tvheadend-9999.ebuild | 1 |
13 files changed, 174 insertions, 12 deletions
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz Binary files differindex e267082082a6..7c10397cd24b 100644 --- a/media-tv/Manifest.gz +++ b/media-tv/Manifest.gz diff --git a/media-tv/gtk-v4l/Manifest b/media-tv/gtk-v4l/Manifest index a4d51baf46c2..7faccc2656d1 100644 --- a/media-tv/gtk-v4l/Manifest +++ b/media-tv/gtk-v4l/Manifest @@ -1,4 +1,4 @@ AUX gtk-v4l-0.4-device-remove-source-on-finalize.patch 1850 BLAKE2B 534955aab1ddecd3586ae472c3b6bcc2fd48da2a796bd2bedd93b430865b015c8519e616e890dff4064ecbe10c4e163aec79ff36aa428f1de4b436bda04123b0 SHA512 2fea2369c1f2084a71f4f934c870f14b08ddf61fa0ed50fb9de9c8250b431519cf38470d404d8428e667c958c9a1b2a674fc71177f508d85a1b7468b881a2d3c DIST gtk-v4l-0.4.tar.gz 328732 BLAKE2B b9040bb4be35d21998226e776f6844da12d75b4db51c8191ee658d9ef5701b27f8b400914eea07a39bb2ed0855f34a59c547bf412031c033212b9966fa1fe97e SHA512 ed0e1245d9b1cfce6612c91dacd09f26850a9420088d7de172c4bd582b70f4427820940e6cf98a831493edfe52d20fb02d6b2d62b695a24127097f50963df321 -EBUILD gtk-v4l-0.4.ebuild 806 BLAKE2B 25ed080f64b8180a4d87f64de82ea54357c4f81a1806ea6ca9300ad5794fe2a4921c57abff824fab7b17185f81f38543793b27ebb3b5b5afb29b275f2b620925 SHA512 02f2d08a85b127dc279d8e4659d66522fc4c61ddc9c8688bf82560978a9dc2cb40e7ddda4e9764ca933308a4e75ec5583e7e8604c790a0d2a3a666dbd148dbec +EBUILD gtk-v4l-0.4.ebuild 804 BLAKE2B 5cdf414607a39139b52d21761fdbeb962c5a8a70f96dbafd42e7f626aa8713db0f4ac4276e1cc934ded6c57fd5547acda7241736873f04ed5e9b93f082836440 SHA512 4b14828a594a002d3d628e0ec8d7c119c1242e326769b32da37b024e441f9285a040ca62815173a644c426d1cef0d82e677c8ec6ca4f6d9ce3a45c9361ffb088 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/media-tv/gtk-v4l/gtk-v4l-0.4.ebuild b/media-tv/gtk-v4l/gtk-v4l-0.4.ebuild index e703e30893d4..d91ae69676ab 100644 --- a/media-tv/gtk-v4l/gtk-v4l-0.4.ebuild +++ b/media-tv/gtk-v4l/gtk-v4l-0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -14,8 +14,8 @@ KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND=">=dev-libs/glib-2 + dev-libs/libgudev:= >=media-libs/libv4l-0.6 - virtual/libgudev:= x11-libs/gtk+:3" DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest index cac78adb26d6..757242a9886f 100644 --- a/media-tv/kodi/Manifest +++ b/media-tv/kodi/Manifest @@ -5,7 +5,7 @@ DIST kodi-18.4.tar.gz 51027569 BLAKE2B 47e3377abb4a1e5a3c26b1519f45ab93471274675 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7 -EBUILD kodi-18.3-r1.ebuild 9615 BLAKE2B 9b507cab8dcf05014fa2c35af477afeca13c9c09e699da7af7d199974f603ebe900e59f25f7f7cf5443d1a8cc1d1dbc871f21509eefa826c237042d2270872cd SHA512 d53a257d5552965e26ee3e9037dbb58ec1661c8a5964160822d14fc63c736d6304e3622369378ba1888c587241c75e4fbbb7345a7082047bf59d2e315aaa1cb1 -EBUILD kodi-18.4.ebuild 9447 BLAKE2B c7b046a250efdc94f21e184cc598eae63385f7a2f9c1c6284c7f99ef35c63805dbf57cdad3868f46a32268ad185e843bf43f89e3993cc38fb2b13d90ff722af5 SHA512 90a84232549ef0fc88a4259aa75d891079d3c83c1fe82aaa645740b3922257a77721d23a8a7a70bff281d89409964dd0862abd474347944987f4a5b51e0a7330 -EBUILD kodi-9999.ebuild 8876 BLAKE2B 46c2548ba49448769fae96180451f840afa81e8dcb67fd1178c357f0c8b3248ac77dd81341ac1b995517601dabdc2c6113d1e8768e924507c0678235c06b0bee SHA512 8ca5f40ade8bad47209b33edded429db8d348af369271756b9c6236eda91362a505b3934a1d06e55c6370f981e2d41229f4d785b5eba431d3fdef082dc2c772a +EBUILD kodi-18.3-r1.ebuild 9618 BLAKE2B 59340db94ac20b444d0bd7a58510ad9efd2de979845294a78c5393e6ac8ac59b96e9f4fc092099a1c2328f5ccd135c984af8eb765c44835ff355ed8b29c2407c SHA512 fddb89222a47a985336497053955a02264b176b47b194379c3fd185f609bf6ba9cffc4c2cf2407057f54f09642770dcf870b1494a4dcbcaea15ff22069e19fe2 +EBUILD kodi-18.4.ebuild 9450 BLAKE2B dabb70d62515981b145ea11b81308a2fad942f414f5194a1e7bd100189ebcee9846cb47148ef71a8e08f9cee7604c6998df206b8f8ca37225557b2f7dd7beb8f SHA512 ee5adea0fe5fb3fa2378e09526584dcdae41d7ca3c3964329ad0b26fdfb6beb86b658edd76b888485d7c3eca5fc5d32a365c3880f2d9d727c495535a9431893c +EBUILD kodi-9999.ebuild 8879 BLAKE2B 352389fe5f92367359e7b848c2baacd2cceaf8aa9c6c78031e05e91c0bfa7d67c829b32585980133a77d8124e77b799b178746bb02c5699bbb6f728f6126ce4f SHA512 5b12d47a6ddd77da245d5e412b7ef6ebea3d8632a42c26dc57b3e38eece2d3daec7a9d71617c509584d404bf9da38b1073326c09297766a21a3279e63cba2426 MISC metadata.xml 1720 BLAKE2B 3158b87065286649496de2edf821c37042cafe7e729f7ba31c571ade72cf8f9fbce218485ac721ad896fa5ef751becfd2f3b4ce1645e97b4db673ec879884834 SHA512 f8d52358276ad8c2eb23632451f025ac45f799fa392bd59fcfd4417d9e9e76cf9ce066ac50cd8ee563319d7f2248b28c45fee3059a4e069ebb862e41d230b1da diff --git a/media-tv/kodi/kodi-18.3-r1.ebuild b/media-tv/kodi/kodi-18.3-r1.ebuild index 188afca674df..166f22eaccba 100644 --- a/media-tv/kodi/kodi-18.3-r1.ebuild +++ b/media-tv/kodi/kodi-18.3-r1.ebuild @@ -127,7 +127,7 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) - webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] ) + webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXrandr diff --git a/media-tv/kodi/kodi-18.4.ebuild b/media-tv/kodi/kodi-18.4.ebuild index 1af63f9e8720..88ebd8f9b020 100644 --- a/media-tv/kodi/kodi-18.4.ebuild +++ b/media-tv/kodi/kodi-18.4.ebuild @@ -127,7 +127,7 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) - webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] ) + webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXrandr diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild index ef6cd2879da7..a5e56b7f2175 100644 --- a/media-tv/kodi/kodi-9999.ebuild +++ b/media-tv/kodi/kodi-9999.ebuild @@ -126,7 +126,7 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) - webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] ) + webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXrandr diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest index 32f6f91d0bc4..2d4e9688769e 100644 --- a/media-tv/tvheadend/Manifest +++ b/media-tv/tvheadend/Manifest @@ -1,11 +1,14 @@ AUX tvheadend-4.0.9-use_system_queue.patch 296 BLAKE2B 0986117969d9bb3463123e984aba7a73c8caf89b16f0c10e870a9b49857f8c946958a31900d99c5d332f5635cbd49ae544c2cc97f1e8a211c352bcaba965fe76 SHA512 56180b9c2fbb092530963229213805ec63e3d941c67d967e38b46f778db85db981234fe5727b5a8dcf64ab3a9e24c9d10b681abf275249e0d6f0ad63e391ecc4 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-gcc9.patch 1772 BLAKE2B dc0033d7f61b8099d3f352cf8f05ff9073f3d6196c10ecac97c1cb1e7af7e01712478b2ef78b991336127ffbfcc9faf49b30b92f9af5e3c500783bc580a8908a SHA512 9b9d74a7d88187dd7895302b3c6142a14a136823fda5840fa464a5d3f3f97c8b59d4f839d10da14bd13bb6b346b75cac07069dab8ae626f68bc3000a70484834 +AUX tvheadend-4.2.8-hdhomerun.patch 1067 BLAKE2B bbbac3dfc8e533770d096bf726c40429358307d5134186693fca5bb69ea7a291afc0f2aa24fb2744d330e72bdfb78ec44ed96f2f2c9a625d9ac63ed2bc913a5c SHA512 118d9086f52c727dd64c0a10471857b12f8c0798887bcd712383823ffcaa0a12a3b487b7941871f8120bc00672608eca596d6ca09cfd47abb9684deef4611faa AUX tvheadend-4.3-hdhomerun.patch 1435 BLAKE2B 3250c5d1ce2a757a2fdee646cb64136661e171c5ae5b30199560e2e74fbfbfefb6d8284e5c2cb92d179751f5fa814148240e08e132761d4d3e2b66844ccd53b9 SHA512 a013ecb61cf05ff5d976f88be58a4ba5471034ab02d34778a8c472746355f2630a88b90951ba98513c787e616119183087d7560be6a9c89c5ea9c26285fe2d5d AUX tvheadend.confd 355 BLAKE2B 36ba5a3466838b643beb877050ef6cc481adb91a433efa7429977104c9db1e6ef54901750d14dc0f43a20c89ddf504a9fc28a10a88d68105e5a5f07820696d50 SHA512 64ae0cca1e1b46a3ecb2fb4a4ba69ad1dd6a72ce57944b44be28768d293f9cca2ab29067335023f384433e8c75d976fbc4610ca574c930b9891a2f1c75ff4c0b AUX tvheadend.initd 375 BLAKE2B 6fbf53a0a67957ee5756b56189d42b741adb7603b5590aa5fa0fd6b2a1d1ba930af05de8ebedba343302aa861f7fb42d3eb25b67acf6b43aa7c956d4965ab944 SHA512 6f17fa6bee502f586b4500c5f5541c9c6ce095deed7ddb3c1d1ad129a2e22fa66de0e72b712866659f7080753c73f67154d6dcdbf8539d6c8a942bea29bb1aa7 AUX tvheadend.service 577 BLAKE2B f6762aef0f9370a7ad1e438aa4b35c500c40240bd7d66db5e32b061c0dc9776adc2b8de2c395b2299151bd5c6fc8735944a8384828b873b29fbf6c1ed76bafde SHA512 1192b98da179503bc249e0b0d3a0e6c2bf420bfb7d14a72b917fe9e1975a42d1647b5d951ead8f18419999f4c74c352b21e58c28bacc65419012d46bb83270d4 DIST tvheadend-4.2.8.tar.gz 21875281 BLAKE2B fdd99ca6aff56f8daa073394f9c58e9cba4ea988a2884e24c2288fd4870dd0460624fb700838ba92867a57473cc4133fed5fbd56f0e40f02a0878ffcd0642c00 SHA512 e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f -EBUILD tvheadend-4.2.8.ebuild 2976 BLAKE2B d1ef24d3727f3589a59456a251a27ad2cbefc8c6aa5a08b88cd293cd15531ad3c9c58a9a39aff5e6f8e03ccfae7e2388f4ca9dadd3093c595472debd03fb2ac4 SHA512 f264c4f3f2eec2ca105ec7e02b0427ac4ea0fbfd5e6358878134afd9bd3a4e2c9c2e0fe7a5ea72d27754837b4cd9975bbcbf0bc684d19fbe1eab2767c602a98b -EBUILD tvheadend-9999.ebuild 3715 BLAKE2B e0e2c9ff53310e4b5998501ce1c2152b443ac02399af8a0496c62964e89078f84df414d21c8b135ee425478ddff6665ca223dcb64a78fd3c7ac87038fdaed9e2 SHA512 327f552b1296f381b1cd1c0c8040bb2e9e79591576e5f17ce83bf5d39cf53a02f2cda66b4ea92f4460d26bef3b6040fab033afe53d82221f042b3e3b280c2dcd +EBUILD tvheadend-4.2.8.ebuild 3059 BLAKE2B 2d2bde0369e364f58f81b93966c14c4e38cb9cbe0ae76f13ceb45ebb3ce557b5324940be0e4617f6d7884178e2143351666d674e4ed181635ab78b4938a7133b SHA512 0fe731a22d0a9ce7061afce2aacae45e9e8cea09c4159151207bfacce6cc15ad6e7a5d2ec6a96a09afac0f436397b7b8c1fc7dcf275931feca5b4aeceae6d318 +EBUILD tvheadend-9999.ebuild 3756 BLAKE2B c3d62f8de1ab35dd91087e624d121fa5c31867b258b4e9eda2e7856e7cdccdbad1ef6982d0e6894ff99f0ec409127a7d5d8067f766338a88d9e868a5bbddea11 SHA512 4457b26c465992f6d57ac29cdc12a223df49d4cafbe8c3864c529b23ae7e2ed240d316e34eb49ff2e6c7f0cb89c3b0e761149a957cf55f63f08ff028cb410602 MISC metadata.xml 1445 BLAKE2B f71dc280d5fce7c0945939bcaf75d0d7f294aea6055c956b04e9e439199c2a6c107c800be6d18a0c58d154bdf7cdd0cd7d874e5cde5fc93f9b24160f536d21d8 SHA512 e26b94f14a619051e637b018d0f47ce86381821dd5207ba5b34429e0c0f83c55bfa9c37871e722af85719cf3e06322703d4709cbbd771b8f092efb8e85cb5b72 diff --git a/media-tv/tvheadend/files/tvheadend-4.2.7-python3.patch b/media-tv/tvheadend/files/tvheadend-4.2.7-python3.patch new file mode 100644 index 000000000000..752b17ba08fb --- /dev/null +++ b/media-tv/tvheadend/files/tvheadend-4.2.7-python3.patch @@ -0,0 +1,91 @@ +diff -up ./lib/py/tvh/tsreader.py.orig ./lib/py/tvh/tsreader.py +--- ./lib/py/tvh/tsreader.py.orig 2018-10-08 14:37:05.000000000 +0200 ++++ ./lib/py/tvh/tsreader.py 2018-10-15 11:53:53.766850060 +0200 +@@ -31,7 +31,7 @@ def encode_utf8(c): + + def conv_8859(tnum, data): + r = u'' +- print 'TBL %d' % tnum ++ print('TBL %d' % tnum) + tbl = conv_8859_table[tnum] + for c in data: + if ord(c) <= 0x7f: +@@ -46,8 +46,8 @@ def conv_8859(tnum, data): + + + def dvb_convert_string(data, conv): +- print 'convert(%d)' % conv +- print repr(data) ++ print('convert(%d)' % conv) ++ print(repr(data)) + if not conv: + return data + return conv_8859(conv, data) +@@ -83,8 +83,8 @@ class TsSection(object): + # print self.tid, self.len, len(data) + + def process(self): +- print 'TS Section:' +- print self.tid, self.len, len(self.data) ++ print('TS Section:') ++ print(self.tid, self.len, len(self.data)) + # print str2hex(self.data, 16) + # print self.data + +@@ -112,7 +112,7 @@ class TsSection(object): + if l + 1 > dlen: + return (None, -1) + c = ord(data[1]) +- print c ++ print(c) + conv = None + if c == 0: + return (None, -1) +@@ -162,14 +162,14 @@ class TsSection(object): + eid = (hdr[0] << 8) + hdr[1] + start = dvb_convert_date(hdr[2:]) + +- print 'process event (%d):' % dllen +- print ' EID : %d' % eid +- print ' START : %d' % start ++ print('process event (%d):' % dllen) ++ print(' EID : %d' % eid) ++ print(' START : %d' % start) + + while dllen > 2: + dtag = ord(data[0]) + dlen = ord(data[1]) +- print 'dtag = 0x%02x, dlen = %d' % (dtag, dlen) ++ print('dtag = 0x%02x, dlen = %d' % (dtag, dlen)) + + dllen = dllen - 2 + data = data[2:] +@@ -178,8 +178,8 @@ class TsSection(object): + + if dtag == 0x4d: + (title, summary) = self.short_event(data, dlen) +- print ' TITLE : %s' % title +- print ' SUMMARY : %s' % summary ++ print(' TITLE : %s' % title) ++ print(' SUMMARY : %s' % summary) + + dllen = dllen - dlen + data = data[dlen:] +@@ -216,7 +216,7 @@ if __name__ == '__main__': + # Complete? + if cur: + if len(cur.data) >= cur.len: +- print 'Process Section:' ++ print('Process Section:') + # try: + cur.process() + # except: pass +@@ -224,7 +224,7 @@ if __name__ == '__main__': + print + sys.exit(0) + else: +- print 'waiting for %d bytes' % (cur.len - len(cur.data)) ++ print('waiting for %d bytes' % (cur.len - len(cur.data))) + + # Next + if nxt: diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch new file mode 100644 index 000000000000..9ccadb44c42c --- /dev/null +++ b/media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch @@ -0,0 +1,36 @@ +diff -up ./src/plumbing/transcoding.c.orig ./src/plumbing/transcoding.c +--- ./src/plumbing/transcoding.c.orig 2019-01-12 09:58:47.000000000 +0100 ++++ ./src/plumbing/transcoding.c 2019-03-12 15:49:24.922314869 +0100 +@@ -1804,7 +1804,7 @@ transcoder_init_video(transcoder_t *t, s + char *str, *token, *saveptr, codec_list[sizeof(tp->tp_src_vcodec)]; + int codec_match=0; + +- strncpy(codec_list, tp->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1); ++ memcpy(codec_list, tp->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1); + + tvhtrace(LS_TRANSCODE, "src_vcodec=\"%s\" ssc_type=%d (%s)\n", + tp->tp_src_vcodec, +@@ -2130,10 +2130,10 @@ transcoder_set_properties(streaming_targ + transcoder_t *t = (transcoder_t *)st; + transcoder_props_t *tp = &t->t_props; + +- strncpy(tp->tp_vcodec, props->tp_vcodec, sizeof(tp->tp_vcodec)-1); +- strncpy(tp->tp_vcodec_preset, props->tp_vcodec_preset, sizeof(tp->tp_vcodec_preset)-1); +- strncpy(tp->tp_acodec, props->tp_acodec, sizeof(tp->tp_acodec)-1); +- strncpy(tp->tp_scodec, props->tp_scodec, sizeof(tp->tp_scodec)-1); ++ memcpy(tp->tp_vcodec, props->tp_vcodec, sizeof(tp->tp_vcodec)-1); ++ memcpy(tp->tp_vcodec_preset, props->tp_vcodec_preset, sizeof(tp->tp_vcodec_preset)-1); ++ memcpy(tp->tp_acodec, props->tp_acodec, sizeof(tp->tp_acodec)-1); ++ memcpy(tp->tp_scodec, props->tp_scodec, sizeof(tp->tp_scodec)-1); + tp->tp_channels = props->tp_channels; + tp->tp_vbitrate = props->tp_vbitrate; + tp->tp_abitrate = props->tp_abitrate; +@@ -2141,7 +2141,7 @@ transcoder_set_properties(streaming_targ + + memcpy(tp->tp_language, props->tp_language, 4); + +- strncpy(tp->tp_src_vcodec, props->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1); ++ memcpy(tp->tp_src_vcodec, props->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1); + } + + diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch new file mode 100644 index 000000000000..c30af8aba2a1 --- /dev/null +++ b/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch @@ -0,0 +1,29 @@ +From 13cd23c371e3377973502f8dc65654b6a0ff372b Mon Sep 17 00:00:00 2001 +From: Michael Marley <michael@michaelmarley.com> +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 58dec51ab..18068faf5 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 +-- +2.23.0 + diff --git a/media-tv/tvheadend/tvheadend-4.2.8.ebuild b/media-tv/tvheadend/tvheadend-4.2.8.ebuild index 0673c7bc7a39..a20bac30f228 100644 --- a/media-tv/tvheadend/tvheadend-4.2.8.ebuild +++ b/media-tv/tvheadend/tvheadend-4.2.8.ebuild @@ -47,8 +47,10 @@ REQUIRED_USE="dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )" PATCHES=( "${FILESDIR}"/${PN}-4.0.9-use_system_queue.patch - "${FILESDIR}"/${PN}-4.2.1-hdhomerun.patch + "${FILESDIR}"/${PN}-4.2.{1,8}-hdhomerun.patch "${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch + "${FILESDIR}"/${PN}-4.2.7-python3.patch + "${FILESDIR}"/${PN}-4.2.8-gcc9.patch ) DOCS=( README.md ) diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild index 7fa2c9c7f255..692d4ec897c3 100644 --- a/media-tv/tvheadend/tvheadend-9999.ebuild +++ b/media-tv/tvheadend/tvheadend-9999.ebuild @@ -59,6 +59,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.0.9-use_system_queue.patch "${FILESDIR}"/${PN}-4.3-hdhomerun.patch "${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch + "${FILESDIR}"/${PN}-4.2.7-python3.patch ) DOCS=( README.md ) |