diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-11-22 17:18:34 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-11-22 17:18:34 +0000 |
commit | fd87b7c771378b2116981e3924bee5805148e118 (patch) | |
tree | 91ed28393c7b534787d3c073e269fe598d0fd535 /net-misc | |
parent | 77b74be093bdf4a0ed4121acc3f8e229103cf004 (diff) |
gentoo auto-resync : 22:11:2023 - 17:18:34
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/Manifest.gz | bin | 54484 -> 54484 bytes | |||
-rw-r--r-- | net-misc/cbqinit/Manifest | 2 | ||||
-rw-r--r-- | net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild | 13 | ||||
-rw-r--r-- | net-misc/gerbera/Manifest | 3 | ||||
-rw-r--r-- | net-misc/gerbera/files/gerbera-1.12.1-gcc14.patch | 81 | ||||
-rw-r--r-- | net-misc/gerbera/gerbera-1.12.1-r1.ebuild | 4 | ||||
-rw-r--r-- | net-misc/pipes/Manifest | 2 | ||||
-rw-r--r-- | net-misc/pipes/pipes-1.16.1-r1.ebuild | 6 | ||||
-rw-r--r-- | net-misc/s6-networking/Manifest | 2 | ||||
-rw-r--r-- | net-misc/s6-networking/s6-networking-2.7.0.0.ebuild | 57 | ||||
-rw-r--r-- | net-misc/streamlink/Manifest | 5 | ||||
-rw-r--r-- | net-misc/streamlink/files/streamlink-6.4.0-libxml2-2.12.0.patch | 199 | ||||
-rw-r--r-- | net-misc/streamlink/streamlink-6.4.0.ebuild | 78 | ||||
-rw-r--r-- | net-misc/streamlink/streamlink-9999.ebuild | 5 |
14 files changed, 443 insertions, 14 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz Binary files differindex 2b2e3c5ef3bc..28757d8a8659 100644 --- a/net-misc/Manifest.gz +++ b/net-misc/Manifest.gz diff --git a/net-misc/cbqinit/Manifest b/net-misc/cbqinit/Manifest index 13786b48290b..169af8859070 100644 --- a/net-misc/cbqinit/Manifest +++ b/net-misc/cbqinit/Manifest @@ -2,5 +2,5 @@ AUX cbq-1280.My_first_shaper.sample 79 BLAKE2B cd8a86512daa9aaea32e2e5fe7aea179b AUX cbqinit-0.7.3-gentoo.patch 1904 BLAKE2B a328f8c021d64d220d164491ae330932a20a1168e9948fab84f7f3ce22fb5ae0d8af8c9e599630fe873199471755f3dc2184956cc7310915b2c068bc07a763f4 SHA512 b33e3e7e23d6363dcb4b66357f666bdc5b299b851798db7a935d3edaf2612ae3494e6d0e0ea68375409a2834a0d50d322170c9c3f2b97ab00054a19f5bb27d44 AUX rc_cbqinit-r1 505 BLAKE2B a9904191d8f884371211d9003b0664dd13b91f076ec29828db30fef531da8d13d8ce7ca0a229fafa11809719699b2880e26ff8424246c1a8ba1dd21f3125235f SHA512 29ace7a58bfc942c29b4992b317704ce05d11c6e9a205f0d74e604d65036b0932bacd4768fd0a6fe449ebd0d9735cf9232e956d2dbf45b5fda66215eff5d61d2 DIST cbqinit-0.7.3 33438 BLAKE2B a2373fa73036e5c6360efc613bc6d950c26e269066fab227d5125084b2530ffc42b519e6d3a4423e9f8ef44fb4b29fe6fff96ef9bb650fe247bdaf1aae93eac1 SHA512 ab1f66ebce4653f53d85314f47dc4d5e2f28c081f7c0385138c33cbc78e588d7190eedcf8354b744cfae8b34d536d610a944d492c9b49361109978016fa167a1 -EBUILD cbqinit-0.7.3-r3.ebuild 802 BLAKE2B 625d18e26e52734a8fc5b8583a0b84321a4e3ab6564e16c61a75d184f2b9a84442ba1a4d92177fcdde6e9cce38f9c1228723d5c313dd131ae90602793d5e0657 SHA512 8839a85d4f44769d74b12d397fcdea91338049eeb5c91691e37bd6b5702ae564402e3c4666793ef88c61e58ffb0e0b1b1c9581d2832d95f6463fe3535e11bead +EBUILD cbqinit-0.7.3-r3.ebuild 782 BLAKE2B dda94daa6d11d752afd3a0c83e06fdb1065688162a1043a0aa60d1e573b781f6c455bdfdd43679167376017f0c9f6d28624d4b3211e3a7c0dab11a5d54e05283 SHA512 f46e0e5d80531ad456c3453b0d3e13e4131a2bddc798a06b990541351c423c274fb58cceb2acc2a7843c7565ccc7059b23acf57020d461cb30f3d161d4faac77 MISC metadata.xml 245 BLAKE2B f28fd211282dfaeef5c215c0e5dab0d79663eac88e2a3c19a73150128106b2c711bd933d95d961bf8d42f923c11578c34b6e23d32fc72b69024074f2f12592ce SHA512 ccd421f5786aa8faa87303cfe19ea54e042be710ba673959a2271bd52ae234bd460c90bb43e0191a7033c575f858ef09ea8b5a2678409a3e9cd06eb2a92c8a2f diff --git a/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild b/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild index bfde1b35807a..3e16a2565334 100644 --- a/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild +++ b/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild @@ -1,21 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Sets up class-based queue traffic control (QoS) with iproute2" -HOMEPAGE="https://www.sourceforge.net/projects/cbqinit/" +HOMEPAGE="https://sourceforge.net/projects/cbqinit/" SRC_URI="mirror://sourceforge/cbqinit/cbq.init-v${PV} -> ${P}" +S="${WORKDIR}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc sparc x86" -IUSE="" RDEPEND="sys-apps/iproute2" -DEPEND="" - -S=${WORKDIR} src_unpack() { cp "${DISTDIR}"/${P} "${S}"/cbqinit || die diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest index eb24a28aa2b8..6bf461feb77c 100644 --- a/net-misc/gerbera/Manifest +++ b/net-misc/gerbera/Manifest @@ -1,7 +1,8 @@ AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e91b9e542e3e9ac0bd51992c6c024ead3c9643e067430eefec9305ea3e8c9c4592a254da518baead245fe SHA512 7e02ce95ab75665c75463a07255a23832a6392a073c432304fc971eaf3a338c401e6f6d706798301b813c24bee2c4a5cbb0ab6cd13b73f6c7f60d0b2a99a0931 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d +AUX gerbera-1.12.1-gcc14.patch 2571 BLAKE2B cdebe5f239de5136d646e4efb249deda94daa95944dcfd701d9b664f39150adcce86cb96c628fc09e3b3b17103e84181e441a59c2f115f3e659b2fdf49fe8fb9 SHA512 6661d5cfc5bfdbfa97f059d8c715cc3e6a24f89f55fba44d2a0333795e336039076f0165b4f03866947aa3fdf43d2bf0c3b19e56832f925ea429d6be9843130b AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417 DIST gerbera-1.12.1.tar.gz 4368573 BLAKE2B 870b1296b89d51086048c5c5a52109f336facbf0bce02313487cb5c80ca4bb9a5590f64683f5ac92a3c3026ef9c3e22275a38fdc52fd8cbe887ec6f3c7b38ab9 SHA512 54f4b9fe38f4890d1cac16d433bd70cb2892f3659fffcd5f52814d2f9377c4a8eb68deb3a13053531609727f7ae6cb5ee12bbf652bc41dd1eabd83e6f8dcc1f2 -EBUILD gerbera-1.12.1-r1.ebuild 2194 BLAKE2B cc62407f2bd812cdfa03cffa2b9504f953fc1b00418b4d881ab098a30f2013b29b70de1af8326d19c07bebb4a2adb4fcf34bb0df0062c25d4606cba417f56152 SHA512 800f164b3f3e717842031ec98055e2ebfb6afbfd72577816794fc88176806c8948a8189226ddea9cd7b86e3fcf138218c7463a7b7b0cb7b2ad0d77f8c4bc3248 +EBUILD gerbera-1.12.1-r1.ebuild 2247 BLAKE2B 03d0a04315f26bb90825d4018a6c823631f0e574c6309d7d20d9a733ad7fad5a71d3a92eddfe8039a21acfea7baabba32f1b783ab1f95daec73e957f79c8a680 SHA512 2c36f21d4cbe8ef9dce7e9c21b6b10198ec36553024e146de1d6368497791327ebb4d1f03b34b77bf28a8ee3fed5dd62967adf33d12823fc6bc6b8db430eb23a EBUILD gerbera-9999.ebuild 2195 BLAKE2B 178eac044ee2fcc40d490807d4bc8474eafb3e8ad6e0c2a23688685b6d75fff96beb1e1c7db66ec07303094f4895dc774afda7361b15fd5f6154eabf31404c9e SHA512 c6f232bf998e3cccf014abec46dc8c9d299dc48c34cd589dd7a07585368d3aacb182296ff5bceb443aea3c563560109d48fb37f5f0ec8beac952273801730e68 MISC metadata.xml 1153 BLAKE2B 160ec07f27637335374b7c1232c65942d661b66ab89f9e145ffcbadd510ea454a52cef9ab8e544ed46c0c11f56f69b1c659b4f604b0c65ada19f66f1d857586e SHA512 95da4ff4383a5fa1467ea5674c38cb6c8b7939fa01e7a66bac42bb2e3d21dfc020c2585bc6e81af602a227c978e3fe1dc3950ef962b17cbbc11a0cea0413d9b3 diff --git a/net-misc/gerbera/files/gerbera-1.12.1-gcc14.patch b/net-misc/gerbera/files/gerbera-1.12.1-gcc14.patch new file mode 100644 index 000000000000..9e84f53b3ef4 --- /dev/null +++ b/net-misc/gerbera/files/gerbera-1.12.1-gcc14.patch @@ -0,0 +1,81 @@ +From 07f78866608c8f1094696615932e2d8382e5fd8c Mon Sep 17 00:00:00 2001 +From: Kostadin Shishmanov <kocelfc@tutanota.com> +Date: Thu, 16 Nov 2023 21:17:34 +0200 +Subject: [PATCH] Add #include <algorithm> to fix building with gcc 14 + +Gentoo bug: https://bugs.gentoo.org/917136 + +Upstream PR: https://github.com/gerbera/gerbera/pull/2899 + +Signed-off-by: Kostadin Shishmanov <kocelfc@tutanota.com> +--- + src/cds/cds_objects.h | 1 + + src/iohandler/io_handler_buffer_helper.cc | 2 ++ + src/iohandler/mem_io_handler.cc | 2 ++ + src/util/tools.h | 1 + + src/util/upnp_clients.cc | 2 ++ + 5 files changed, 8 insertions(+) + +diff --git a/src/cds/cds_objects.h b/src/cds/cds_objects.h +index 4283a3af5..a4b9c1d01 100644 +--- a/src/cds/cds_objects.h ++++ b/src/cds/cds_objects.h +@@ -34,6 +34,7 @@ + #ifndef __CDS_OBJECTS_H__ + #define __CDS_OBJECTS_H__ + ++#include <algorithm> + #include <map> + #include <memory> + #include <vector> +diff --git a/src/iohandler/io_handler_buffer_helper.cc b/src/iohandler/io_handler_buffer_helper.cc +index ee1de602e..49afd3c8c 100644 +--- a/src/iohandler/io_handler_buffer_helper.cc ++++ b/src/iohandler/io_handler_buffer_helper.cc +@@ -36,6 +36,8 @@ + + #include "config/config_manager.h" + ++#include <algorithm> ++ + IOHandlerBufferHelper::IOHandlerBufferHelper(std::shared_ptr<Config> config, std::size_t bufSize, std::size_t initialFillSize) + : config(std::move(config)) + , bufSize(bufSize) +diff --git a/src/iohandler/mem_io_handler.cc b/src/iohandler/mem_io_handler.cc +index 534c452da..230f4aa85 100644 +--- a/src/iohandler/mem_io_handler.cc ++++ b/src/iohandler/mem_io_handler.cc +@@ -34,6 +34,8 @@ + + #include "mem_io_handler.h" // API + ++#include <algorithm> ++ + MemIOHandler::MemIOHandler(const void* buffer, int length) + : buffer(new char[length]) + , length(length) +diff --git a/src/util/tools.h b/src/util/tools.h +index 177f09900..de2481c87 100644 +--- a/src/util/tools.h ++++ b/src/util/tools.h +@@ -33,6 +33,7 @@ + #ifndef __TOOLS_H__ + #define __TOOLS_H__ + ++#include <algorithm> + #include <map> + #include <optional> + #include <vector> +diff --git a/src/util/upnp_clients.cc b/src/util/upnp_clients.cc +index e07fb4508..d95f426fb 100644 +--- a/src/util/upnp_clients.cc ++++ b/src/util/upnp_clients.cc +@@ -33,6 +33,8 @@ + + #include <upnp.h> + ++#include <algorithm> ++ + std::shared_ptr<ClientStatusDetail> ClientStatusDetail::clone() const + { + return std::make_shared<ClientStatusDetail>(group, itemId, playCount, lastPlayed.count(), lastPlayedPosition.count(), bookMarkPos.count()); diff --git a/net-misc/gerbera/gerbera-1.12.1-r1.ebuild b/net-misc/gerbera/gerbera-1.12.1-r1.ebuild index 28552ca8d1de..c7fbd27a2fa3 100644 --- a/net-misc/gerbera/gerbera-1.12.1-r1.ebuild +++ b/net-misc/gerbera/gerbera-1.12.1-r1.ebuild @@ -48,6 +48,10 @@ DEPEND="${RDEPEND}" CONFIG_CHECK="~INOTIFY_USER" +PATCHES=( + "${FILESDIR}/${PN}-1.12.1-gcc14.patch" +) + src_configure() { local mycmakeargs=( -DWITH_AVCODEC=$(usex ffmpeg) diff --git a/net-misc/pipes/Manifest b/net-misc/pipes/Manifest index 7c193b708785..66a033d6e063 100644 --- a/net-misc/pipes/Manifest +++ b/net-misc/pipes/Manifest @@ -1,4 +1,4 @@ AUX pipes-1.16.1-execlp.patch 603 BLAKE2B fb36b8f00c05b8f0fef930757da458d1f571ecda4487cf5641417d9a79548e28212c1a12599b69a068d55a2e5cb991de0c37b787e13516965122e949bac5db40 SHA512 ad28dab392c962fc476ca6596a0609dbee2a3f6300b27daaaae5b5e44c3c94154b682bc749697be20373b530b228d45170193e085e96bbcbfeff7190746767d7 DIST pipes-1.16.1.tar.bz2 21642 BLAKE2B c5725244f7ac0b77ff3ac3d753ff96ac7d853cd1e7cb0ab82a14decc6ad6ec94503426be712e1b9117a6e95a95939c5d9e91d9f31eb397c96182fac8f7148100 SHA512 ff8f6cf7934149c3d8a6e0443a06840863313acccd31791913fa25b086173e834d8f357212811e5e1ddb62148d3e687858e8956065734f11d7fc729f2a64b0a3 -EBUILD pipes-1.16.1-r1.ebuild 653 BLAKE2B 0940c6c100791d6ee122fc445ec47b3fd9249671188c469a892fca0b13a15f40cd7114a00eab92e9f1c2e00582165249b15f2dd68b5c340a1c1f1e5603038149 SHA512 889685503f74ced6ba2f3ccd35e3b12c68b66a285445944f7231de441134d6b5d73c91488d50028d8a6ced67327f4dc0689475e02b9d89bb92819e975e9fddef +EBUILD pipes-1.16.1-r1.ebuild 655 BLAKE2B 1b4eb864e6ae0bc51fac4e59316f4f2fa75ce6ae6bcf061e66ed35b32ba5cd908cd41772d1ba9d0c2c88ad4c5f5b3d1f8e6e65aef3e0898d4f02bf1373920e93 SHA512 0f6c9ff510124e4bb63f97920cfeb23b2055849b3418d893a45ce4c17e86b20a8972bfe68cf63785b6103e81df412c6f3030a3499fe70a238275cd54a823beb7 MISC metadata.xml 1244 BLAKE2B 87ebab2c78e1d5cd55ecf5f7ada08bca00ebd347099725ed0a50e66186401f19add0d94865b3c2baf9221c78d5f1a7ec55488d57ca289ff4fc3b7ab92ad1438c SHA512 1141579f90552bff7efe344685d3029343b18b6ed12727e5041b89f8b82493693cf87a7f9b87a654ded89cd2410c5b64223129c197002ce86b8898334939fa7d diff --git a/net-misc/pipes/pipes-1.16.1-r1.ebuild b/net-misc/pipes/pipes-1.16.1-r1.ebuild index 7a2acfb32695..d70a57b6fc05 100644 --- a/net-misc/pipes/pipes-1.16.1-r1.ebuild +++ b/net-misc/pipes/pipes-1.16.1-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit toolchain-funcs DESCRIPTION="Very versatile TCP pipes" @@ -11,6 +12,7 @@ SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ~s390 x86" + PATCHES=( "${FILESDIR}"/${P}-execlp.patch ) diff --git a/net-misc/s6-networking/Manifest b/net-misc/s6-networking/Manifest index ae68882c9b0b..0416b35011ce 100644 --- a/net-misc/s6-networking/Manifest +++ b/net-misc/s6-networking/Manifest @@ -1,5 +1,7 @@ DIST s6-networking-2.5.1.3.tar.gz 114490 BLAKE2B 09b74ff4c881e0c30162a1a01d0d372c0dab2888efaeb1cb97402c485fca2d1360aaa936b291237cab7d43af870d9653b833a9a0e57c57b23918b4128186b476 SHA512 abc90d374a24507998041fd8dcd5f9c2d91bf94046e3da8d324546471f482b5929d863bd2bc846581da32f6c980ef5c2e5d6780655c757316ef0b67e37c72a19 DIST s6-networking-2.6.0.0.tar.gz 112145 BLAKE2B 1e111614da26283c0a9ee46b0d09d554c4efaf6866b322d5850512058d3237cc060b2ca6d5d1bd0e60791598e034c5fe222a2b6cf5bf271af8ee9e4403f61ea3 SHA512 dcd9a9c8e2d17fcfca96d44b1b86760a0f0e303a638f566ba064b4eb071e18736baa188cfcdb2ae27c0b00a2ed7876a9da6361a8e3a4719b70f462925df913e7 +DIST s6-networking-2.7.0.0.tar.gz 114592 BLAKE2B ce4eab80788bd4c7406e4b5732cb035e483ef1d788ea24a61886fa23402af5df23380d17464020ea562810563162e18fbd49644e9ac3d4827802e2caf294bab7 SHA512 b0dd1b0007704ca087bf49ae93cc09b7cbaa59f6ab99a0281f6bb9de38b25da18be925bc27f1bb74f984f60579f4ebdba41f276ea529b77344d9f3155bad314c EBUILD s6-networking-2.5.1.3.ebuild 1250 BLAKE2B 10516f672e8b490ab4d0091014e5665ee38db5eda0c27fdb129032128a6b76139d473f8863f0140bf03ae6cd7b8beef35cb4900bf642caf833584b4ad3200ece SHA512 2414d34ea2051eaf48f3e39e610e25753ca888d391543437cf7170519b84da67cdad1fe34a068bccb1dc90d1fd23bf0a60cb6e13800880d1499ec00c3e4d41c9 EBUILD s6-networking-2.6.0.0.ebuild 1252 BLAKE2B 10c71a4894bb807c17dc93bbece55ba516511e53d62add39222c27f2552a5b7ea0df00cf58fc11055d3596c5be7f09889cb803c5b281f57a913f1f2acf825633 SHA512 7c84ebff04421ad4748e51967f62438bd3bb58b1a106ee565c456b454f880601680855efdb8ee6e4c188dbd5cc266a46e563a2c8ad71f38e3c2ef1fe706390d1 +EBUILD s6-networking-2.7.0.0.ebuild 1262 BLAKE2B d6d02be9355c910b8983c4071d8a85e2091d2243f75570f912b15858db9a6a88830225db19ef074ad81be55e727d86e831554f6a673a9c729698cd269950cb87 SHA512 6b571250593ee27f8a20cc2bc653a11917e3896784c0305add3b2fb4ddcf342e758fb6250d6a57965fbdf8d02d8b0321de5c98e7026f15f5009daafc32e573dc MISC metadata.xml 807 BLAKE2B 512259de8236d1f707319972fe7006224d01c4ff75f7019bdb4cd1eb2a1344802c172e989700b304c43ae610768ef6742d42067a88a21d236f62ac2670067d7a SHA512 a26333c549c37a65fd86371024db7d106965073dcb36eff03e6e491811fb3b8a1e338e113879b253581b97f5fb1f6f8cd7d2c3ffddb9430ec1bac4d5376289cd diff --git a/net-misc/s6-networking/s6-networking-2.7.0.0.ebuild b/net-misc/s6-networking/s6-networking-2.7.0.0.ebuild new file mode 100644 index 000000000000..89c525c1c791 --- /dev/null +++ b/net-misc/s6-networking/s6-networking-2.7.0.0.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Suite of small networking utilities for Unix systems" +HOMEPAGE="https://www.skarnet.org/software/s6-networking/" +SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~x86" +IUSE="ssl" + +RDEPEND=" + dev-lang/execline:= + >=dev-libs/skalibs-2.14.0.0:= + >=net-dns/s6-dns-2.3.7.0:= + sys-apps/s6:=[execline] + ssl? ( dev-libs/libretls:= ) +" +DEPEND="${RDEPEND}" + +HTML_DOCS=( doc/. ) + +src_prepare() { + default + + # Avoid QA warning for LDFLAGS addition + sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die + + sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die +} + +src_configure() { + tc-export AR CC RANLIB + + local myconf=( + --bindir=/bin + --dynlibdir="/$(get_libdir)" + --libdir="/usr/$(get_libdir)/${PN}" + --with-dynlib="/$(get_libdir)" + --with-lib="/usr/$(get_libdir)/s6" + --with-lib="/usr/$(get_libdir)/s6-dns" + --with-lib="/usr/$(get_libdir)/skalibs" + --with-sysdeps="/usr/$(get_libdir)/skalibs" + --enable-shared + --disable-allstatic + --disable-static + --disable-static-libc + $(use_enable ssl ssl libtls) + ) + + econf "${myconf[@]}" +} diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest index e84b849cacea..393e05c63f55 100644 --- a/net-misc/streamlink/Manifest +++ b/net-misc/streamlink/Manifest @@ -1,14 +1,17 @@ +AUX streamlink-6.4.0-libxml2-2.12.0.patch 7853 BLAKE2B ca0018216e921e6d7a20be200e9d7b6c900f9c8839c7cf05ccc3c2579dbe45767f424a352f89de8299e8deb53034afb89072cd986878b2c550ac24943996e2ae SHA512 c13fc361763da0f00e932250073711cb89acdd3dcc9b15d2c9ae03e177de357afeab02f19c14f6ef73e328bdccf3cd2b7028f31555396309ab63884c1e688033 DIST streamlink-5.5.1.tar.gz 536064 BLAKE2B 0a651c5dcf9fe0a70ee93505ad0a0ea6aaf10739edc763a796633ce34b8235e4aa6a5a45bd1f6dd2591ced9cd87141d4b89d34e9e399d6166d74c9c3ee12f5ea SHA512 2d7fd75bbf356baaf91791930e74e361b37abf0ff1251fa3022ca216dc16a8610635089cb746506baec82c31f8bc569e3b8e538b17ba910389168e61dcdbbe0f DIST streamlink-6.0.1.tar.gz 682425 BLAKE2B a84c6c1594b78b62c1c20c021c3dde2eae06e86fad559de285800cb5f1cc2d97dadb5724053b320dafdbca3545e1d10171d1adc3b8a1c9c67d2e4d80940357dc SHA512 96081a23b616d85a0918583d951334f35843cb47d6d3d317c3903516b951db2a953db1ea2cb1fb3de95cb059a37dc605d40817e81819acf4e5c98f831bd39323 DIST streamlink-6.1.0.tar.gz 686463 BLAKE2B cc2890db0181e47bcae9da38eddeaadfd34b29a3d4b8bc2bb4d296289cdb356f9614d4e1edd8b11e23d226115f645399296d5589e42832ad473d9cb96ebfde0f SHA512 24fb549be6088eb913348ae892f694b91a6d6c929a06b9ed0db050e203a020ea9780b217f96d7890b7309d304e9a547c47673b8b3f2588dfedbaa44bb5808e29 DIST streamlink-6.2.0.tar.gz 690986 BLAKE2B 5f7cab73ea366580aeb837b8f8a27fa7cd5ca687afa53908900dc9f290a0da916778fda8351acda00f795688b156ca0f37302e67128ce30e9838a45111b88ecd SHA512 2747ebc584caa8ebb2fde5d4f309c911a52fd1a8d2d0e832487e589873c270534e0d0b18120a2db7a68e150e301e57db1e8d63f1d5bb6244f364e9cbd6606213 DIST streamlink-6.2.1.tar.gz 692446 BLAKE2B c1b98ffca37051675a92afc86d12635b538c1b12c023b652a05516faffb289f50b479b38ae48813a4f83d6c881dc7f211e66c6d7f7dd08adcf1a354c9bd15427 SHA512 852610d97138cf0a8066f760f747cb32f1d51c8c55b84df5b6a798556343010c2e68ca5d9a8473e8d32f72bc2a5d89f9d90ee70ccced84b6c9408930ed49585a DIST streamlink-6.3.1.tar.gz 699073 BLAKE2B 9d1fc58bd0cf4539369fc9d49230c18ef3b9a783783a517c831089571424412841f9e8925202d32bc4218d7a08e4e53c823fc503199131edb59e8fd69e8d49fa SHA512 a1e50688acd3b99efd20c1ff1d3bda03cb6e6b5566484d29372bc6d08ee4115f8ad2edea2f0a90f5de105edb52689781892f413f4af3d836cdd9e9a364006610 +DIST streamlink-6.4.0.tar.gz 715287 BLAKE2B e2657a03bbc02e40207079a43dd2770dddb46b1b07db428bef4623a760bf37dc6853bbbc49a65462f5063e377ca45d2c540e6b879ba7852f76d49062c668f1af SHA512 94387a8d7861c2010319a57b57c430a9600ec3da17320293a13caa5769d19ab366522f36c24d96d481e123faddf6869b1126e3657a1c3b3164a8313daf9a3efb EBUILD streamlink-5.5.1.ebuild 1544 BLAKE2B 80f5cc0c5b84ee0baf644d3af104d796f104474df6bd1039e87394f3a26732754cad19d6ac10533b2618a97db3c745d1e7fd52e78c25ae321610eab27af51336 SHA512 e21839c90166932d66de3946280397363493a725aa01b796d9b758492cb3dc16ac838aae753de88adc84ec94c24a882780cb72dcdefaed7cded987704b857383 EBUILD streamlink-6.0.1.ebuild 1692 BLAKE2B ed4cbf9845ad507c3b73b28443bf92361d5ace7c0e2f79d343b06ae1629b9c49775746beba2d140ce70eae0b89d585c90cca4d9784aec6facf86eac9f2debb9b SHA512 c982240eac7f913eb7f250d1f30a1152659a5153f8f4f1bc5f886c2b72971a5a9e5b318edd02729ae77b7a287bfc96a0aa4cb17325f11a1dbc9ab43b3a0c70e4 EBUILD streamlink-6.1.0.ebuild 1659 BLAKE2B 5b732dbacc0bd36345fcc68581829d7ec463bf3493a5eb34f5188645cdc0b57f64326bf6010b7dd209009b59ebfb9e377eccffcaef369c875fe14bbc7af5314a SHA512 95ddf3426d727908239d6c5be7e0f2543f8c83d7d77e04e9f89f25a9ab64272b6d0610d2d9bef76e2fd6303139432b0e99fba8acf049abc8c21f74ec7ef28555 EBUILD streamlink-6.2.0.ebuild 1659 BLAKE2B 5b732dbacc0bd36345fcc68581829d7ec463bf3493a5eb34f5188645cdc0b57f64326bf6010b7dd209009b59ebfb9e377eccffcaef369c875fe14bbc7af5314a SHA512 95ddf3426d727908239d6c5be7e0f2543f8c83d7d77e04e9f89f25a9ab64272b6d0610d2d9bef76e2fd6303139432b0e99fba8acf049abc8c21f74ec7ef28555 EBUILD streamlink-6.2.1.ebuild 1872 BLAKE2B 0286827b0324f4d3f72b00b7b5fc3cb901d3be9bb7986e81d265fee05f7d19caf38f8244e6d004fd0ded695bbb9abddc8bc7ba0f46b7b348c73f1ad6a0ceb5cc SHA512 b27d6fa771a567ec6ac4a916bd103edf7c7149e253e384df6724aca8edd0c21980d04986492682ae547372b4b2923eea8a1c5a69aa231c4de703c16acd46089e EBUILD streamlink-6.3.1.ebuild 1964 BLAKE2B 1e49538c8f14ac85bd9bb2898d9676d73a245b331359848fc134cd0335a0d4b11f55b334fd26f682eda2a71b13a4477c94ee7e0185190663896a139fada09612 SHA512 5d8f80bcc7fd4ad85fc39997f33bd7953e396755a45cbde491df775b5be40a0f65c9f9cf7092393ebddc02e0294bea3b0f9a2cbfe8ca5e6875d91668dd52bfe0 -EBUILD streamlink-9999.ebuild 1964 BLAKE2B 1e49538c8f14ac85bd9bb2898d9676d73a245b331359848fc134cd0335a0d4b11f55b334fd26f682eda2a71b13a4477c94ee7e0185190663896a139fada09612 SHA512 5d8f80bcc7fd4ad85fc39997f33bd7953e396755a45cbde491df775b5be40a0f65c9f9cf7092393ebddc02e0294bea3b0f9a2cbfe8ca5e6875d91668dd52bfe0 +EBUILD streamlink-6.4.0.ebuild 2250 BLAKE2B d0bc79568dadf1405661ef8de3399912cf184cce3244d06fbeb1b094a4ccc02abbbaabeec811dc7e03594462b3090c5e783882bd75b2a8eb289f48ab6c57a513 SHA512 7aabc9e7c39aa803bd3b4665134387e99a0cbabfcd2b692bd659720a4d69ab27976a92dde58ed85a17b621bef57ae35b5ad8409a3fc1f0547b8b433d6f670895 +EBUILD streamlink-9999.ebuild 2196 BLAKE2B baf9acc296269eb0ead0e12e0ee002398dc10d970fd9b32ab4159a10e7dad65ad9f047d40a5daa91b650d49ab4099526b79cfbd264d373b31f4ad05ce903b1c6 SHA512 3f5a6de5850f7880e723f5ac6f66e32c84878a8dfa7664d9303d942ff4ac80e56bf71eafdf3d8c1949c59720303623d9d58a64f2f8c58142c3add539aef87f83 MISC metadata.xml 374 BLAKE2B 8c5f72454d8d00a99c18328838cc9c3be82cd9d68405f6e702239b8475a9162f3ba945b142bf2f5762fcc4ac52cae95c8e2d5c0707b1028c11faba2341a2d8e9 SHA512 038e509b340b1cc31382b0a1edf0c273fe99ca7c8c40370039a01cf6a95101d1217db7fea64bc67f5c113c99d504ceb7256008c1539c4d7e13ad6ceb8b922a58 diff --git a/net-misc/streamlink/files/streamlink-6.4.0-libxml2-2.12.0.patch b/net-misc/streamlink/files/streamlink-6.4.0-libxml2-2.12.0.patch new file mode 100644 index 000000000000..ed5fd30366d2 --- /dev/null +++ b/net-misc/streamlink/files/streamlink-6.4.0-libxml2-2.12.0.patch @@ -0,0 +1,199 @@ +https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 + +From 9d8156dd794ee0919297cd90d85bcc11b8a28358 Mon Sep 17 00:00:00 2001 +From: bastimeyer <mail@bastimeyer.de> +Date: Tue, 21 Nov 2023 20:10:47 +0100 +Subject: [PATCH] utils.parse: fix libxml2 2.12.0 compatibility + +--- + src/streamlink/compat.py | 11 ++++ + src/streamlink/utils/parse.py | 17 +++++- + tests/utils/test_parse.py | 112 ++++++++++++++++++++++++++-------- + 3 files changed, 114 insertions(+), 26 deletions(-) + +diff --git a/src/streamlink/compat.py b/src/streamlink/compat.py +index c75201544d3..993bce64cfd 100644 +--- a/src/streamlink/compat.py ++++ b/src/streamlink/compat.py +@@ -2,11 +2,22 @@ + import sys + + ++# compatibility import of charset_normalizer/chardet via requests<3.0 ++try: ++ from requests.compat import chardet as charset_normalizer # type: ignore ++except ImportError: # pragma: no cover ++ import charset_normalizer ++ ++ + is_darwin = sys.platform == "darwin" + is_win32 = os.name == "nt" + + ++detect_encoding = charset_normalizer.detect ++ ++ + __all__ = [ + "is_darwin", + "is_win32", ++ "detect_encoding", + ] +diff --git a/src/streamlink/utils/parse.py b/src/streamlink/utils/parse.py +index 8c9f79c8b51..17479b81f59 100644 +--- a/src/streamlink/utils/parse.py ++++ b/src/streamlink/utils/parse.py +@@ -4,6 +4,7 @@ + + from lxml.etree import HTML, XML + ++from streamlink.compat import detect_encoding + from streamlink.plugin import PluginError + + +@@ -51,7 +52,21 @@ def parse_html( + - Removes XML declarations of invalid XHTML5 documents + - Wraps errors in custom exception with a snippet of the data in the message + """ +- if isinstance(data, str) and data.lstrip().startswith("<?xml"): ++ # strip XML text declarations from XHTML5 documents which were incorrectly defined as HTML5 ++ is_bytes = isinstance(data, bytes) ++ if data and data.lstrip()[:5].lower() == (b"<?xml" if is_bytes else "<?xml"): ++ if is_bytes: ++ # get the document's encoding using the "encoding" attribute value of the XML text declaration ++ match = re.match(rb"^\s*<\?xml\s.*?encoding=(?P<q>[\'\"])(?P<encoding>.+?)(?P=q).*?\?>", data, re.IGNORECASE) ++ if match: ++ encoding_value = detect_encoding(match["encoding"])["encoding"] ++ encoding = match["encoding"].decode(encoding_value) ++ else: ++ # no "encoding" attribute: try to figure out encoding from the document's content ++ encoding = detect_encoding(data)["encoding"] ++ ++ data = data.decode(encoding) ++ + data = re.sub(r"^\s*<\?xml.+?\?>", "", data) + + return _parse(HTML, data, name, exception, schema, *args, **kwargs) +diff --git a/tests/utils/test_parse.py b/tests/utils/test_parse.py +index aedae7d4e8e..69c16f282b9 100644 +--- a/tests/utils/test_parse.py ++++ b/tests/utils/test_parse.py +@@ -74,31 +74,93 @@ def test_parse_xml_entities(self): + assert actual.tag == expected.tag + assert actual.attrib == expected.attrib + +- def test_parse_xml_encoding(self): +- tree = parse_xml("""<?xml version="1.0" encoding="UTF-8"?><test>ä</test>""") +- assert tree.xpath(".//text()") == ["ä"] +- tree = parse_xml("""<test>ä</test>""") +- assert tree.xpath(".//text()") == ["ä"] +- tree = parse_xml(b"""<?xml version="1.0" encoding="UTF-8"?><test>\xC3\xA4</test>""") +- assert tree.xpath(".//text()") == ["ä"] +- tree = parse_xml(b"""<test>\xC3\xA4</test>""") +- assert tree.xpath(".//text()") == ["ä"] +- +- def test_parse_html_encoding(self): +- tree = parse_html("""<!DOCTYPE html><html><head><meta charset="utf-8"/></head><body>ä</body></html>""") +- assert tree.xpath(".//body/text()") == ["ä"] +- tree = parse_html("""<!DOCTYPE html><html><body>ä</body></html>""") +- assert tree.xpath(".//body/text()") == ["ä"] +- tree = parse_html(b"""<!DOCTYPE html><html><meta charset="utf-8"/><body>\xC3\xA4</body></html>""") +- assert tree.xpath(".//body/text()") == ["ä"] +- tree = parse_html(b"""<!DOCTYPE html><html><body>\xC3\xA4</body></html>""") +- assert tree.xpath(".//body/text()") == ["ä"] +- +- def test_parse_html_xhtml5(self): +- tree = parse_html("""<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html><html><body>ä?></body></html>""") +- assert tree.xpath(".//body/text()") == ["ä?>"] +- tree = parse_html(b"""<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html><html><body>\xC3\xA4?></body></html>""") +- assert tree.xpath(".//body/text()") == ["ä?>"] ++ @pytest.mark.parametrize(("content", "expected"), [ ++ pytest.param( ++ """<?xml version="1.0" encoding="UTF-8"?><test>ä</test>""", ++ "ä", ++ id="string-utf-8", ++ ), ++ pytest.param( ++ """<test>ä</test>""", ++ "ä", ++ id="string-unknown", ++ ), ++ pytest.param( ++ b"""<?xml version="1.0" encoding="UTF-8"?><test>\xC3\xA4</test>""", ++ "ä", ++ id="bytes-utf-8", ++ ), ++ pytest.param( ++ b"""<?xml version="1.0" encoding="ISO-8859-1"?><test>\xE4</test>""", ++ "ä", ++ id="bytes-iso-8859-1", ++ ), ++ pytest.param( ++ b"""<test>\xC3\xA4</test>""", ++ "ä", ++ id="bytes-unknown", ++ ), ++ ]) ++ def test_parse_xml_encoding(self, content, expected): ++ tree = parse_xml(content) ++ assert tree.xpath(".//text()") == [expected] ++ ++ @pytest.mark.parametrize(("content", "expected"), [ ++ pytest.param( ++ """<!DOCTYPE html><html><head><meta charset="utf-8"/></head><body>ä</body></html>""", ++ "ä", ++ id="string-utf-8", ++ ), ++ pytest.param( ++ """<!DOCTYPE html><html><body>ä</body></html>""", ++ "ä", ++ id="string-unknown", ++ ), ++ pytest.param( ++ b"""<!DOCTYPE html><html><head><meta charset="utf-8"/></head><body>\xC3\xA4</body></html>""", ++ "ä", ++ id="bytes-utf-8", ++ ), ++ pytest.param( ++ b"""<!DOCTYPE html><html><head><meta charset="ISO-8859-1"/></head><body>\xE4</body></html>""", ++ "ä", ++ id="bytes-iso-8859-1", ++ ), ++ pytest.param( ++ b"""<!DOCTYPE html><html><body>\xC3\xA4</body></html>""", ++ "ä", ++ id="bytes-unknown", ++ ), ++ ]) ++ def test_parse_html_encoding(self, content, expected): ++ tree = parse_html(content) ++ assert tree.xpath(".//body/text()") == [expected] ++ ++ @pytest.mark.parametrize(("content", "expected"), [ ++ pytest.param( ++ """<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html><html><body>ä?></body></html>""", ++ "ä?>", ++ id="string", ++ ), ++ pytest.param( ++ b"""<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html><html><body>\xC3\xA4?></body></html>""", ++ "ä?>", ++ id="bytes-utf-8", ++ ), ++ pytest.param( ++ b"""<?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE html><html><body>\xE4?></body></html>""", ++ "ä?>", ++ id="bytes-iso-8859-1", ++ ), ++ pytest.param( ++ b"""<?xml version="1.0"?><!DOCTYPE html><html><body>\xC3\xA4?></body></html>""", ++ "ä?>", ++ id="bytes-unknown", ++ ), ++ ]) ++ def test_parse_html_xhtml5(self, content, expected): ++ tree = parse_html(content) ++ assert tree.xpath(".//body/text()") == [expected] + + def test_parse_qsd(self): + assert parse_qsd("test=1&foo=bar", schema=validate.Schema({"test": str, "foo": "bar"})) == {"test": "1", "foo": "bar"} + diff --git a/net-misc/streamlink/streamlink-6.4.0.ebuild b/net-misc/streamlink/streamlink-6.4.0.ebuild new file mode 100644 index 000000000000..2c9ca567becc --- /dev/null +++ b/net-misc/streamlink/streamlink-6.4.0.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/streamlink/${PN}.git" + inherit git-r3 +fi + +DISTUTILS_SINGLE_IMPL=1 +# >= 6.2.1 uses a bunch of setuptools hooks instead of vanilla setuptools +# https://github.com/streamlink/streamlink/commit/194d9bc193f5285bc1ba33af5fd89209a96ad3a7 +DISTUTILS_USE_PEP517=standalone +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE='xml(+),threads(+)' +inherit distutils-r1 + +DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" +HOMEPAGE="https://streamlink.github.io/" + +if [[ ${PV} != 9999* ]]; then + SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz" +fi + +LICENSE="BSD-2 Apache-2.0" +SLOT="0" +if [[ ${PV} != 9999* ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +# See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep +RDEPEND=" + media-video/ffmpeg + $(python_gen_cond_dep ' + dev-python/certifi[${PYTHON_USEDEP}] + || ( + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/charset-normalizer[${PYTHON_USEDEP}] + ) + >=dev-python/requests-2.26.0[${PYTHON_USEDEP}] + dev-python/isodate[${PYTHON_USEDEP}] + >=dev-python/lxml-4.6.4[${PYTHON_USEDEP}] + >=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}] + dev-python/pycountry[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}] + >dev-python/PySocks-1.5.7[${PYTHON_USEDEP}] + >=dev-python/trio-0.22.0[${PYTHON_USEDEP}] + >=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}] + >=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}] + ') +" +BDEPEND=" + $(python_gen_cond_dep ' + >=dev-python/setuptools-64[${PYTHON_USEDEP}] + >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] + test? ( + >=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}] + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + dev-python/pytest-trio[${PYTHON_USEDEP}] + dev-python/requests-mock[${PYTHON_USEDEP}] + ) + ') +" + +if [[ ${PV} == 9999* ]]; then + RDEPEND+=" + $(python_gen_cond_dep ' + >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] + ') + " +fi + +PATCHES=( + "${FILESDIR}"/${P}-libxml2-2.12.0.patch +) + +distutils_enable_tests pytest diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild index 05ac7784a3e8..d73952536218 100644 --- a/net-misc/streamlink/streamlink-9999.ebuild +++ b/net-misc/streamlink/streamlink-9999.ebuild @@ -29,10 +29,15 @@ if [[ ${PV} != 9999* ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi +# See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep RDEPEND=" media-video/ffmpeg $(python_gen_cond_dep ' dev-python/certifi[${PYTHON_USEDEP}] + || ( + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/charset-normalizer[${PYTHON_USEDEP}] + ) >=dev-python/requests-2.26.0[${PYTHON_USEDEP}] dev-python/isodate[${PYTHON_USEDEP}] >=dev-python/lxml-4.6.4[${PYTHON_USEDEP}] |