diff options
-rw-r--r-- | net-p2p/libtorrent/Makefile | 15 | ||||
-rw-r--r-- | net-p2p/libtorrent/distinfo | 6 | ||||
-rw-r--r-- | net-p2p/libtorrent/files/patch-src_data_memory__chunk.cc | 4 | ||||
-rw-r--r-- | net-p2p/libtorrent/files/patch-src_torrent_net_socket__address__key.h | 10 | ||||
-rw-r--r-- | net-p2p/libtorrent/pkg-plist | 7 | ||||
-rw-r--r-- | net-p2p/rtorrent/Makefile | 27 | ||||
-rw-r--r-- | net-p2p/rtorrent/distinfo | 6 |
7 files changed, 24 insertions, 51 deletions
diff --git a/net-p2p/libtorrent/Makefile b/net-p2p/libtorrent/Makefile index 2134ab6851a2..0a2da6201cd6 100644 --- a/net-p2p/libtorrent/Makefile +++ b/net-p2p/libtorrent/Makefile @@ -1,5 +1,5 @@ PORTNAME= libtorrent -DISTVERSION= 0.15.6 +DISTVERSION= 0.16.0 CATEGORIES= net-p2p MASTER_SITES= https://github.com/rakshasa/rtorrent/releases/download/v${DISTVERSION}/ @@ -10,6 +10,7 @@ WWW= https://github.com/rakshasa/libtorrent LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +LIB_DEPENDS= libcurl.so:ftp/curl TEST_DEPENDS= cppunit>0:devel/cppunit USES= compiler:c++17-lang cpe libtool localbase:ldflags pathfix \ @@ -36,14 +37,4 @@ OPTIONS_DEFAULT= KQUEUE KQUEUE_DESC= Use kqueue(2) support KQUEUE_CONFIGURE_WITH= kqueue -.include <bsd.port.pre.mk> - -# Disable instrumentation, which requires 64-bit atomic ops, on i386 when using -# gcc to avoid linking errors: -# /usr/local/lib/libtorrent.so: undefined reference to `__sync_add_and_fetch_8' -# /usr/local/lib/libtorrent.so: undefined reference to `__sync_fetch_and_and_8' -.if ${ARCH} == i386 && ${CHOSEN_COMPILER_TYPE} == gcc -CONFIGURE_ARGS+= --disable-instrumentation -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-p2p/libtorrent/distinfo b/net-p2p/libtorrent/distinfo index 3eb6dbc858aa..7bebc5e606c8 100644 --- a/net-p2p/libtorrent/distinfo +++ b/net-p2p/libtorrent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755953468 -SHA256 (libtorrent-0.15.6.tar.gz) = 406592657fa45ac7ba0628a7d356cf7ec8d5dafd918d4252055c795491d33970 -SIZE (libtorrent-0.15.6.tar.gz) = 871284 +TIMESTAMP = 1757101252 +SHA256 (libtorrent-0.16.0.tar.gz) = 623a75e85a23f7471c9531ea67a01bb652165c6b2b6a829a7f1c6117eac938ec +SIZE (libtorrent-0.16.0.tar.gz) = 885568 diff --git a/net-p2p/libtorrent/files/patch-src_data_memory__chunk.cc b/net-p2p/libtorrent/files/patch-src_data_memory__chunk.cc index f119df1d6e6e..b73078bdc1ab 100644 --- a/net-p2p/libtorrent/files/patch-src_data_memory__chunk.cc +++ b/net-p2p/libtorrent/files/patch-src_data_memory__chunk.cc @@ -1,6 +1,6 @@ ---- src/data/memory_chunk.cc.orig 2025-06-01 13:09:26 UTC +--- src/data/memory_chunk.cc.orig 2025-09-05 08:47:37 UTC +++ src/data/memory_chunk.cc -@@ -66,6 +66,9 @@ MemoryChunk::unmap() { +@@ -49,6 +49,9 @@ MemoryChunk::unmap() { if (!is_valid()) throw internal_error("MemoryChunk::unmap() called on an invalid object"); diff --git a/net-p2p/libtorrent/files/patch-src_torrent_net_socket__address__key.h b/net-p2p/libtorrent/files/patch-src_torrent_net_socket__address__key.h deleted file mode 100644 index 56e9dbf35b71..000000000000 --- a/net-p2p/libtorrent/files/patch-src_torrent_net_socket__address__key.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/torrent/net/socket_address_key.h.orig 2025-06-01 13:09:26 UTC -+++ src/torrent/net/socket_address_key.h -@@ -7,6 +7,7 @@ - #include <cstring> - #include <cinttypes> - #include <netinet/in.h> -+#include <sys/socket.h> - - // Unique key for the socket address, excluding port numbers, etc. - diff --git a/net-p2p/libtorrent/pkg-plist b/net-p2p/libtorrent/pkg-plist index b8fd887f44df..826b7588ff53 100644 --- a/net-p2p/libtorrent/pkg-plist +++ b/net-p2p/libtorrent/pkg-plist @@ -25,9 +25,10 @@ include/torrent/error.h include/torrent/event.h include/torrent/exceptions.h include/torrent/hash_string.h -include/torrent/http.h include/torrent/net/address_info.h include/torrent/net/fd.h +include/torrent/net/http_get.h +include/torrent/net/http_stack.h include/torrent/net/resolver.h include/torrent/net/socket_address.h include/torrent/net/socket_address_key.h @@ -69,6 +70,6 @@ include/torrent/utils/signal_bitfield.h include/torrent/utils/thread.h include/torrent/utils/uri_parser.h lib/libtorrent.so -lib/libtorrent.so.26 -lib/libtorrent.so.26.0.0 +lib/libtorrent.so.30 +lib/libtorrent.so.30.0.0 libdata/pkgconfig/libtorrent.pc diff --git a/net-p2p/rtorrent/Makefile b/net-p2p/rtorrent/Makefile index 24009a48b2f8..0d2db49d588b 100644 --- a/net-p2p/rtorrent/Makefile +++ b/net-p2p/rtorrent/Makefile @@ -1,5 +1,5 @@ PORTNAME= rtorrent -DISTVERSION= 0.15.6 +DISTVERSION= 0.16.0 CATEGORIES= net-p2p MASTER_SITES= https://github.com/rakshasa/rtorrent/releases/download/v${DISTVERSION}/ @@ -11,14 +11,13 @@ LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING -LIB_DEPENDS= libcurl.so:ftp/curl \ - libtorrent.so:net-p2p/libtorrent +LIB_DEPENDS= libtorrent.so:net-p2p/libtorrent USES= compiler:c++17-lang ncurses pkgconfig USE_RC_SUBR= rtorrent GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-debug -LDFLAGS+= -lexecinfo -pthread +CONFIGURE_ARGS= --disable-debug \ + --with-xmlrpc-tinyxml2 SUB_FILES= pkg-message @@ -26,19 +25,11 @@ USERS= rtorrent GROUPS= rtorrent PLIST_FILES= bin/rtorrent \ - "@sample ${ETCDIR}/rtorrent.conf.sample" -PORTDOCS= README - -OPTIONS_DEFINE= DOCS IPV6 -OPTIONS_DEFAULT= TINYXML -OPTIONS_RADIO= XML -OPTIONS_RADIO_XML= TINYXML XMLRPC -XMLRPC_DESC= Compile with xmlrpc-c support - -IPV6_CONFIGURE_ENABLE= ipv6 -TINYXML_CONFIGURE_ON= --with-xmlrpc-tinyxml2 -XMLRPC_LIB_DEPENDS= libxmlrpc.so:net/xmlrpc-c -XMLRPC_CONFIGURE_ON= --with-xmlrpc-c + "@sample ${ETCDIR}/rtorrent.conf.sample" \ + ${DATADIR}/lua/rtorrent.lua +PORTDOCS= README.md + +OPTIONS_DEFINE= DOCS post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} diff --git a/net-p2p/rtorrent/distinfo b/net-p2p/rtorrent/distinfo index a44d5bfed9fc..9d4974b6f14a 100644 --- a/net-p2p/rtorrent/distinfo +++ b/net-p2p/rtorrent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755953681 -SHA256 (rtorrent-0.15.6.tar.gz) = a3eb2afcdd0d81aaf5efd044761075f7f832375e9a6eb4b38a7694bfff3aa3cd -SIZE (rtorrent-0.15.6.tar.gz) = 866966 +TIMESTAMP = 1757102139 +SHA256 (rtorrent-0.16.0.tar.gz) = fe8f8793f3bae8de157f567d9d89629dfd6fc21bc18d7db4537c4014a23dc1d9 +SIZE (rtorrent-0.16.0.tar.gz) = 854573 |