* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtorrent-rasterbar/files/, net-libs/libtorrent-rasterbar/
@ 2021-10-31 4:22 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-10-31 4:22 UTC (permalink / raw
To: gentoo-commits
commit: 116d6431c3830f6332bc67e1ec591fcbe6542bdc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 31 04:22:03 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 04:22:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=116d6431
net-libs/libtorrent-rasterbar: add Boost 1.76(?) patch
Closes: https://bugs.gentoo.org/820836
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../libtorrent-rasterbar-2.0.4-boost-1.76.patch | 58 ++++++++++++++++++++++
.../libtorrent-rasterbar-2.0.4-r3.ebuild | 1 +
2 files changed, 59 insertions(+)
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.76.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.76.patch
new file mode 100644
index 00000000000..5e8e04e940f
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-boost-1.76.patch
@@ -0,0 +1,58 @@
+https://github.com/paullouisageneau/boost-asio-gnutls/commit/895105972e5a9318d572b147c1872f64d23e2a8e
+https://bugs.gentoo.org/820836
+
+From 895105972e5a9318d572b147c1872f64d23e2a8e Mon Sep 17 00:00:00 2001
+From: Shantanu Singh <shsi@microsoft.com>
+Date: Fri, 18 Sep 2020 14:01:39 -0700
+Subject: [PATCH] Use fully qualified std::placeholders to prevent conflicts
+ with boost::placeholders
+
+--- a/deps/asio-gnutls/include/boost/asio/gnutls/stream.hpp
++++ b/deps/asio-gnutls/include/boost/asio/gnutls/stream.hpp
+@@ -244,8 +244,7 @@ template <typename NextLayer> class stream : public stream_base
+ return;
+ }
+
+- using namespace std::placeholders;
+- m_impl->read_handler = std::bind(callable, _1, _2);
++ m_impl->read_handler = std::bind(callable, std::placeholders::_1, std::placeholders::_2);
+ m_impl->bytes_read = 0;
+ m_impl->async_schedule();
+ return callable.get_completion_result();
+@@ -293,8 +292,7 @@ template <typename NextLayer> class stream : public stream_base
+ return;
+ }
+
+- using namespace std::placeholders;
+- m_impl->write_handler = std::bind(callable, _1, _2);
++ m_impl->write_handler = std::bind(callable, std::placeholders::_1, std::placeholders::_2);
+ m_impl->bytes_written = 0;
+ m_impl->async_schedule();
+ return callable.get_completion_result();
+@@ -568,8 +566,6 @@ template <typename NextLayer> class stream : public stream_base
+
+ void async_schedule()
+ {
+- using namespace std::placeholders;
+-
+ if (!parent) return;
+ auto& next_layer = parent->m_next_layer;
+
+@@ -581,14 +577,14 @@ template <typename NextLayer> class stream : public stream_base
+ else
+ next_layer.async_wait(
+ next_layer_type::wait_read,
+- std::bind(&impl::handle_read, this->shared_from_this(), _1));
++ std::bind(&impl::handle_read, this->shared_from_this(), std::placeholders::_1));
+ }
+
+ // Start a write operation if GnuTLS wants one
+ if (want_write() && !std::exchange(is_writing, true))
+ {
+ next_layer.async_wait(next_layer_type::wait_write,
+- std::bind(&impl::handle_write, this->shared_from_this(), _1));
++ std::bind(&impl::handle_write, this->shared_from_this(), std::placeholders::_1));
+ }
+ }
+
+
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r3.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r3.ebuild
index 787c4093411..9dc9cb50370 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r3.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r3.ebuild
@@ -39,6 +39,7 @@ BDEPEND="python? (
)"
PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.4-boost-1.76.patch
"${FILESDIR}"/${P}-boost-1.77.patch
)
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtorrent-rasterbar/files/, net-libs/libtorrent-rasterbar/
@ 2022-06-25 21:18 David Seifert
0 siblings, 0 replies; 8+ messages in thread
From: David Seifert @ 2022-06-25 21:18 UTC (permalink / raw
To: gentoo-commits
commit: 0d9916f56c377aab4143f2f2b157f62d97e2da0f
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 21:18:17 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 21:18:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d9916f5
net-libs/libtorrent-rasterbar: drop 1.2.15-r1, 1.2.16, 2.0.5
Closes: https://bugs.gentoo.org/775104
Closes: https://bugs.gentoo.org/791016
Closes: https://bugs.gentoo.org/832424
Signed-off-by: David Seifert <soap <AT> gentoo.org>
net-libs/libtorrent-rasterbar/Manifest | 3 -
.../libtorrent-rasterbar-2.0.5-boost-1.78.patch | 46 -------------
.../libtorrent-rasterbar-1.2.15-r1.ebuild | 69 -------------------
.../libtorrent-rasterbar-1.2.16.ebuild | 69 -------------------
.../libtorrent-rasterbar-2.0.5.ebuild | 78 ----------------------
5 files changed, 265 deletions(-)
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 7eb5e03678e5..45b2ea13fd39 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,4 +1 @@
-DIST libtorrent-rasterbar-1.2.15.tar.gz 4163049 BLAKE2B 282d6cf19897706f96d68c75df3c1f5f004df38c07ca2fcaa760f0004512dc8759ea47d4e0c96ff4d8ac2d23569a05507c5dd0667d83c702e14825a0d9ffcd0e SHA512 c409c53ec9c299a05b51ab61d7df1209803cbd6070f0a014dd6fb42c30f6f5230ea90848330f901c61816bc70901e618409acacc95bb0e5acb7f81211d001fa2
-DIST libtorrent-rasterbar-1.2.16.tar.gz 4163867 BLAKE2B 2cb4c79d83854bf3e5fc1b2ff9a361539b7690d0df3c2c15f2df1c7b9e782df51fbab57920a3bac56dff872c829a49303d66d33cdc10586ccc01dad3e83b149c SHA512 2bad1bf1604f99b85567056f798bfb78cdd663612291536d1145141e61f843aced416f7608911793c948d77802ef5b3088197b914c100a4278c94033eb304d4b
-DIST libtorrent-rasterbar-2.0.5.tar.gz 4407260 BLAKE2B 71c64879be103326fe438ba6b11b672fb0d631ed0de4eb23c2595f3596b522693594ded9f8733c7827dd668e285cb5099cad78bcd437ec184837eafbd39b356f SHA512 be5b812135dada957e565085b5bdda06827c8427f78a4468ef263e1a1e33d3a0bbba7ac27235f0d17ae6087d54311281e3b1975eef81cda514acc8329862dc04
DIST libtorrent-rasterbar-2.0.6.tar.gz 4431174 BLAKE2B 4951a102b68a5a7ba9a98d771ca638e8438b2aeaa95f5d7bf616542c7a02d28e184ee1bf5b7a55cd91a068cd2d4e9756c479e4ddb5eabe89d8aa833d70aa7502 SHA512 4a5d710706040ef6193967dbb13998cb0ddebe7e95c3bf8aec0812876027c68c32b001fd3f07cd4ff1b819660a8d46ae8c7077e72caf92572288a51cdec7daea
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.5-boost-1.78.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.5-boost-1.78.patch
deleted file mode 100644
index 93e14963e366..000000000000
--- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.5-boost-1.78.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From feb911a19c8a66bf13915973649d3a4f5d729f12 Mon Sep 17 00:00:00 2001
-From: arvidn <arvid@libtorrent.org>
-Date: Sun, 12 Dec 2021 21:52:15 +0100
-Subject: [PATCH] update allocator sizes for boost-1.78
-
----
- include/libtorrent/aux_/allocating_handler.hpp | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/include/libtorrent/aux_/allocating_handler.hpp b/include/libtorrent/aux_/allocating_handler.hpp
-index 726032e085c..7096dfd2e67 100644
---- a/include/libtorrent/aux_/allocating_handler.hpp
-+++ b/include/libtorrent/aux_/allocating_handler.hpp
-@@ -77,11 +77,11 @@ namespace libtorrent { namespace aux {
- constexpr std::size_t openssl_write_cost = 0;
- #endif
-
-- constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + 102 + 8 * sizeof(void*);
-- constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + 102 + 8 * sizeof(void*);
-- constexpr std::size_t udp_handler_max_size = tracking + debug_tick + 144 + 8 * sizeof(void*);
-- constexpr std::size_t utp_handler_max_size = tracking + debug_tick + 168 + 8 * sizeof(void*);
-- constexpr std::size_t tick_handler_max_size = tracking + debug_tick + 160;
-+ constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + 102 + 9 * sizeof(void*);
-+ constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + 102 + 9 * sizeof(void*);
-+ constexpr std::size_t udp_handler_max_size = tracking + debug_tick + 144 + 9 * sizeof(void*);
-+ constexpr std::size_t utp_handler_max_size = tracking + debug_tick + 168 + 9 * sizeof(void*);
-+ constexpr std::size_t tick_handler_max_size = tracking + debug_tick + 168;
- constexpr std::size_t abort_handler_max_size = tracking + debug_tick + 104;
- constexpr std::size_t submit_handler_max_size = tracking + debug_tick + 104;
- constexpr std::size_t deferred_handler_max_size = tracking + debug_tick + 112;
-@@ -124,12 +124,12 @@ namespace libtorrent { namespace aux {
- #endif
- 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 udp_handler_max_size = tracking + 168;
-+ constexpr std::size_t utp_handler_max_size = tracking + 192;
- 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 + 128;
-+ constexpr std::size_t tick_handler_max_size = tracking + 136;
- #endif
-
- enum HandlerName
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.15-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.15-r1.ebuild
deleted file mode 100644
index 94e0b8f3d964..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.15-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit cmake python-single-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/10"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="+dht debug python ssl test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- dev-libs/boost:=[threads(+)]
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-libs/boost[python,${PYTHON_USEDEP}]
- ')
- )
- ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="python? (
- $(python_gen_cond_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ')
- )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=ON
- -Dbuild_examples=OFF
- -Ddht=$(usex dht ON OFF)
- -Dencryption=$(usex ssl ON OFF)
- -Dlogging=$(usex debug ON OFF)
- -Dpython-bindings=$(usex python ON OFF)
- -Dbuild_tests=$(usex test ON OFF)
- )
-
- # 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
-}
-
-src_test() {
- local myctestargs=(
- # Needs running UPnP server
- -E "test_upnp"
- )
-
- # Checked out Fedora's test workarounds for inspiration
- # https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120
- LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.16.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.16.ebuild
deleted file mode 100644
index ee7e88d32406..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.16.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit cmake python-single-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/10"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+dht debug python ssl test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- dev-libs/boost:=[threads(+)]
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-libs/boost[python,${PYTHON_USEDEP}]
- ')
- )
- ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="python? (
- $(python_gen_cond_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ')
- )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=ON
- -Dbuild_examples=OFF
- -Ddht=$(usex dht ON OFF)
- -Dencryption=$(usex ssl ON OFF)
- -Dlogging=$(usex debug ON OFF)
- -Dpython-bindings=$(usex python ON OFF)
- -Dbuild_tests=$(usex test ON OFF)
- )
-
- # 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
-}
-
-src_test() {
- local myctestargs=(
- # Needs running UPnP server
- -E "test_upnp"
- )
-
- # Checked out Fedora's test workarounds for inspiration
- # https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120
- LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.ebuild
deleted file mode 100644
index 03981e30ef77..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit cmake python-single-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 ~arm64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+dht debug gnutls python ssl test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- dev-libs/boost:=[threads(+)]
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-libs/boost[python,${PYTHON_USEDEP}]
- ')
- )
- ssl? (
- gnutls? ( net-libs/gnutls:= )
- !gnutls? ( dev-libs/openssl:= )
- )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="python? (
- $(python_gen_cond_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ')
- )"
-
-PATCHES=(
- "${FILESDIR}/${P}-boost-1.78.patch"
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_CXX_STANDARD=17
- -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)
- )
-
- # 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
-}
-
-src_test() {
- local myctestargs=(
- # Needs running UPnP server
- -E "test_upnp"
- )
-
- # Checked out Fedora's test workarounds for inspiration
- # https://src.fedoraproject.org/rpms/rb_libtorrent/blob/rawhide/f/rb_libtorrent.spec#_120
- LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" cmake_src_test
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtorrent-rasterbar/files/, net-libs/libtorrent-rasterbar/
@ 2021-12-13 0:23 Nick Sarnie
0 siblings, 0 replies; 8+ messages in thread
From: Nick Sarnie @ 2021-12-13 0:23 UTC (permalink / raw
To: gentoo-commits
commit: c13c5acc2855a5535370078e586c5bc6b06edf67
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 13 00:19:23 2021 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Mon Dec 13 00:22:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c13c5acc
net-libs/libtorrent-rasterbar: Fix build with boost 1.78
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
Acked-by: Sam James <sam <AT> gentoo.org>
.../libtorrent-rasterbar-2.0.5-boost-1.78.patch | 46 ++++++++++++++++++++++
.../libtorrent-rasterbar-2.0.5.ebuild | 4 ++
2 files changed, 50 insertions(+)
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.5-boost-1.78.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.5-boost-1.78.patch
new file mode 100644
index 000000000000..93e14963e366
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.5-boost-1.78.patch
@@ -0,0 +1,46 @@
+From feb911a19c8a66bf13915973649d3a4f5d729f12 Mon Sep 17 00:00:00 2001
+From: arvidn <arvid@libtorrent.org>
+Date: Sun, 12 Dec 2021 21:52:15 +0100
+Subject: [PATCH] update allocator sizes for boost-1.78
+
+---
+ include/libtorrent/aux_/allocating_handler.hpp | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/include/libtorrent/aux_/allocating_handler.hpp b/include/libtorrent/aux_/allocating_handler.hpp
+index 726032e085c..7096dfd2e67 100644
+--- a/include/libtorrent/aux_/allocating_handler.hpp
++++ b/include/libtorrent/aux_/allocating_handler.hpp
+@@ -77,11 +77,11 @@ namespace libtorrent { namespace aux {
+ constexpr std::size_t openssl_write_cost = 0;
+ #endif
+
+- constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + 102 + 8 * sizeof(void*);
+- constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + 102 + 8 * sizeof(void*);
+- constexpr std::size_t udp_handler_max_size = tracking + debug_tick + 144 + 8 * sizeof(void*);
+- constexpr std::size_t utp_handler_max_size = tracking + debug_tick + 168 + 8 * sizeof(void*);
+- constexpr std::size_t tick_handler_max_size = tracking + debug_tick + 160;
++ constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + 102 + 9 * sizeof(void*);
++ constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + 102 + 9 * sizeof(void*);
++ constexpr std::size_t udp_handler_max_size = tracking + debug_tick + 144 + 9 * sizeof(void*);
++ constexpr std::size_t utp_handler_max_size = tracking + debug_tick + 168 + 9 * sizeof(void*);
++ constexpr std::size_t tick_handler_max_size = tracking + debug_tick + 168;
+ constexpr std::size_t abort_handler_max_size = tracking + debug_tick + 104;
+ constexpr std::size_t submit_handler_max_size = tracking + debug_tick + 104;
+ constexpr std::size_t deferred_handler_max_size = tracking + debug_tick + 112;
+@@ -124,12 +124,12 @@ namespace libtorrent { namespace aux {
+ #endif
+ 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 udp_handler_max_size = tracking + 168;
++ constexpr std::size_t utp_handler_max_size = tracking + 192;
+ 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 + 128;
++ constexpr std::size_t tick_handler_max_size = tracking + 136;
+ #endif
+
+ enum HandlerName
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.ebuild
index eee2529eecae..7df4947a91b8 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.5.ebuild
@@ -38,6 +38,10 @@ BDEPEND="python? (
')
)"
+PATCHES=(
+ "${FILESDIR}/${P}-boost-1.78.patch"
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtorrent-rasterbar/files/, net-libs/libtorrent-rasterbar/
@ 2021-10-31 4:33 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-10-31 4:33 UTC (permalink / raw
To: gentoo-commits
commit: e1ab2444c5bc7ea380b30447926371d2904cf29a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 31 04:32:46 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 04:32:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ab2444
net-libs/libtorrent-rasterbar: fix Python bindings in 2.0.4
Thanks-to: Conrad <conrad_bugtracker <AT> fps-power.eu>
Closes: https://bugs.gentoo.org/820518
Signed-off-by: Sam James <sam <AT> gentoo.org>
...libtorrent-rasterbar-2.0.4-python-symbols.patch | 28 ++++++++++++++++++++++
...ebuild => libtorrent-rasterbar-2.0.4-r4.ebuild} | 1 +
2 files changed, 29 insertions(+)
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-python-symbols.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-python-symbols.patch
new file mode 100644
index 00000000000..109a6490af2
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-2.0.4-python-symbols.patch
@@ -0,0 +1,28 @@
+https://github.com/arvidn/libtorrent/commit/f2eefd327f1ca89b053eb1e5f4ed229efe52e47f
+https://bugs.gentoo.org/820518
+
+From: Nick Korotysh <kolchaprogrammer@list.ru>
+Date: Fri, 25 Jun 2021 22:08:00 +0300
+Subject: [PATCH] added missed sources to Python bindings CMakeLists.txt
+
+fixes libtorrent loading module issues:
+libtorrent.cpython-39-x86_64-linux-gnu.so: undefined symbol: _Z16bind_sha256_hashv
+--- a/bindings/python/CMakeLists.txt
++++ b/bindings/python/CMakeLists.txt
+@@ -49,6 +49,7 @@ Python3_add_library(python-libtorrent MODULE WITH_SOABI
+ src/entry.cpp
+ src/error_code.cpp
+ src/fingerprint.cpp
++ src/info_hash.cpp
+ src/ip_filter.cpp
+ src/magnet_uri.cpp
+ src/module.cpp
+@@ -56,6 +57,7 @@ Python3_add_library(python-libtorrent MODULE WITH_SOABI
+ src/session.cpp
+ src/session_settings.cpp
+ src/sha1_hash.cpp
++ src/sha256_hash.cpp
+ src/string.cpp
+ src/torrent_handle.cpp
+ src/torrent_info.cpp
+
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r3.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r4.ebuild
similarity index 97%
rename from net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r3.ebuild
rename to net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r4.ebuild
index 9dc9cb50370..0982c19a126 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r3.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r4.ebuild
@@ -41,6 +41,7 @@ BDEPEND="python? (
PATCHES=(
"${FILESDIR}"/${PN}-2.0.4-boost-1.76.patch
"${FILESDIR}"/${P}-boost-1.77.patch
+ "${FILESDIR}"/${P}-python-symbols.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtorrent-rasterbar/files/, net-libs/libtorrent-rasterbar/
@ 2021-08-27 0:36 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-08-27 0:36 UTC (permalink / raw
To: gentoo-commits
commit: ac3234e6bb0e647c0bbdb98fd36c2aeb5d5b396d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 27 00:32:44 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 27 00:33:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac3234e6
net-libs/libtorrent-rasterbar: fix Boost 1.77 compatibility
Revbumping because the patch seems a bit invasive
and also to fix DEPEND.
Closes: https://bugs.gentoo.org/808084
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../libtorrent-rasterbar-2.0.4-boost-1.77.patch | 37 ++++++++++++++++++++++
...ebuild => libtorrent-rasterbar-2.0.4-r1.ebuild} | 6 +++-
2 files changed, 42 insertions(+), 1 deletion(-)
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 00000000000..b39f62614b2
--- /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-2.0.4.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r1.ebuild
similarity index 95%
rename from net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4.ebuild
rename to net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r1.ebuild
index 739fc3f8e91..127f26feb7f 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r1.ebuild
@@ -19,6 +19,7 @@ IUSE="+dht debug gnutls python ssl test"
RESTRICT="!test? ( test ) test" # not yet fixed
RDEPEND="dev-libs/boost:=[threads(+)]"
DEPEND="
+ ${RDEPEND}
python? (
${PYTHON_DEPS}
$(python_gen_any_dep '
@@ -28,9 +29,12 @@ DEPEND="
gnutls? ( net-libs/gnutls:= )
!gnutls? ( dev-libs/openssl:= )
)
- ${DEPEND}
"
+PATCHES=(
+ "${FILESDIR}"/${P}-boost-1.77.patch
+)
+
pkg_setup() {
use python && python-any-r1_pkg_setup
}
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtorrent-rasterbar/files/, net-libs/libtorrent-rasterbar/
@ 2019-12-20 10:43 Mikle Kolyada
0 siblings, 0 replies; 8+ messages in thread
From: Mikle Kolyada @ 2019-12-20 10:43 UTC (permalink / raw
To: gentoo-commits
commit: 7c0e633d611f109f006f68912afd07fc39882d87
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 20 10:43:25 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Dec 20 10:43:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c0e633d
net-libs/libtorrent-rasterbar: Drop old 1.2.x
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
net-libs/libtorrent-rasterbar/Manifest | 2 -
.../files/fix-boost-1.70.patch | 295 ---------------------
.../libtorrent-rasterbar-1.2.0-r1.ebuild | 113 --------
.../libtorrent-rasterbar-1.2.1-r1.ebuild | 112 --------
4 files changed, 522 deletions(-)
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index d97b33ad66f..4fd372278fa 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,5 +1,3 @@
DIST libtorrent-rasterbar-1.1.13.tar.gz 3896007 BLAKE2B b94f843437be348b10082f19d0b416f909daf15078b1461ab6724ee086d3194f6c378c305174676a3399fc3e6cb23133faaa334ac5dfc9457fb597c65dad7d36 SHA512 021fc54353fdf5063d55ccdc2057dada292bb0008fb92e93e8d94dd89f529630f290fcdc4f4d095e3192522c57fe0f0da260b5ef8e8e15a8c6ac05728f5f7160
-DIST libtorrent-rasterbar-1.2.0.tar.gz 3546062 BLAKE2B a02ef8f273d8e6ec3b6f6a42d518f7cbba669f109f907e243bb90cd674009894b9edce2f355b52d77275f3fcd9537e9c26280f7b78dfbb1792f52d6c7f50f7da SHA512 2dae77f32cf3da388edece7e64b8d9cf359cca735a101d96bb18fb06573fd1d84c303e5bebd370f637d7c73010ea2d99e38748b2259ce02ae8f0dbc0c4f01518
-DIST libtorrent-rasterbar-1.2.1.tar.gz 3562762 BLAKE2B 1978356ba00c07c4b89657ebe190b2aa4a938d22e5ab63844fb664312d60f761a07c42b9353f2f500fdf9a08afcb294a39bfb447d255d93b1a45ecc2be629ffe SHA512 a60e38c4c951756786ede69af1a5d56bf6293bcb7d235f0b7feda72f731bc163ea6a7401c4b5f5400b8ce236decff0ae3a1d5fe39c7f8f775e65031677f02074
DIST libtorrent-rasterbar-1.2.2.tar.gz 3584187 BLAKE2B 93c77544d4641122f0bd2b5c5f0577629fb7bdfc9e81bd54f7a849f5a477255adc699676516865c93610d24a830a26a0de45f10e50ce64ad6f0214c116f7754c SHA512 34dcf5421dfccbba78bdd30890b9c18b92fdee1a2e1693ada9b55b79a167730093862017581b9251a654b5517011dbe4c46b520b03b78aa86a909457f7edcf2c
DIST libtorrent-rasterbar-1.2.3.tar.gz 3591081 BLAKE2B 9766a21c948997b35c6d209940a2d2cfd76b130f1a9d1f611e07d3eeb27f634a3c5eca12c92261139200084b9678913d85f6a56f98ab6894e5def761615c39ad SHA512 11a81c9f4b968ed360740553f8d856a2fad4eb2f6962f6403394e0a4a6b198ef6f04ce92d11fc6bed9aa979c84efd03fb396027dfe6603f394104b4302e04d82
diff --git a/net-libs/libtorrent-rasterbar/files/fix-boost-1.70.patch b/net-libs/libtorrent-rasterbar/files/fix-boost-1.70.patch
deleted file mode 100644
index 25adcdedcea..00000000000
--- a/net-libs/libtorrent-rasterbar/files/fix-boost-1.70.patch
+++ /dev/null
@@ -1,295 +0,0 @@
-From 76c2794923c4c101ff715be11d794f7fefc6c524 Mon Sep 17 00:00:00 2001
-From: Arvid Norberg <arvid.norberg@gmail.com>
-Date: Fri, 19 Apr 2019 20:56:19 +0200
-Subject: [PATCH] fix build with boost-1.70 (#3788)
-
-fix build with boost 1.70.0 Fix #3683
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- include/libtorrent/io_service.hpp | 3 +++
- include/libtorrent/io_service_fwd.hpp | 13 +++++++++++--
- include/libtorrent/proxy_base.hpp | 2 +-
- include/libtorrent/tracker_manager.hpp | 2 +-
- include/libtorrent/udp_socket.hpp | 2 +-
- src/disk_io_thread_pool.cpp | 2 +-
- src/http_connection.cpp | 18 +++++++++---------
- src/kademlia/dht_tracker.cpp | 2 +-
- src/lsd.cpp | 4 ++--
- src/natpmp.cpp | 6 +++---
- src/udp_socket.cpp | 2 +-
- src/upnp.cpp | 2 +-
- test/test_fast_extension.cpp | 2 +-
- 13 files changed, 36 insertions(+), 24 deletions(-)
-
-diff --git a/include/libtorrent/io_service.hpp b/include/libtorrent/io_service.hpp
-index 123274019b..5f6be1a2ca 100644
---- a/include/libtorrent/io_service.hpp
-+++ b/include/libtorrent/io_service.hpp
-@@ -38,9 +38,12 @@ POSSIBILITY OF SUCH DAMAGE.
- #else
- #include "libtorrent/aux_/disable_warnings_push.hpp"
- #include <boost/asio/io_service.hpp>
-+#include <boost/version.hpp>
- #include "libtorrent/aux_/disable_warnings_pop.hpp"
- #endif // SIMULATOR
-
-+#include "libtorrent/io_service_fwd.hpp"
-+
- namespace libtorrent {
-
- #if defined TORRENT_BUILD_SIMULATOR
-diff --git a/include/libtorrent/io_service_fwd.hpp b/include/libtorrent/io_service_fwd.hpp
-index 1b22c3e58f..71b845d3f3 100644
---- a/include/libtorrent/io_service_fwd.hpp
-+++ b/include/libtorrent/io_service_fwd.hpp
-@@ -55,10 +55,19 @@ namespace boost { namespace asio {
- namespace libtorrent {
-
- #if defined TORRENT_BUILD_SIMULATOR
-- typedef sim::asio::io_service io_service;
-+ using io_service = sim::asio::io_service;
- #else
-- typedef boost::asio::io_service io_service;
-+ using io_service = boost::asio::io_service;
- #endif
-+
-+#if BOOST_VERSION >= 107000
-+template <typename T>
-+io_service& get_io_service(T& o) { return static_cast<io_service&>(o.get_executor().context()); }
-+#else
-+template <typename T>
-+io_service& get_io_service(T& o) { return o.get_io_service(); }
-+#endif
-+
- }
-
- #endif
-diff --git a/include/libtorrent/proxy_base.hpp b/include/libtorrent/proxy_base.hpp
-index 344c230977..d7666545c6 100644
---- a/include/libtorrent/proxy_base.hpp
-+++ b/include/libtorrent/proxy_base.hpp
-@@ -246,7 +246,7 @@ class proxy_base
-
- io_service& get_io_service()
- {
-- return m_sock.get_io_service();
-+ return lt::get_io_service(m_sock);
- }
-
- lowest_layer_type& lowest_layer()
-diff --git a/include/libtorrent/tracker_manager.hpp b/include/libtorrent/tracker_manager.hpp
-index 86331adbca..1fc28e89ff 100644
---- a/include/libtorrent/tracker_manager.hpp
-+++ b/include/libtorrent/tracker_manager.hpp
-@@ -259,7 +259,7 @@ namespace libtorrent {
- virtual void on_timeout(error_code const& ec) = 0;
- virtual ~timeout_handler();
-
-- io_service& get_io_service() { return m_timeout.get_io_service(); }
-+ io_service& get_io_service() { return lt::get_io_service(m_timeout); }
-
- private:
-
-diff --git a/include/libtorrent/udp_socket.hpp b/include/libtorrent/udp_socket.hpp
-index f4dcbeb248..c5c9aeba66 100644
---- a/include/libtorrent/udp_socket.hpp
-+++ b/include/libtorrent/udp_socket.hpp
-@@ -61,7 +61,7 @@ namespace libtorrent {
- static constexpr udp_send_flags_t dont_fragment = 3_bit;
-
- bool is_open() const { return m_abort == false; }
-- io_service& get_io_service() { return m_socket.get_io_service(); }
-+ io_service& get_io_service() { return lt::get_io_service(m_socket); }
-
- template <typename Handler>
- void async_read(Handler&& h)
-diff --git a/src/disk_io_thread_pool.cpp b/src/disk_io_thread_pool.cpp
-index 4d4b5ee678..123159a45d 100644
---- a/src/disk_io_thread_pool.cpp
-+++ b/src/disk_io_thread_pool.cpp
-@@ -173,7 +173,7 @@ namespace libtorrent {
- // buffer pool won't exist anymore, and crash. This prevents that.
- m_threads.emplace_back(&pool_thread_interface::thread_fun
- , &m_thread_iface, std::ref(*this)
-- , io_service::work(m_idle_timer.get_io_service()));
-+ , io_service::work(get_io_service(m_idle_timer)));
- }
- }
-
-diff --git a/src/http_connection.cpp b/src/http_connection.cpp
-index e01e9ea1d5..81e5368a55 100644
---- a/src/http_connection.cpp
-+++ b/src/http_connection.cpp
-@@ -148,7 +148,7 @@ void http_connection::get(std::string const& url, time_duration timeout, int pri
-
- if (ec)
- {
-- m_timer.get_io_service().post(std::bind(&http_connection::callback
-+ lt::get_io_service(m_timer).post(std::bind(&http_connection::callback
- , me, ec, span<char>{}));
- return;
- }
-@@ -160,7 +160,7 @@ void http_connection::get(std::string const& url, time_duration timeout, int pri
- )
- {
- error_code err(errors::unsupported_url_protocol);
-- m_timer.get_io_service().post(std::bind(&http_connection::callback
-+ lt::get_io_service(m_timer).post(std::bind(&http_connection::callback
- , me, err, span<char>{}));
- return;
- }
-@@ -258,7 +258,7 @@ void http_connection::start(std::string const& hostname, int port
-
- if (ec)
- {
-- m_timer.get_io_service().post(std::bind(&http_connection::callback
-+ lt::get_io_service(m_timer).post(std::bind(&http_connection::callback
- , me, ec, span<char>{}));
- return;
- }
-@@ -297,7 +297,7 @@ void http_connection::start(std::string const& hostname, int port
- #if TORRENT_USE_I2P
- if (i2p_conn->proxy().type != settings_pack::i2p_proxy)
- {
-- m_timer.get_io_service().post(std::bind(&http_connection::callback
-+ lt::get_io_service(m_timer).post(std::bind(&http_connection::callback
- , me, error_code(errors::no_i2p_router), span<char>{}));
- return;
- }
-@@ -332,8 +332,8 @@ void http_connection::start(std::string const& hostname, int port
- m_ssl_ctx->set_verify_mode(ssl::context::verify_none, ec);
- if (ec)
- {
-- m_timer.get_io_service().post(std::bind(&http_connection::callback
-- , me, ec, span<char>{}));
-+ lt::get_io_service(m_timer).post(std::bind(&http_connection::callback
-+ , me, ec, span<char>{}));
- return;
- }
- }
-@@ -344,7 +344,7 @@ void http_connection::start(std::string const& hostname, int port
- // assume this is not a tracker connection. Tracker connections that
- // shouldn't be subject to the proxy should pass in nullptr as the proxy
- // pointer.
-- instantiate_connection(m_timer.get_io_service()
-+ instantiate_connection(lt::get_io_service(m_timer)
- , proxy ? *proxy : null_proxy, m_sock, userdata, nullptr, false, false);
-
- if (m_bind_addr)
-@@ -353,7 +353,7 @@ void http_connection::start(std::string const& hostname, int port
- m_sock.bind(tcp::endpoint(*m_bind_addr, 0), ec);
- if (ec)
- {
-- m_timer.get_io_service().post(std::bind(&http_connection::callback
-+ lt::get_io_service(m_timer).post(std::bind(&http_connection::callback
- , me, ec, span<char>{}));
- return;
- }
-@@ -362,7 +362,7 @@ void http_connection::start(std::string const& hostname, int port
- setup_ssl_hostname(m_sock, hostname, ec);
- if (ec)
- {
-- m_timer.get_io_service().post(std::bind(&http_connection::callback
-+ lt::get_io_service(m_timer).post(std::bind(&http_connection::callback
- , me, ec, span<char>{}));
- return;
- }
-diff --git a/src/kademlia/dht_tracker.cpp b/src/kademlia/dht_tracker.cpp
-index a840bcf991..f2b2b9e2a1 100644
---- a/src/kademlia/dht_tracker.cpp
-+++ b/src/kademlia/dht_tracker.cpp
-@@ -130,7 +130,7 @@ namespace libtorrent { namespace dht {
- // must use piecewise construction because tracker_node::connection_timer
- // is neither copyable nor movable
- auto n = m_nodes.emplace(std::piecewise_construct_t(), std::forward_as_tuple(s)
-- , std::forward_as_tuple(m_key_refresh_timer.get_io_service()
-+ , std::forward_as_tuple(get_io_service(m_key_refresh_timer)
- , s, this, m_settings, nid, m_log, m_counters
- , std::bind(&dht_tracker::get_node, this, _1, _2)
- , m_storage));
-diff --git a/src/lsd.cpp b/src/lsd.cpp
-index 99e21ead44..562f374c62 100644
---- a/src/lsd.cpp
-+++ b/src/lsd.cpp
-@@ -100,11 +100,11 @@ void lsd::debug_log(char const* fmt, ...) const
- void lsd::start(error_code& ec)
- {
- m_socket.open(std::bind(&lsd::on_announce, self(), _1, _2)
-- , m_broadcast_timer.get_io_service(), ec);
-+ , lt::get_io_service(m_broadcast_timer), ec);
- if (ec) return;
-
- m_socket6.open(std::bind(&lsd::on_announce, self(), _1, _2)
-- , m_broadcast_timer.get_io_service(), ec);
-+ , lt::get_io_service(m_broadcast_timer), ec);
- }
-
- lsd::~lsd() = default;
-diff --git a/src/natpmp.cpp b/src/natpmp.cpp
-index 1226bcebac..5876683ea9 100644
---- a/src/natpmp.cpp
-+++ b/src/natpmp.cpp
-@@ -160,13 +160,13 @@ void natpmp::start(address local_address, std::string device)
- // try to find one even if the listen socket isn't bound to a device
- if (device.empty())
- {
-- device = device_for_address(local_address, m_socket.get_io_service(), ec);
-+ device = device_for_address(local_address, get_io_service(m_socket), ec);
- // if this fails fall back to using the first default gateway in the
- // routing table
- ec.clear();
- }
-
-- auto const route = get_default_route(m_socket.get_io_service()
-+ auto const route = get_default_route(get_io_service(m_socket)
- , device, local_address.is_v6(), ec);
-
- if (!route)
-@@ -194,7 +194,7 @@ void natpmp::start(address local_address, std::string device)
- if (local_address.is_unspecified())
- {
- std::vector<ip_interface> const net = enum_net_interfaces(
-- m_socket.get_io_service(), ec);
-+ get_io_service(m_socket), ec);
-
- auto const it = std::find_if(net.begin(), net.end(), [&](ip_interface const& i)
- {
-diff --git a/src/udp_socket.cpp b/src/udp_socket.cpp
-index 9ca38e5486..2459e4f1ca 100644
---- a/src/udp_socket.cpp
-+++ b/src/udp_socket.cpp
-@@ -492,7 +492,7 @@ void udp_socket::set_proxy_settings(aux::proxy_settings const& ps)
- {
- // connect to socks5 server and open up the UDP tunnel
-
-- m_socks5_connection = std::make_shared<socks5>(m_socket.get_io_service());
-+ m_socks5_connection = std::make_shared<socks5>(lt::get_io_service(m_socket));
- m_socks5_connection->start(ps);
- }
- }
-diff --git a/src/upnp.cpp b/src/upnp.cpp
-index a300571e47..b1e8a5bb19 100644
---- a/src/upnp.cpp
-+++ b/src/upnp.cpp
-@@ -121,7 +121,7 @@ void upnp::start()
-
- error_code ec;
- m_socket.open(std::bind(&upnp::on_reply, self(), _1, _2)
-- , m_refresh_timer.get_io_service(), ec);
-+ , lt::get_io_service(m_refresh_timer), ec);
-
- m_mappings.reserve(10);
- }
-diff --git a/test/test_fast_extension.cpp b/test/test_fast_extension.cpp
-index 91256fa0c9..cddc508825 100644
---- a/test/test_fast_extension.cpp
-+++ b/test/test_fast_extension.cpp
-@@ -462,7 +462,7 @@ std::shared_ptr<torrent_info> setup_peer(tcp::socket& s, sha1_hash& ih
- }
- else
- {
-- tcp::acceptor l(s.get_io_service());
-+ tcp::acceptor l(lt::get_io_service(s));
- l.open(tcp::v4());
- l.bind(tcp::endpoint(address_v4::from_string("127.0.0.1"), 0));
- l.listen();
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0-r1.ebuild
deleted file mode 100644
index 118eb5fdcc8..00000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="threads"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools distutils-r1
-
-MY_PV=$(ver_rs 1-2 '_')
-MY_P=${PN/-rasterbar}_${MY_PV}
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="https://libtorrent.org"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug +dht doc examples libressl python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/boost:=[threads]
- virtual/libiconv
- examples? ( !net-p2p/mldonkey )
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
-"
-DEPEND="${RDEPEND}
- sys-devel/libtool
-"
-
-S="${WORKDIR}/${PN/-rasterbar}-${MY_P}"
-
-PATCHES=( "${FILESDIR}"/fix-boost-1.70.patch )
-
-src_prepare() {
- mkdir "${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 dht dht $(usex debug logging $(usex ('yes' 'no'))))
- $(use_enable examples)
- $(use_enable ssl encryption)
- $(use_enable static-libs static)
- $(use_enable test tests)
- --with-libiconv
- )
- 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-1.2.1-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1-r1.ebuild
deleted file mode 100644
index d77cbc4c8b3..00000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="threads"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit autotools distutils-r1
-
-MY_PV=$(ver_rs 1-2 '_')
-MY_P=${PN/-rasterbar}-${MY_PV}
-
-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/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug +dht doc examples libressl python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/boost:=[threads]
- virtual/libiconv
- examples? ( !net-p2p/mldonkey )
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
-"
-DEPEND="${RDEPEND}
- sys-devel/libtool
-"
-
-S="${WORKDIR}/${PN/-rasterbar}-${MY_P}"
-
-src_prepare() {
- mkdir "${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-libiconv
- )
- 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
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtorrent-rasterbar/files/, net-libs/libtorrent-rasterbar/
@ 2019-05-02 19:16 Mikle Kolyada
0 siblings, 0 replies; 8+ messages in thread
From: Mikle Kolyada @ 2019-05-02 19:16 UTC (permalink / raw
To: gentoo-commits
commit: 8fd1300cdd710f78fa75b9245dd020eeea18643b
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu May 2 19:15:59 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu May 2 19:15:59 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fd1300c
net-libs/libtorrent-rasterbar: fix boost-1.70 compat
Closes: https://bugs.gentoo.org/683764
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
.../files/fix-boost-1.70.patch | 295 +++++++++++++++++++++
.../libtorrent-rasterbar-1.2.0.ebuild | 2 +
2 files changed, 297 insertions(+)
diff --git a/net-libs/libtorrent-rasterbar/files/fix-boost-1.70.patch b/net-libs/libtorrent-rasterbar/files/fix-boost-1.70.patch
new file mode 100644
index 00000000000..25adcdedcea
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/files/fix-boost-1.70.patch
@@ -0,0 +1,295 @@
+From 76c2794923c4c101ff715be11d794f7fefc6c524 Mon Sep 17 00:00:00 2001
+From: Arvid Norberg <arvid.norberg@gmail.com>
+Date: Fri, 19 Apr 2019 20:56:19 +0200
+Subject: [PATCH] fix build with boost-1.70 (#3788)
+
+fix build with boost 1.70.0 Fix #3683
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ include/libtorrent/io_service.hpp | 3 +++
+ include/libtorrent/io_service_fwd.hpp | 13 +++++++++++--
+ include/libtorrent/proxy_base.hpp | 2 +-
+ include/libtorrent/tracker_manager.hpp | 2 +-
+ include/libtorrent/udp_socket.hpp | 2 +-
+ src/disk_io_thread_pool.cpp | 2 +-
+ src/http_connection.cpp | 18 +++++++++---------
+ src/kademlia/dht_tracker.cpp | 2 +-
+ src/lsd.cpp | 4 ++--
+ src/natpmp.cpp | 6 +++---
+ src/udp_socket.cpp | 2 +-
+ src/upnp.cpp | 2 +-
+ test/test_fast_extension.cpp | 2 +-
+ 13 files changed, 36 insertions(+), 24 deletions(-)
+
+diff --git a/include/libtorrent/io_service.hpp b/include/libtorrent/io_service.hpp
+index 123274019b..5f6be1a2ca 100644
+--- a/include/libtorrent/io_service.hpp
++++ b/include/libtorrent/io_service.hpp
+@@ -38,9 +38,12 @@ POSSIBILITY OF SUCH DAMAGE.
+ #else
+ #include "libtorrent/aux_/disable_warnings_push.hpp"
+ #include <boost/asio/io_service.hpp>
++#include <boost/version.hpp>
+ #include "libtorrent/aux_/disable_warnings_pop.hpp"
+ #endif // SIMULATOR
+
++#include "libtorrent/io_service_fwd.hpp"
++
+ namespace libtorrent {
+
+ #if defined TORRENT_BUILD_SIMULATOR
+diff --git a/include/libtorrent/io_service_fwd.hpp b/include/libtorrent/io_service_fwd.hpp
+index 1b22c3e58f..71b845d3f3 100644
+--- a/include/libtorrent/io_service_fwd.hpp
++++ b/include/libtorrent/io_service_fwd.hpp
+@@ -55,10 +55,19 @@ namespace boost { namespace asio {
+ namespace libtorrent {
+
+ #if defined TORRENT_BUILD_SIMULATOR
+- typedef sim::asio::io_service io_service;
++ using io_service = sim::asio::io_service;
+ #else
+- typedef boost::asio::io_service io_service;
++ using io_service = boost::asio::io_service;
+ #endif
++
++#if BOOST_VERSION >= 107000
++template <typename T>
++io_service& get_io_service(T& o) { return static_cast<io_service&>(o.get_executor().context()); }
++#else
++template <typename T>
++io_service& get_io_service(T& o) { return o.get_io_service(); }
++#endif
++
+ }
+
+ #endif
+diff --git a/include/libtorrent/proxy_base.hpp b/include/libtorrent/proxy_base.hpp
+index 344c230977..d7666545c6 100644
+--- a/include/libtorrent/proxy_base.hpp
++++ b/include/libtorrent/proxy_base.hpp
+@@ -246,7 +246,7 @@ class proxy_base
+
+ io_service& get_io_service()
+ {
+- return m_sock.get_io_service();
++ return lt::get_io_service(m_sock);
+ }
+
+ lowest_layer_type& lowest_layer()
+diff --git a/include/libtorrent/tracker_manager.hpp b/include/libtorrent/tracker_manager.hpp
+index 86331adbca..1fc28e89ff 100644
+--- a/include/libtorrent/tracker_manager.hpp
++++ b/include/libtorrent/tracker_manager.hpp
+@@ -259,7 +259,7 @@ namespace libtorrent {
+ virtual void on_timeout(error_code const& ec) = 0;
+ virtual ~timeout_handler();
+
+- io_service& get_io_service() { return m_timeout.get_io_service(); }
++ io_service& get_io_service() { return lt::get_io_service(m_timeout); }
+
+ private:
+
+diff --git a/include/libtorrent/udp_socket.hpp b/include/libtorrent/udp_socket.hpp
+index f4dcbeb248..c5c9aeba66 100644
+--- a/include/libtorrent/udp_socket.hpp
++++ b/include/libtorrent/udp_socket.hpp
+@@ -61,7 +61,7 @@ namespace libtorrent {
+ static constexpr udp_send_flags_t dont_fragment = 3_bit;
+
+ bool is_open() const { return m_abort == false; }
+- io_service& get_io_service() { return m_socket.get_io_service(); }
++ io_service& get_io_service() { return lt::get_io_service(m_socket); }
+
+ template <typename Handler>
+ void async_read(Handler&& h)
+diff --git a/src/disk_io_thread_pool.cpp b/src/disk_io_thread_pool.cpp
+index 4d4b5ee678..123159a45d 100644
+--- a/src/disk_io_thread_pool.cpp
++++ b/src/disk_io_thread_pool.cpp
+@@ -173,7 +173,7 @@ namespace libtorrent {
+ // buffer pool won't exist anymore, and crash. This prevents that.
+ m_threads.emplace_back(&pool_thread_interface::thread_fun
+ , &m_thread_iface, std::ref(*this)
+- , io_service::work(m_idle_timer.get_io_service()));
++ , io_service::work(get_io_service(m_idle_timer)));
+ }
+ }
+
+diff --git a/src/http_connection.cpp b/src/http_connection.cpp
+index e01e9ea1d5..81e5368a55 100644
+--- a/src/http_connection.cpp
++++ b/src/http_connection.cpp
+@@ -148,7 +148,7 @@ void http_connection::get(std::string const& url, time_duration timeout, int pri
+
+ if (ec)
+ {
+- m_timer.get_io_service().post(std::bind(&http_connection::callback
++ lt::get_io_service(m_timer).post(std::bind(&http_connection::callback
+ , me, ec, span<char>{}));
+ return;
+ }
+@@ -160,7 +160,7 @@ void http_connection::get(std::string const& url, time_duration timeout, int pri
+ )
+ {
+ error_code err(errors::unsupported_url_protocol);
+- m_timer.get_io_service().post(std::bind(&http_connection::callback
++ lt::get_io_service(m_timer).post(std::bind(&http_connection::callback
+ , me, err, span<char>{}));
+ return;
+ }
+@@ -258,7 +258,7 @@ void http_connection::start(std::string const& hostname, int port
+
+ if (ec)
+ {
+- m_timer.get_io_service().post(std::bind(&http_connection::callback
++ lt::get_io_service(m_timer).post(std::bind(&http_connection::callback
+ , me, ec, span<char>{}));
+ return;
+ }
+@@ -297,7 +297,7 @@ void http_connection::start(std::string const& hostname, int port
+ #if TORRENT_USE_I2P
+ if (i2p_conn->proxy().type != settings_pack::i2p_proxy)
+ {
+- m_timer.get_io_service().post(std::bind(&http_connection::callback
++ lt::get_io_service(m_timer).post(std::bind(&http_connection::callback
+ , me, error_code(errors::no_i2p_router), span<char>{}));
+ return;
+ }
+@@ -332,8 +332,8 @@ void http_connection::start(std::string const& hostname, int port
+ m_ssl_ctx->set_verify_mode(ssl::context::verify_none, ec);
+ if (ec)
+ {
+- m_timer.get_io_service().post(std::bind(&http_connection::callback
+- , me, ec, span<char>{}));
++ lt::get_io_service(m_timer).post(std::bind(&http_connection::callback
++ , me, ec, span<char>{}));
+ return;
+ }
+ }
+@@ -344,7 +344,7 @@ void http_connection::start(std::string const& hostname, int port
+ // assume this is not a tracker connection. Tracker connections that
+ // shouldn't be subject to the proxy should pass in nullptr as the proxy
+ // pointer.
+- instantiate_connection(m_timer.get_io_service()
++ instantiate_connection(lt::get_io_service(m_timer)
+ , proxy ? *proxy : null_proxy, m_sock, userdata, nullptr, false, false);
+
+ if (m_bind_addr)
+@@ -353,7 +353,7 @@ void http_connection::start(std::string const& hostname, int port
+ m_sock.bind(tcp::endpoint(*m_bind_addr, 0), ec);
+ if (ec)
+ {
+- m_timer.get_io_service().post(std::bind(&http_connection::callback
++ lt::get_io_service(m_timer).post(std::bind(&http_connection::callback
+ , me, ec, span<char>{}));
+ return;
+ }
+@@ -362,7 +362,7 @@ void http_connection::start(std::string const& hostname, int port
+ setup_ssl_hostname(m_sock, hostname, ec);
+ if (ec)
+ {
+- m_timer.get_io_service().post(std::bind(&http_connection::callback
++ lt::get_io_service(m_timer).post(std::bind(&http_connection::callback
+ , me, ec, span<char>{}));
+ return;
+ }
+diff --git a/src/kademlia/dht_tracker.cpp b/src/kademlia/dht_tracker.cpp
+index a840bcf991..f2b2b9e2a1 100644
+--- a/src/kademlia/dht_tracker.cpp
++++ b/src/kademlia/dht_tracker.cpp
+@@ -130,7 +130,7 @@ namespace libtorrent { namespace dht {
+ // must use piecewise construction because tracker_node::connection_timer
+ // is neither copyable nor movable
+ auto n = m_nodes.emplace(std::piecewise_construct_t(), std::forward_as_tuple(s)
+- , std::forward_as_tuple(m_key_refresh_timer.get_io_service()
++ , std::forward_as_tuple(get_io_service(m_key_refresh_timer)
+ , s, this, m_settings, nid, m_log, m_counters
+ , std::bind(&dht_tracker::get_node, this, _1, _2)
+ , m_storage));
+diff --git a/src/lsd.cpp b/src/lsd.cpp
+index 99e21ead44..562f374c62 100644
+--- a/src/lsd.cpp
++++ b/src/lsd.cpp
+@@ -100,11 +100,11 @@ void lsd::debug_log(char const* fmt, ...) const
+ void lsd::start(error_code& ec)
+ {
+ m_socket.open(std::bind(&lsd::on_announce, self(), _1, _2)
+- , m_broadcast_timer.get_io_service(), ec);
++ , lt::get_io_service(m_broadcast_timer), ec);
+ if (ec) return;
+
+ m_socket6.open(std::bind(&lsd::on_announce, self(), _1, _2)
+- , m_broadcast_timer.get_io_service(), ec);
++ , lt::get_io_service(m_broadcast_timer), ec);
+ }
+
+ lsd::~lsd() = default;
+diff --git a/src/natpmp.cpp b/src/natpmp.cpp
+index 1226bcebac..5876683ea9 100644
+--- a/src/natpmp.cpp
++++ b/src/natpmp.cpp
+@@ -160,13 +160,13 @@ void natpmp::start(address local_address, std::string device)
+ // try to find one even if the listen socket isn't bound to a device
+ if (device.empty())
+ {
+- device = device_for_address(local_address, m_socket.get_io_service(), ec);
++ device = device_for_address(local_address, get_io_service(m_socket), ec);
+ // if this fails fall back to using the first default gateway in the
+ // routing table
+ ec.clear();
+ }
+
+- auto const route = get_default_route(m_socket.get_io_service()
++ auto const route = get_default_route(get_io_service(m_socket)
+ , device, local_address.is_v6(), ec);
+
+ if (!route)
+@@ -194,7 +194,7 @@ void natpmp::start(address local_address, std::string device)
+ if (local_address.is_unspecified())
+ {
+ std::vector<ip_interface> const net = enum_net_interfaces(
+- m_socket.get_io_service(), ec);
++ get_io_service(m_socket), ec);
+
+ auto const it = std::find_if(net.begin(), net.end(), [&](ip_interface const& i)
+ {
+diff --git a/src/udp_socket.cpp b/src/udp_socket.cpp
+index 9ca38e5486..2459e4f1ca 100644
+--- a/src/udp_socket.cpp
++++ b/src/udp_socket.cpp
+@@ -492,7 +492,7 @@ void udp_socket::set_proxy_settings(aux::proxy_settings const& ps)
+ {
+ // connect to socks5 server and open up the UDP tunnel
+
+- m_socks5_connection = std::make_shared<socks5>(m_socket.get_io_service());
++ m_socks5_connection = std::make_shared<socks5>(lt::get_io_service(m_socket));
+ m_socks5_connection->start(ps);
+ }
+ }
+diff --git a/src/upnp.cpp b/src/upnp.cpp
+index a300571e47..b1e8a5bb19 100644
+--- a/src/upnp.cpp
++++ b/src/upnp.cpp
+@@ -121,7 +121,7 @@ void upnp::start()
+
+ error_code ec;
+ m_socket.open(std::bind(&upnp::on_reply, self(), _1, _2)
+- , m_refresh_timer.get_io_service(), ec);
++ , lt::get_io_service(m_refresh_timer), ec);
+
+ m_mappings.reserve(10);
+ }
+diff --git a/test/test_fast_extension.cpp b/test/test_fast_extension.cpp
+index 91256fa0c9..cddc508825 100644
+--- a/test/test_fast_extension.cpp
++++ b/test/test_fast_extension.cpp
+@@ -462,7 +462,7 @@ std::shared_ptr<torrent_info> setup_peer(tcp::socket& s, sha1_hash& ih
+ }
+ else
+ {
+- tcp::acceptor l(s.get_io_service());
++ tcp::acceptor l(lt::get_io_service(s));
+ l.open(tcp::v4());
+ l.bind(tcp::endpoint(address_v4::from_string("127.0.0.1"), 0));
+ l.listen();
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0.ebuild
index ff391a34b94..a182fa18ab3 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.0.ebuild
@@ -43,6 +43,8 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${PN/-rasterbar}-${MY_P}"
+PATCHES=( "${FILESDIR}"/fix-boost-1.70.patch )
+
src_prepare() {
mkdir "${S}"/build-aux/ || die
touch "${S}"/build-aux/config.rpath || die
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-libs/libtorrent-rasterbar/files/, net-libs/libtorrent-rasterbar/
@ 2018-02-22 21:49 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2018-02-22 21:49 UTC (permalink / raw
To: gentoo-commits
commit: 57d52572cbe8d2586523a66b0f6bbc6254f7edc0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 21:47:44 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 21:48:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57d52572
net-libs/libtorrent-rasterbar: Cleanup vulnerable
Closes: https://bugs.gentoo.org/623152
net-libs/libtorrent-rasterbar/Manifest | 1 -
| 31 ----
...libtorrent-rasterbar-1.0.11-fix-abicompat.patch | 157 ---------------------
.../libtorrent-rasterbar-1.0.11-fix-test_ssl.patch | 21 ---
| 34 -----
...orrent-rasterbar-1.0.9-test_torrent_parse.patch | 41 ------
.../libtorrent-rasterbar-1.0.11-r1.ebuild | 117 ---------------
7 files changed, 402 deletions(-)
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 0bcb190e818..38db164ee52 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,2 +1 @@
-DIST libtorrent-rasterbar-1.0.11.tar.gz 3325786 BLAKE2B ef49c3242f520e222da2724385a41944fb752f09eab45fe60588df999d69832a82ed6b7b7494a0bf303cd6f05b28679f4d7776e6dd66e41cd22b1038f3391800 SHA512 770d16b241174ae4b121af9b2ac7bcde8b14c6ed99352b827b760a3cbdc2c0ebd0d505319762897720c5f72acdff506ee9948ac1140e6d4591805eca5439b184
DIST libtorrent-rasterbar-1.1.5.tar.gz 3942894 BLAKE2B 0a1102e1b74049c1f5d8980363a6b92a3378339349609d64d3b7a38a58baf6c2898a26f70e92b0de0d6a1f4b6725a576a850aacaa5764fe7d96fa0b541dfa2d7 SHA512 d0e7fe944c8a396aaf79ce80c7513be07a855bc8a9eee3bca46ed83d5e190aaa5ea4dc9a8a7208e27e18ae8f15733e6e34eabd375f0bde43d4dc4607840782e7
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-boost-config-header.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-boost-config-header.patch
deleted file mode 100644
index f3a81c381d8..00000000000
--- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-boost-config-header.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 7eb3cf6bc6dbada3fa7bb7ff4d5981182813a0e2
-Author: arvidn <arvid@cs.umu.se>
-Date: Tue Jul 11 23:16:50 2017 -0700
-
- use the official boost.config header
-
-diff --git a/include/libtorrent/export.hpp b/include/libtorrent/export.hpp
-index 87536af2a..503afe27a 100644
---- a/include/libtorrent/export.hpp
-+++ b/include/libtorrent/export.hpp
-@@ -33,19 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
- #ifndef TORRENT_EXPORT_HPP_INCLUDED
- #define TORRENT_EXPORT_HPP_INCLUDED
-
--#if !defined(BOOST_COMPILER_CONFIG) && !defined(BOOST_NO_COMPILER_CONFIG)
--# include <boost/config/select_compiler_config.hpp>
--#endif
--#ifdef BOOST_COMPILER_CONFIG
--# include BOOST_COMPILER_CONFIG
--#endif
--
--#if !defined(BOOST_PLATFORM_CONFIG) && !defined(BOOST_NO_PLATFORM_CONFIG)
--# include <boost/config/select_platform_config.hpp>
--#endif
--#ifdef BOOST_PLATFORM_CONFIG
--# include BOOST_PLATFORM_CONFIG
--#endif
-+#include <boost/config.hpp>
-
- // backwards compatibility with older versions of boost
- #if !defined BOOST_SYMBOL_EXPORT && !defined BOOST_SYMBOL_IMPORT
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-fix-abicompat.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-fix-abicompat.patch
deleted file mode 100644
index eebee122551..00000000000
--- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-fix-abicompat.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 76381835be19da2f8f1fc501445e31d32e6d83e4 Mon Sep 17 00:00:00 2001
-From: Arvid Norberg <arvid.norberg@gmail.com>
-Date: Sun, 12 Feb 2017 21:05:22 -0500
-Subject: [PATCH] fix ABI compatibility issue introduced with preformatted
- entry type (#1702)
-
-fix ABI compatibility issue introduced with preformatted entry type
----
- ChangeLog | 2 ++
- bindings/python/src/create_torrent.cpp | 2 +-
- include/libtorrent/create_torrent.hpp | 6 ++++++
- src/create_torrent.cpp | 31 ++++++++++++++++++++++++++++---
- src/torrent.cpp | 11 ++++++++---
- test/test_create_torrent.cpp | 2 +-
- 6 files changed, 46 insertions(+), 8 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index 9b501ce..9defe7c 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,5 @@
-+ * fix ABI compatibility issue introduced with preformatted entry type
-+
- 1.0.11 release
-
- * updating super seeding would include the torrent in state_update_alert
-diff --git a/bindings/python/src/create_torrent.cpp b/bindings/python/src/create_torrent.cpp
-index 55b6b51..31abb07 100644
---- a/bindings/python/src/create_torrent.cpp
-+++ b/bindings/python/src/create_torrent.cpp
-@@ -127,7 +127,7 @@ void bind_create_torrent()
-
- class_<create_torrent>("create_torrent", no_init)
- .def(init<file_storage&>())
-- .def(init<torrent_info const&>(arg("ti")))
-+ .def(init<torrent_info const&, int>((arg("ti"), arg("version") = LIBTORRENT_VERSION_NUM)))
- .def(init<file_storage&, int, int, int>((arg("storage"), arg("piece_size") = 0
- , arg("pad_file_limit") = -1, arg("flags") = int(libtorrent::create_torrent::optimize))))
-
-diff --git a/include/libtorrent/create_torrent.hpp b/include/libtorrent/create_torrent.hpp
-index 05dc6ca..d55e86a 100644
---- a/include/libtorrent/create_torrent.hpp
-+++ b/include/libtorrent/create_torrent.hpp
-@@ -42,6 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
- #include "libtorrent/utf8.hpp"
- #include "libtorrent/allocator.hpp"
- #include "libtorrent/file.hpp" // for combine_path etc.
-+#include "libtorrent/version.hpp"
-
- #include <vector>
- #include <string>
-@@ -171,9 +172,12 @@ namespace libtorrent
- // ``alignment`` is used when pad files are enabled. This is the size
- // eligible files are aligned to. The default is -1, which means the
- // piece size of the torrent.
-+ // The ``use_preformatted`` parameter can be set to true to preserve
-+ // invalid encoding of the .torrent file.
- create_torrent(file_storage& fs, int piece_size = 0
- , int pad_file_limit = -1, int flags = optimize, int alignment = -1);
- create_torrent(torrent_info const& ti);
-+ create_torrent(torrent_info const& ti, bool use_preformatted);
-
- // internal
- ~create_torrent();
-@@ -290,6 +294,8 @@ namespace libtorrent
-
- private:
-
-+ void load_from_torrent_info(torrent_info const& ti, bool const use_preformatted);
-+
- file_storage& m_files;
- // if m_info_dict is initialized, it is
- // used instead of m_files to generate
-diff --git a/src/create_torrent.cpp b/src/create_torrent.cpp
-index df4c759..aab5574 100644
---- a/src/create_torrent.cpp
-+++ b/src/create_torrent.cpp
-@@ -330,6 +330,24 @@ namespace libtorrent
- , m_include_symlinks(false)
- , m_calculate_file_hashes(false)
- {
-+ load_from_torrent_info(ti, false);
-+ }
-+
-+ create_torrent::create_torrent(torrent_info const& ti, bool const use_preformatted)
-+ : m_files(const_cast<file_storage&>(ti.files()))
-+ , m_creation_date(time(0))
-+ , m_multifile(ti.num_files() > 1)
-+ , m_private(ti.priv())
-+ , m_merkle_torrent(ti.is_merkle_torrent())
-+ , m_include_mtime(false)
-+ , m_include_symlinks(false)
-+ , m_calculate_file_hashes(false)
-+ {
-+ load_from_torrent_info(ti, use_preformatted);
-+ }
-+
-+ void create_torrent::load_from_torrent_info(torrent_info const& ti, bool const use_preformatted)
-+ {
- TORRENT_ASSERT(ti.is_valid());
- if (!ti.is_valid()) return;
-
-@@ -361,9 +379,16 @@ namespace libtorrent
- m_piece_hash.resize(m_files.num_pieces());
- for (int i = 0; i < num_pieces(); ++i) set_hash(i, ti.hash_for_piece(i));
-
-- boost::shared_array<char> const info = ti.metadata();
-- int const size = ti.metadata_size();
-- m_info_dict.preformatted().assign(&info[0], &info[0] + size);
-+ if (use_preformatted)
-+ {
-+ boost::shared_array<char> const info = ti.metadata();
-+ int const size = ti.metadata_size();
-+ m_info_dict.preformatted().assign(&info[0], &info[0] + size);
-+ }
-+ else
-+ {
-+ m_info_dict = bdecode(&ti.metadata()[0], &ti.metadata()[0] + ti.metadata_size());
-+ }
- m_info_hash = ti.info_hash();
- }
-
-diff --git a/src/torrent.cpp b/src/torrent.cpp
-index 75f0cc7..ef05dfd 100644
---- a/src/torrent.cpp
-+++ b/src/torrent.cpp
-@@ -5601,9 +5601,14 @@ namespace libtorrent
- {
- if (m_magnet_link || (m_save_resume_flags & torrent_handle::save_info_dict))
- {
-- boost::shared_array<char> const info = torrent_file().metadata();
-- int const size = torrent_file().metadata_size();
-- ret["info"].preformatted().assign(&info[0], &info[0] + size);
-+ ret["info"] = bdecode(&torrent_file().metadata()[0]
-+ , &torrent_file().metadata()[0] + torrent_file().metadata_size());
-+// TODO: re-enable this code once there's a non-inlined encoder function. Or
-+// perhaps this should not be used until saving resume_data via
-+// add_torrent_params and a free function, similar to read_resume_data
-+// boost::shared_array<char> const info = torrent_file().metadata();
-+// int const size = torrent_file().metadata_size();
-+// ret["info"].preformatted().assign(&info[0], &info[0] + size);
- }
- }
-
-diff --git a/test/test_create_torrent.cpp b/test/test_create_torrent.cpp
-index 0a87c08..33fd3e8 100644
---- a/test/test_create_torrent.cpp
-+++ b/test/test_create_torrent.cpp
-@@ -51,7 +51,7 @@ int test_main()
-
- lt::torrent_info info(test_torrent, sizeof(test_torrent) - 1);
-
-- lt::create_torrent t(info);
-+ lt::create_torrent t(info, true);
-
- std::vector<char> buffer;
- lt::bencode(std::back_inserter(buffer), t.generate());
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-fix-test_ssl.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-fix-test_ssl.patch
deleted file mode 100644
index 2add42c7dd2..00000000000
--- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-fix-test_ssl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 7f060e4a70b21974bcf154cf1a93c7b68c5a9aa8 Mon Sep 17 00:00:00 2001
-From: Alden Torres <aldenml@gmail.com>
-Date: Sat, 8 Oct 2016 01:12:15 -0400
-Subject: [PATCH] fix openssl compilation with boost 1.62 (#1193)
-
----
- test/test_ssl.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/test/test_ssl.cpp b/test/test_ssl.cpp
-index 659973c..5aa6b15 100644
---- a/test/test_ssl.cpp
-+++ b/test/test_ssl.cpp
-@@ -47,7 +47,6 @@ POSSIBILITY OF SUCH DAMAGE.
- #include <boost/asio/connect.hpp>
-
- #ifdef TORRENT_USE_OPENSSL
--#include <boost/asio/ssl/error.hpp> // for asio::error::get_ssl_category()
- #include <boost/asio/ssl.hpp>
-
- using namespace libtorrent;
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-move-header.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-move-header.patch
deleted file mode 100644
index 589998b7fb3..00000000000
--- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.11-move-header.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From ecd20f15cb3fa5a0ebabd647b1f57f3cd62cb4b7 Mon Sep 17 00:00:00 2001
-From: sledgehammer_999 <hammered999@gmail.com>
-Date: Mon, 20 Feb 2017 01:22:27 +0200
-Subject: [PATCH] Move include into implementation instead(from #1702).
-
----
- bindings/python/src/create_torrent.cpp | 1 +
- include/libtorrent/create_torrent.hpp | 1 -
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bindings/python/src/create_torrent.cpp b/bindings/python/src/create_torrent.cpp
-index 31abb07..e856d85 100644
---- a/bindings/python/src/create_torrent.cpp
-+++ b/bindings/python/src/create_torrent.cpp
-@@ -6,6 +6,7 @@
- #include <libtorrent/create_torrent.hpp>
- #include <libtorrent/file_storage.hpp>
- #include "libtorrent/intrusive_ptr_base.hpp"
-+#include <libtorrent/version.hpp>
- #include "bytes.hpp"
-
- using namespace boost::python;
-diff --git a/include/libtorrent/create_torrent.hpp b/include/libtorrent/create_torrent.hpp
-index d55e86a..8d2c680 100644
---- a/include/libtorrent/create_torrent.hpp
-+++ b/include/libtorrent/create_torrent.hpp
-@@ -42,7 +42,6 @@ POSSIBILITY OF SUCH DAMAGE.
- #include "libtorrent/utf8.hpp"
- #include "libtorrent/allocator.hpp"
- #include "libtorrent/file.hpp" // for combine_path etc.
--#include "libtorrent/version.hpp"
-
- #include <vector>
- #include <string>
diff --git a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.9-test_torrent_parse.patch b/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.9-test_torrent_parse.patch
deleted file mode 100644
index 658c0aa5715..00000000000
--- a/net-libs/libtorrent-rasterbar/files/libtorrent-rasterbar-1.0.9-test_torrent_parse.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From bdd91e29225b44a1a13e670dc4cecfb58f241d28 Mon Sep 17 00:00:00 2001
-From: Davide Pesavento <pesa@gentoo.org>
-Date: Sun, 7 Aug 2016 12:14:57 +0200
-Subject: [PATCH] Disable failing torrent_parse tests
-
-For unknown reasons, some test torrents are missing from the tarball.
-Skip the corresponding test cases to avoid spurious failures.
----
- test/test_torrent_parse.cpp | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/test/test_torrent_parse.cpp b/test/test_torrent_parse.cpp
-index 663f341..2de6fb5 100644
---- a/test/test_torrent_parse.cpp
-+++ b/test/test_torrent_parse.cpp
-@@ -49,13 +49,10 @@ using namespace libtorrent;
- test_torrent_t test_torrents[] =
- {
- { "base.torrent" },
-- { "empty_path.torrent" },
- { "parent_path.torrent" },
- { "hidden_parent_path.torrent" },
- { "single_multi_file.torrent" },
- { "slash_path.torrent" },
-- { "slash_path2.torrent" },
-- { "slash_path3.torrent" },
- { "backslash_path.torrent" },
- { "url_list.torrent" },
- { "url_list2.torrent" },
-@@ -75,8 +72,6 @@ test_torrent_t test_torrents[] =
- { "root_hash.torrent" },
- { "empty_path_multi.torrent" },
- { "duplicate_web_seeds.torrent" },
-- { "invalid_name3.torrent" },
-- { "symlink1.torrent" },
- };
-
- struct test_failing_torrent_t
---
-2.9.2
-
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.11-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.11-r1.ebuild
deleted file mode 100644
index 77e5c5b9b40..00000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.11-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit distutils-r1 versionator
-
-MY_PV=$(replace_all_version_separators _)
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="http://libtorrent.org"
-SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/8"
-KEYWORDS="amd64 arm ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="debug +dht doc examples +geoip libressl python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
- dev-libs/boost:=[threads]
- virtual/libiconv
- geoip? ( dev-libs/geoip )
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
-"
-DEPEND="${COMMON_DEPEND}
- sys-devel/libtool
-"
-RDEPEND="${COMMON_DEPEND}
- examples? ( !net-p2p/mldonkey )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.9-test_torrent_parse.patch"
- # RC_1_0 branch
- "${FILESDIR}/${P}-fix-abicompat.patch"
- "${FILESDIR}/${P}-move-header.patch"
- # master branch
- "${FILESDIR}/${P}-fix-test_ssl.patch"
- "${FILESDIR}/${P}-boost-config-header.patch"
-)
-
-src_prepare() {
- 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/compile_flags.in || die
-
- use python && distutils-r1_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable debug)
- $(use_enable debug logging)
- $(use_enable debug statistics)
- $(use_enable debug disk-stats)
- $(use_enable dht dht $(usex debug logging yes))
- $(use_enable examples)
- $(use_enable geoip)
- $(use_with geoip libgeoip)
- $(use_enable ssl encryption)
- $(use_enable static-libs static)
- $(use_enable test tests)
- --with-libiconv
- )
- econf "${myeconfargs[@]}"
-
- if use python; then
- myeconfargs+=(
- --enable-python-binding
- --with-boost-python
- )
- python_configure() {
- econf "${myeconfargs[@]}"
- }
- 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
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-06-25 21:18 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-31 4:22 [gentoo-commits] repo/gentoo:master commit in: net-libs/libtorrent-rasterbar/files/, net-libs/libtorrent-rasterbar/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-06-25 21:18 David Seifert
2021-12-13 0:23 Nick Sarnie
2021-10-31 4:33 Sam James
2021-08-27 0:36 Sam James
2019-12-20 10:43 Mikle Kolyada
2019-05-02 19:16 Mikle Kolyada
2018-02-22 21:49 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox