CVS commit: pkgsrc/net/libtorrent

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/libtorrent
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Fri, 4 Oct 2024 09:00:06 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Oct  4 09:00:06 UTC 2024

Modified Files:
        pkgsrc/net/libtorrent: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/net/libtorrent/patches:
            patch-src_torrent_net_socket__address__key.h
Added Files:
        pkgsrc/net/libtorrent/patches: patch-src_data_chunk__list.cc
Removed Files:
        pkgsrc/net/libtorrent/patches: patch-config.h.in patch-src_Makefile.am
            patch-src_Makefile.in patch-src_data_chunk__list.cpp

Log Message:
libtorrent: updated to 0.14.0

0.14.0
Unknown changes


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/net/libtorrent/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/libtorrent/PLIST
cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/libtorrent/buildlink3.mk
cvs rdiff -u -r1.44 -r1.45 pkgsrc/net/libtorrent/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/net/libtorrent/patches/patch-config.h.in
cvs rdiff -u -r1.4 -r0 pkgsrc/net/libtorrent/patches/patch-src_Makefile.am \
    pkgsrc/net/libtorrent/patches/patch-src_Makefile.in \
    pkgsrc/net/libtorrent/patches/patch-src_data_chunk__list.cpp
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/libtorrent/patches/patch-src_data_chunk__list.cc
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/libtorrent/patches/patch-src_torrent_net_socket__address__key.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/libtorrent/Makefile
diff -u pkgsrc/net/libtorrent/Makefile:1.64 pkgsrc/net/libtorrent/Makefile:1.65
--- pkgsrc/net/libtorrent/Makefile:1.64 Tue Oct 24 22:10:23 2023
+++ pkgsrc/net/libtorrent/Makefile      Fri Oct  4 09:00:05 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.64 2023/10/24 22:10:23 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2024/10/04 09:00:05 adam Exp $
 
-DISTNAME=      libtorrent-0.13.8
-PKGREVISION=   2
+DISTNAME=      libtorrent-0.14.0
 CATEGORIES=    net
-MASTER_SITES=  https://rtorrent.net/downloads/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=rakshasa/}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/rakshasa/libtorrent
@@ -12,7 +12,7 @@ LICENSE=      gnu-gpl-v2
 
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
-USE_TOOLS+=            gmake pkg-config
+USE_TOOLS+=            autoconf automake autoreconf gmake pkg-config
 USE_CXX_FEATURES+=     c++11
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --disable-debug
@@ -21,23 +21,23 @@ LDFLAGS+=           -lz
 .include "../../mk/bsd.prefs.mk"
 
 # configure check is fooled by trap & emulate of unaligned access on alpha
-.if (${MACHINE_ARCH} == "alpha")
+.if ${MACHINE_ARCH} == "alpha"
 CONFIGURE_ARGS+=       --enable-aligned
 .endif
 
-.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin"
+.if ${OPSYS:M*BSD} || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=       --with-kqueue
 .endif
 
 .include "../../mk/compiler.mk"
 
 # See http://libtorrent.rakshasa.no/ticket/96
-.if !empty(CC_VERSION:Mgcc-[45].*)
+.if ${CC_VERSION:Mgcc-[45].*}
 CXXFLAGS+=     -fpermissive -fno-strength-reduce -fno-thread-jumps \
                -fno-inline -fforce-addr
 .endif
 
-.if empty(MACHINE_ARCH:M*64*) && ${MACHINE_ARCH} != "alpha"
+.if ${MACHINE_ARCH:M*64*} == "" && ${MACHINE_ARCH} != "alpha"
 CONFIGURE_ARGS+=       --disable-instrumentation
 .endif
 
@@ -47,10 +47,12 @@ OPENSSL_CFLAGS=     -I${BUILDLINK_PREFIX.ope
 OPENSSL_LIBS=  -L${BUILDLINK_PREFIX.openssl}/lib \
                -Wl,-R${BUILDLINK_PREFIX.openssl}/lib
 
-CONFIGURE_ENV+=        OPENSSL_CFLAGS=${OPENSSL_CFLAGS:Q}
+CONFIGURE_ENV+=        OPENSSL_CFLAGS=${OPENSSL_CFLAGS:M*:Q}
 CONFIGURE_ENV+=        OPENSSL_LIBS=${OPENSSL_LIBS:Q}
 .endif
 
+pre-configure:
+       set -e; cd ${WRKSRC} && autoreconf -fi
+
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../devel/libsigc++/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/libtorrent/PLIST
diff -u pkgsrc/net/libtorrent/PLIST:1.13 pkgsrc/net/libtorrent/PLIST:1.14
--- pkgsrc/net/libtorrent/PLIST:1.13    Sun Jun 24 16:57:58 2018
+++ pkgsrc/net/libtorrent/PLIST Fri Oct  4 09:00:05 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2018/06/24 16:57:58 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2024/10/04 09:00:05 adam Exp $
 include/torrent/bitfield.h
 include/torrent/chunk_manager.h
 include/torrent/common.h
@@ -28,7 +28,13 @@ 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/socket_address.h
 include/torrent/net/socket_address_key.h
+include/torrent/net/socket_event.h
+include/torrent/net/types.h
+include/torrent/net/utils.h
 include/torrent/object.h
 include/torrent/object_raw_bencode.h
 include/torrent/object_static_map.h
@@ -55,7 +61,6 @@ include/torrent/utils/directory_events.h
 include/torrent/utils/extents.h
 include/torrent/utils/log.h
 include/torrent/utils/log_buffer.h
-include/torrent/utils/net.h
 include/torrent/utils/option_strings.h
 include/torrent/utils/ranges.h
 include/torrent/utils/resume.h

Index: pkgsrc/net/libtorrent/buildlink3.mk
diff -u pkgsrc/net/libtorrent/buildlink3.mk:1.26 pkgsrc/net/libtorrent/buildlink3.mk:1.27
--- pkgsrc/net/libtorrent/buildlink3.mk:1.26    Tue Oct 24 22:10:23 2023
+++ pkgsrc/net/libtorrent/buildlink3.mk Fri Oct  4 09:00:05 2024
@@ -1,15 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.26 2023/10/24 22:10:23 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2024/10/04 09:00:05 adam Exp $
 
 BUILDLINK_TREE+=       libtorrent
 
 .if !defined(LIBTORRENT_BUILDLINK3_MK)
 LIBTORRENT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libtorrent+=     libtorrent>=0.13.6
-BUILDLINK_ABI_DEPENDS.libtorrent+=     libtorrent>=0.13.8nb2
+BUILDLINK_API_DEPENDS.libtorrent+=     libtorrent>=0.14.0
+BUILDLINK_ABI_DEPENDS.libtorrent+=     libtorrent>=0.14.0
 BUILDLINK_PKGSRCDIR.libtorrent?=       ../../net/libtorrent
 
-.include "../../devel/libsigc++/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .endif # LIBTORRENT_BUILDLINK3_MK
 

Index: pkgsrc/net/libtorrent/distinfo
diff -u pkgsrc/net/libtorrent/distinfo:1.44 pkgsrc/net/libtorrent/distinfo:1.45
--- pkgsrc/net/libtorrent/distinfo:1.44 Thu Nov  9 19:09:19 2023
+++ pkgsrc/net/libtorrent/distinfo      Fri Oct  4 09:00:06 2024
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.44 2023/11/09 19:09:19 nia Exp $
+$NetBSD: distinfo,v 1.45 2024/10/04 09:00:06 adam Exp $
 
-BLAKE2s (libtorrent-0.13.8.tar.gz) = ebd9f2f152cf99b4987e736b88fceecc71377c3f66f1f783e796e00b9c666df2
-SHA512 (libtorrent-0.13.8.tar.gz) = 417177df5b27cd8c6a6317063b0846da2690de4633836466728605c2edad2de407d29d321cc481b8d1352dd0ff6dd89f4566a830424a8cf986f2fddb04704da4
-Size (libtorrent-0.13.8.tar.gz) = 834027 bytes
-SHA1 (patch-config.h.in) = 7ea6ef87727756afe3882aad769a48488fc22c86
-SHA1 (patch-src_Makefile.am) = d965bdfd967a71d14ebcad6b32564a1c0908739d
-SHA1 (patch-src_Makefile.in) = 05f55223073fb57cc11fbb307708ba262899d85f
-SHA1 (patch-src_data_chunk__list.cpp) = 92a5f36d7ae993667123051b39e6033c73169f4e
+BLAKE2s (libtorrent-0.14.0.tar.gz) = ec594f2a76daf0d0445c92c76528ba9a7c136224ee6c8da3a3daa41083305d19
+SHA512 (libtorrent-0.14.0.tar.gz) = 124efde251e335ae0fc2f8cd9dff9f918ae9f818d17bc823b08826da534103e8e74dec37ee03a0b9c9c0a7bb1039958638dab08d17e83593b718b07aecad5001
+Size (libtorrent-0.14.0.tar.gz) = 387008 bytes
+SHA1 (patch-src_data_chunk__list.cc) = 92a5f36d7ae993667123051b39e6033c73169f4e
 SHA1 (patch-src_data_memory__chunk.cc) = 25c1e529223ab4873f61430e922949eeb29637c4
-SHA1 (patch-src_torrent_net_socket__address__key.h) = 9037c4e11498029977a795c1e76e99d68e3b53b6
+SHA1 (patch-src_torrent_net_socket__address__key.h) = a50248e4272f413458236730508d5903fdeba53d
 SHA1 (patch-src_torrent_poll__kqueue.cc) = 9e5191d9a9802d46a7c7da20e2ec4c3ce9f45a11

Index: pkgsrc/net/libtorrent/patches/patch-src_torrent_net_socket__address__key.h
diff -u pkgsrc/net/libtorrent/patches/patch-src_torrent_net_socket__address__key.h:1.1 pkgsrc/net/libtorrent/patches/patch-src_torrent_net_socket__address__key.h:1.2
--- pkgsrc/net/libtorrent/patches/patch-src_torrent_net_socket__address__key.h:1.1      Thu Nov  9 19:09:19 2023
+++ pkgsrc/net/libtorrent/patches/patch-src_torrent_net_socket__address__key.h  Fri Oct  4 09:00:06 2024
@@ -1,14 +1,14 @@
-$NetBSD: patch-src_torrent_net_socket__address__key.h,v 1.1 2023/11/09 19:09:19 nia Exp $
+$NetBSD: patch-src_torrent_net_socket__address__key.h,v 1.2 2024/10/04 09:00:06 adam Exp $
 
 Add missing header for AF_INET and friends.
 Needed for SunOS but also "POSIX sez so".
 
---- src/torrent/net/socket_address_key.h.orig  2019-07-19 11:44:08.000000000 +0000
+--- src/torrent/net/socket_address_key.h.orig  2024-10-03 12:59:31.247837979 +0000
 +++ src/torrent/net/socket_address_key.h
 @@ -6,6 +6,7 @@
  
  #include <cstring>
- #include <inttypes.h>
+ #include <cinttypes>
 +#include <sys/socket.h>
  #include <netinet/in.h>
  

Added files:

Index: pkgsrc/net/libtorrent/patches/patch-src_data_chunk__list.cc
diff -u /dev/null pkgsrc/net/libtorrent/patches/patch-src_data_chunk__list.cc:1.1
--- /dev/null   Fri Oct  4 09:00:06 2024
+++ pkgsrc/net/libtorrent/patches/patch-src_data_chunk__list.cc Fri Oct  4 09:00:06 2024
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_data_chunk__list.cc,v 1.1 2024/10/04 09:00:06 adam Exp $
+
+Add some casts now required.
+
+--- src/data/chunk_list.cc.orig        2012-02-22 07:50:27.000000000 +0000
++++ src/data/chunk_list.cc     2013-05-12 12:25:45.000000000 +0100
+@@ -368,19 +368,19 @@
+   if (flags & sync_force) {
+ 
+     if (flags & sync_safe)
+-      return std::make_pair(MemoryChunk::sync_sync, true);
++      return std::make_pair((int)MemoryChunk::sync_sync, true);
+     else
+-      return std::make_pair(MemoryChunk::sync_async, true);
++      return std::make_pair((int)MemoryChunk::sync_async, true);
+ 
+   } else if (flags & sync_safe) {
+       
+     if (node->sync_triggered())
+-      return std::make_pair(MemoryChunk::sync_sync, true);
++      return std::make_pair((int)MemoryChunk::sync_sync, true);
+     else
+-      return std::make_pair(MemoryChunk::sync_async, false);
++      return std::make_pair((int)MemoryChunk::sync_async, false);
+ 
+   } else {
+-    return std::make_pair(MemoryChunk::sync_async, true);
++    return std::make_pair((int)MemoryChunk::sync_async, true);
+   }
+ }
+

Prev by Date: CVS commit: pkgsrc/mk/pkgformat/pkg
Next by Date: CVS commit: pkgsrc/net/rtorrent
Previous by Thread: CVS commit: pkgsrc/mk/pkgformat/pkg
Next by Thread: CVS commit: pkgsrc/net/rtorrent
Indexes:

Home | Main Index | Thread Index | Old Index