diff options
Diffstat (limited to 'net-libs/libtorrent-rasterbar')
| -rw-r--r-- | net-libs/libtorrent-rasterbar/Manifest | 7 | ||||
| -rw-r--r-- | net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.77.patch | 37 | ||||
| -rw-r--r-- | net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14.ebuild | 110 | ||||
| -rw-r--r-- | net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r2.ebuild (renamed from net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.3-r1.ebuild) | 22 | ||||
| -rw-r--r-- | net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4.ebuild | 54 |
5 files changed, 166 insertions, 64 deletions
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest index d5003a8109c5..cbfab278e362 100644 --- a/net-libs/libtorrent-rasterbar/Manifest +++ b/net-libs/libtorrent-rasterbar/Manifest @@ -1,15 +1,16 @@ +AUX libtorrent-rasterbar-2.0.4-boost-1.77.patch 1972 BLAKE2B 31b91cc9ec963fc94fdab61e2fa0f7b0e55f2fea1d2f84bbe2cda409863ec0d0248b4fdb2e85b049165a46ad77cf8e2fffbcd634d01b58549372d9a3045b8890 SHA512 78cca1965d2cabc384051e3c9555d49e5137f025b0211120bd5abdf90897af200f87c95526ff9dc919356f6794ea04ce973dfcb774e7b5d1cd20ebf34e80f89a DIST libtorrent-1.2.10.tar.gz 3586008 BLAKE2B 71971124930462feb5f5083fed38ccadcfd1a2aed0d000a06cd7e0898b40a1451722cd79fdf0b1da3477047b26c7f7e3c1f74086a141770a7d143c916e96b6bb SHA512 e6de939fb6527783695e0b6623ddbe27f85842a36c0899b93ea0284cb3c6f3d14b8c39e29316adb3bf9acac7804f38385cc06854a32df28e7f4f6839af9f382d DIST libtorrent-1.2.11.tar.gz 3591610 BLAKE2B fab5d780dc5e1a855b60326cefdca6bcfb7459d4d37429e1c475434ca6ca2f465ffb6188ff519f49f2612941fe4806152511400a1c6fe121ade3ed35c6f40a79 SHA512 d502286f67bf462f14169daafe12b94ca723598530c85360c3a4b3c73535202b63632036248fdecc942cb559e66e6a5cb5afa830dc78bbff72a6c9a330710b62 DIST libtorrent-1.2.12.tar.gz 3604064 BLAKE2B e0eb00aba90e3d5e3ba1bf3984e2eb606583007137288ccf93961185744ccc2a69922063a9004a2ebe627d7657c582eaee9f7ad2971de0dc41351bd59ed23953 SHA512 78be4c12e12f593154eda0960aaf9583fe27310e0223dbb21220400c5339744c9b2b11afa880fea30f77b4c0d07345937ff8a20d58d2d4ed7dcda84601380e20 +DIST libtorrent-1.2.14.tar.gz 3614077 BLAKE2B 423cd0c467510e3b4d33485ea108912a90ef0d66746e6f912eeb07930e7091d1ce8e28953a48dab3bb03c6232a9e958be423d4563bd63c083ec1423c4753b3df SHA512 9ba7d8a271ecc7330ae9c794f3966a6d1677b9d2a02a24df8b6e63daa4d5c0a7ef88607a73b417247b4afc5195e46cd0ca75859358f9e50915af56b3ed19f322 DIST libtorrent-1.2.9.tar.gz 3584800 BLAKE2B 5160056e227a54992ca4e490ffe0088d080aa9bade7a76f55eac26a644bab720c39a70b90d94f465ec711893249a084d9f77fa496be770585094b9b3ea4a1cdd SHA512 c547d96470f6a89f22adc0f5579ffb98b877a46f0a163698c49f1de57f23af60a7b0d3c1ca482e3ed8d3e35124d14a1d16a53e455f4d69f347fcb33c6ded75a8 DIST libtorrent-rasterbar-1.2.6.tar.gz 3611015 BLAKE2B 39323c223927272a4eb9bb93ad70acd62165b9b3eb3f4f45cb76f99a23b1e131b526c8d8370fbd7cc30c7e776a5f9b7990c989ceaa3566272adc25df639fc5ba SHA512 9f03e28449b08e18a98a1f1bf0571f470c56fabd2becde5bde56ad566611c8519b0b387939f285a552d1f0382446633b67d00b6b5ff7083e4d1420a3ce9232fc -DIST libtorrent-rasterbar-2.0.3.tar.gz 4294340 BLAKE2B 6726be94ea070676a8774d8b16ea1bcfcc2d08bc260914ef5529b0b166d681744c79ab258d251da6d21f7a7f1fbf9b8605ed5e6c8cf26cf878c3c8de1d54dccd SHA512 37211ac165db8542f8c2a29e28f4685b050a825c14d1f6328a4a96c2af1bc1bbf00d9dba4bc81c192f9b57ff358d1b27eeb7df7cebca5a2f751e6fb2bce3d257 DIST libtorrent-rasterbar-2.0.4.tar.gz 4311319 BLAKE2B fee8255d46d5ca019cd487b57fc6003744c208ea5e78873b925f53881667c55c506d302fc7ae6cd5b5d5e776cfe059b714db94d16dd28cfc7939ec6f4fa4e5fa SHA512 66ce3c3369b1d2a83654727c23022d38b070b8bc3ad83b1001e2cfad945acbaa4d61990094bc758886967cd305ca2213b60b1b0523b5106c42d4701d8cff8db1 EBUILD libtorrent-rasterbar-1.2.10-r1.ebuild 2651 BLAKE2B 93f21eab92ee049b5d89735625e8cb82e6254bf9e1c22037369c6877f92b046746d1c65733132e6ac2c407bdea404dbba22414bc4467359c1c5de821e81dd723 SHA512 d328ecd9d59d26326c841d2638d917c4e67930285478ab337a417fcd9b4a760135b34924986868518398b24d88be99591b8c087b1e12131854f6512332c6fa34 EBUILD libtorrent-rasterbar-1.2.11-r1.ebuild 2675 BLAKE2B f3eca25e40c12852703a06522b6904d64ae7fcf71b42df5ef3c0d78c06c76898977a29fd51f4cffb60472526c8a99c4b145eca3fb5f02d31e3f7d7be2b647a2f SHA512 2ab394714973bf577cc5ef3d124a2d48dbdad8b9db0178755f53c34a8cc2b4f27d30dcc94f898e3df28c0f37b388836d64fb7beb0cd517c81cdecdcbaa6a9c33 EBUILD libtorrent-rasterbar-1.2.12-r1.ebuild 2677 BLAKE2B 83ead7b61a014810584e8880f0e6484aa795334f36aa3e46b71faac9036d9a0fa1fdd545bc6732339747f67b2aa7e3f85fba02f6d0662ae42f81df766bc9bc16 SHA512 395be1fc23c0f7eb88a2531ffdfea79b67f4a575ba97dc59f41e0f3cba7bc91defdbc1aeb0532356b5a13c82b540bb76a1ec37d91bbebcdad5694383a30db395 +EBUILD libtorrent-rasterbar-1.2.14.ebuild 2454 BLAKE2B 42dde0e47fd8046bf296d1ec92509e229b89337c56baa3f26b77a14759111913d5cfa68c3a9abb6aa0f05b58db9d4d69c0fa27493b7457f79e11b146c20b7213 SHA512 7d766a5fbf18f1a213f819e2aa9ed224551d750bdfea8ddc77b39c6d2d4748e95e85a605cb2397f12e015b5aa77767d1d3030d65bcf3e04a531a105eadf8d0af EBUILD libtorrent-rasterbar-1.2.6-r1.ebuild 2440 BLAKE2B 0c36fbc1882e4f115de629bf842ac1f05378866db3a570e75e7bf2c5da99d663594c2893d7e914b5a8079668ba2f5c89b9c64cb91d93e1c1523cd37dd9eadb52 SHA512 87a88041183f8e5bf981ad19a941951c6341907f1396c0f1a1add6ce00337f57ccac51e0260bb1fcc5623386a990d6662af580242e5384ee270e51a5ba22075f EBUILD libtorrent-rasterbar-1.2.9-r1.ebuild 2651 BLAKE2B 93f21eab92ee049b5d89735625e8cb82e6254bf9e1c22037369c6877f92b046746d1c65733132e6ac2c407bdea404dbba22414bc4467359c1c5de821e81dd723 SHA512 d328ecd9d59d26326c841d2638d917c4e67930285478ab337a417fcd9b4a760135b34924986868518398b24d88be99591b8c087b1e12131854f6512332c6fa34 -EBUILD libtorrent-rasterbar-2.0.3-r1.ebuild 1290 BLAKE2B eaf84023ce0ac73e1ae9d378ea0dbacbba7d1a5228554ccb30cf238f71dd4c9fde04c6d053aebb2f608986287ef092f91f01592c166831cf4c630425175b7bd7 SHA512 590d335fb7712265bf185d7f49c45ab3860e0b50fb48703bd03c19000e88eeee16a74cfdbff8eac5d024fcc559aff9f8b425c69a4c3d0cb806ba5ce56b992edb -EBUILD libtorrent-rasterbar-2.0.4.ebuild 1290 BLAKE2B eaf84023ce0ac73e1ae9d378ea0dbacbba7d1a5228554ccb30cf238f71dd4c9fde04c6d053aebb2f608986287ef092f91f01592c166831cf4c630425175b7bd7 SHA512 590d335fb7712265bf185d7f49c45ab3860e0b50fb48703bd03c19000e88eeee16a74cfdbff8eac5d024fcc559aff9f8b425c69a4c3d0cb806ba5ce56b992edb +EBUILD libtorrent-rasterbar-2.0.4-r2.ebuild 1511 BLAKE2B be2686a64a4e1aa713e8f34943f4dafbb7ab8eab035ad81d25fc5e69e9f74279216497c15357ce1ad5356ab47a2a9471b81a4ca5cbf360c0d4d6b7c9d9121b92 SHA512 095466c72a42123093078efc78e8c54cb0262184857f959276147906fca6cb9e78beecced02dc42026ab1c59d09c984ccb228b586eb3dfbfc311e94a36cb5388 MISC metadata.xml 637 BLAKE2B a5e6a45429d117f3ec23de9f2b02b2a38fe6ee23ba4704f7ba842e7f95974aa04166a4335a0a20f52bef3a26db283be5d2b7c4e30f027e4b31bca996e87d9704 SHA512 ff6cd4045a5471a1eb661b923c51136a946e8080d068a2ea8d81491f8b1ab3ddbc7687673d79f0ea03c631d9e51e564281488bbb8f033558c8c1f26c8b4a9927 diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.77.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.77.patch new file mode 100644 index 000000000000..b39f62614b2a --- /dev/null +++ b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.77.patch @@ -0,0 +1,37 @@ +https://github.com/arvidn/libtorrent/pull/6412 +https://github.com/arvidn/libtorrent/issues/6405 +https://bugs.gentoo.org/808084 + +From 906cedddedbdf9d98ecf2bd19340f7f17869b968 Mon Sep 17 00:00:00 2001 +From: arvidn <arvid@libtorrent.org> +Date: Thu, 19 Aug 2021 11:54:13 +0200 +Subject: [PATCH] bump handler allocation sizes for boost-1.77 (linux) + +--- + include/libtorrent/aux_/allocating_handler.hpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/include/libtorrent/aux_/allocating_handler.hpp b/include/libtorrent/aux_/allocating_handler.hpp +index 9d826d11a1..b24349850e 100644 +--- a/include/libtorrent/aux_/allocating_handler.hpp ++++ b/include/libtorrent/aux_/allocating_handler.hpp +@@ -122,14 +122,14 @@ namespace libtorrent { namespace aux { + constexpr std::size_t fuzzer_write_cost = 0; + constexpr std::size_t fuzzer_read_cost = 0; + #endif +- constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + fuzzer_write_cost + 152; +- constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + fuzzer_read_cost + 152; +- constexpr std::size_t udp_handler_max_size = tracking + 144; +- constexpr std::size_t utp_handler_max_size = tracking + 168; ++ constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + fuzzer_write_cost + 168; ++ constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + fuzzer_read_cost + 168; ++ constexpr std::size_t udp_handler_max_size = tracking + 160; ++ constexpr std::size_t utp_handler_max_size = tracking + 184; + constexpr std::size_t abort_handler_max_size = tracking + 72; + constexpr std::size_t submit_handler_max_size = tracking + 72; + constexpr std::size_t deferred_handler_max_size = tracking + 80; +- constexpr std::size_t tick_handler_max_size = tracking + 112; ++ constexpr std::size_t tick_handler_max_size = tracking + 128; + #endif + + enum HandlerName diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14.ebuild new file mode 100644 index 000000000000..7cc75214e00a --- /dev/null +++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_REQ_USE="threads(+)" +DISTUTILS_OPTIONAL=true +DISTUTILS_IN_SOURCE_BUILD=true + +inherit autotools flag-o-matic distutils-r1 + +DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" +HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent" +SRC_URI="https://github.com/arvidn/libtorrent/archive/v${PV}.tar.gz -> libtorrent-${PV}.tar.gz" + +LICENSE="BSD" +SLOT="0/10" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug +dht doc examples python +ssl static-libs test" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RESTRICT="!test? ( test )" + +S="${WORKDIR}/libtorrent-${PV}" + +RDEPEND=" + dev-libs/boost:=[threads(+)] + virtual/libiconv + examples? ( !net-p2p/mldonkey ) + python? ( + ${PYTHON_DEPS} + dev-libs/boost:=[python,${PYTHON_USEDEP}] + ) + ssl? ( + dev-libs/openssl:0= + ) +" +DEPEND="${RDEPEND} + sys-devel/libtool +" + +src_prepare() { + mkdir -p "${S}"/build-aux || die + touch "${S}"/build-aux/config.rpath || die + eautoreconf + + default + + # bug 578026 + # prepend -L${S}/... to ensure bindings link against the lib we just built + sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die + + # prepend -I${S}/... to ensure bindings use the right headers + sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die + + use python && distutils-r1_src_prepare +} + +src_configure() { + + local myeconfargs=( + $(use_enable debug) + $(use_enable debug export-all) + $(use_enable debug logging) + $(use_enable dht) + $(use_enable examples) + $(use_enable ssl encryption) + $(use_enable static-libs static) + $(use_enable test tests) + --with-boost="${ESYSROOT}/usr" + --with-libiconv + --enable-logging + ) + econf "${myeconfargs[@]}" + + if use python; then + python_configure() { + econf "${myeconfargs[@]}" \ + --enable-python-binding \ + --with-boost-python="boost_${EPYTHON/./}" + } + distutils-r1_src_configure + fi +} + +src_compile() { + default + + python_compile() { + cd "${BUILD_DIR}/../bindings/python" || die + distutils-r1_python_compile + } + use python && distutils-r1_src_compile +} + +src_install() { + use doc && HTML_DOCS+=( "${S}"/docs ) + + default + + python_install() { + cd "${BUILD_DIR}/../bindings/python" || die + distutils-r1_python_install + } + use python && distutils-r1_src_install + + find "${D}" -name '*.la' -delete || die +} diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.3-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r2.ebuild index 739fc3f8e91f..3538983c205f 100644 --- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.3-r1.ebuild +++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r2.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python{3_8,3_9} ) -inherit cmake python-any-r1 +inherit cmake python-single-r1 DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent" @@ -15,24 +15,30 @@ LICENSE="BSD" SLOT="0/2.0" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" IUSE="+dht debug gnutls python ssl test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test ) test" # not yet fixed -RDEPEND="dev-libs/boost:=[threads(+)]" DEPEND=" + dev-libs/boost:=[threads(+)] python? ( ${PYTHON_DEPS} - $(python_gen_any_dep ' - dev-libs/boost[python,${PYTHON_USEDEP}]') + $(python_gen_cond_dep ' + dev-libs/boost[python,${PYTHON_USEDEP}] + ') ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) - ${DEPEND} " +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-boost-1.77.patch +) pkg_setup() { - use python && python-any-r1_pkg_setup + use python && python-single-r1_pkg_setup } src_configure() { @@ -48,7 +54,9 @@ src_configure() { -Dbuild_tests=$(usex test ON OFF) ) - use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON}" ) + # We need to drop the . from the Python version to satisfy Boost's + # FindBoost.cmake module, bug #793038. + use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" ) cmake_src_configure } diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4.ebuild deleted file mode 100644 index 739fc3f8e91f..000000000000 --- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_8,3_9} ) - -inherit cmake python-any-r1 - -DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent" -SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/2.0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" -IUSE="+dht debug gnutls python ssl test" - -RESTRICT="!test? ( test ) test" # not yet fixed -RDEPEND="dev-libs/boost:=[threads(+)]" -DEPEND=" - python? ( - ${PYTHON_DEPS} - $(python_gen_any_dep ' - dev-libs/boost[python,${PYTHON_USEDEP}]') - ) - ssl? ( - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( dev-libs/openssl:= ) - ) - ${DEPEND} -" - -pkg_setup() { - use python && python-any-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_CXX_STANDARD=14 - -DBUILD_SHARED_LIBS=ON - -Dbuild_examples=OFF - -Ddht=$(usex dht ON OFF) - -Dencryption=$(usex ssl ON OFF) - -Dgnutls=$(usex gnutls ON OFF) - -Dlogging=$(usex debug ON OFF) - -Dpython-bindings=$(usex python ON OFF) - -Dbuild_tests=$(usex test ON OFF) - ) - - use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON}" ) - - cmake_src_configure -} |