[Midnightbsd-cvs] mports [18424] trunk/net-p2p/libtorrent: update to 0.13.4
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Mar 28 17:10:04 EDT 2015
Revision: 18424
http://svnweb.midnightbsd.org/mports/?rev=18424
Author: laffer1
Date: 2015-03-28 17:10:03 -0400 (Sat, 28 Mar 2015)
Log Message:
-----------
update to 0.13.4
Modified Paths:
--------------
trunk/net-p2p/libtorrent/Makefile
trunk/net-p2p/libtorrent/distinfo
trunk/net-p2p/libtorrent/pkg-plist
Added Paths:
-----------
trunk/net-p2p/libtorrent/files/extra-clang
trunk/net-p2p/libtorrent/files/patch-src_net_socket__set.h
trunk/net-p2p/libtorrent/files/patch-src_torrent_connection__manager.h
Removed Paths:
-------------
trunk/net-p2p/libtorrent/files/patch-ltmain.sh
trunk/net-p2p/libtorrent/files/patch-src_torrent_utils_thread__base.cc
Modified: trunk/net-p2p/libtorrent/Makefile
===================================================================
--- trunk/net-p2p/libtorrent/Makefile 2015-03-28 21:06:55 UTC (rev 18423)
+++ trunk/net-p2p/libtorrent/Makefile 2015-03-28 21:10:03 UTC (rev 18424)
@@ -1,28 +1,25 @@
# $MidnightBSD$
PORTNAME= libtorrent
-PORTVERSION= 0.13.2
+PORTVERSION= 0.13.4
PORTREVISION= 1
CATEGORIES= net-p2p
-MASTER_SITES= http://libtorrent.rakshasa.no/downloads/ \
- ${MASTER_SITE_FREEBSD_LOCAL}
-MASTER_SITE_SUBDIR= flz/libtorrent
+MASTER_SITES= http://libtorrent.rakshasa.no/downloads/
-MAINTAINER?= ports at MidnightBSD.org
-COMMENT?= BitTorrent Library written in C++
+MAINTAINER= ports at MidnightBSD.org
+COMMENT= BitTorrent Library written in C++
+
LICENSE= gpl2
-LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20
-
-CONFLICTS?= libtorrent-devel-[0-9]* \
- rblibtorrent-[0-9]* \
+CONFLICTS= rblibtorrent-[0-9]* \
rblibtorrent-devel-[0-9]*
-USE_AUTOTOOLS= libtool
-USES= pathfix pkgconfig
+USES= compiler:c++11-lang libtool pathfix pkgconfig
USE_OPENSSL= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --disable-debug
+CONFIGURE_ENV= OPENSSL_LIBS="-L${OPENSSLBASE}/lib -ssl -crypto" OPENSSL_CFLAGS="-I${OPENSSLBASE}/include"
OPTIONS_DEFINE= KQUEUE IPV6
OPTIONS_DEFAULT= KQUEUE
@@ -30,18 +27,13 @@
.include <bsd.port.pre.mk>
-.if defined(WITH_OPENSSL_BASE)
-# The reason why I use this is cause openssl from base doesn't install a .pc file
-# and configure will fail trying to find it. Setting both of those variables to
-# a *non-empty* value by-passes the pkg-config check.
-CONFIGURE_ENV= OPENSSL_LIBS="-L/usr/lib -ssl -crypto" OPENSSL_CFLAGS="-I/usr/include"
+# Disable amd64 atomic ops on i386 when using gcc
+# undefined reference to __sync_add_and_fetch_8
+# undefined reference to __sync_fetch_and_and_8
+.if ${ARCH} == "i386" && ${COMPILER_TYPE} == "gcc"
+CONFIGURE_ARGS+= --disable-instrumentation
.endif
-CONFIGURE_ARGS+= --disable-debug
-
-post-patch:
- @${REINPLACE_CMD} -e 's/-O3/${CFLAGS}/' ${WRKSRC}/configure
-
.if ${PORT_OPTIONS:MKQUEUE}
CONFIGURE_ARGS+= --with-kqueue
.endif
@@ -50,4 +42,7 @@
CONFIGURE_ARGS+= --enable-ipv6
.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/configure
+
.include <bsd.port.post.mk>
Modified: trunk/net-p2p/libtorrent/distinfo
===================================================================
--- trunk/net-p2p/libtorrent/distinfo 2015-03-28 21:06:55 UTC (rev 18423)
+++ trunk/net-p2p/libtorrent/distinfo 2015-03-28 21:10:03 UTC (rev 18424)
@@ -1,2 +1,2 @@
-SHA256 (libtorrent-0.13.2.tar.gz) = ed2f2dea16c29cac63fa2724f6658786d955f975861fa6811bcf1597ff8a5e4f
-SIZE (libtorrent-0.13.2.tar.gz) = 725088
+SHA256 (libtorrent-0.13.4.tar.gz) = 704e097119dc89e2ee4630396b25de1cd64b0549841347ea75b9ef9217084955
+SIZE (libtorrent-0.13.4.tar.gz) = 768382
Added: trunk/net-p2p/libtorrent/files/extra-clang
===================================================================
--- trunk/net-p2p/libtorrent/files/extra-clang (rev 0)
+++ trunk/net-p2p/libtorrent/files/extra-clang 2015-03-28 21:10:03 UTC (rev 18424)
@@ -0,0 +1,144 @@
+--- src/data/memory_chunk.cc
++++ src/data/memory_chunk.cc
+@@ -54,6 +54,22 @@
+
+ namespace torrent {
+
++const int MemoryChunk::prot_exec;
++const int MemoryChunk::prot_read;
++const int MemoryChunk::prot_write;
++const int MemoryChunk::prot_none;
++const int MemoryChunk::map_shared;
++
++const int MemoryChunk::advice_normal;
++const int MemoryChunk::advice_random;
++const int MemoryChunk::advice_sequential;
++const int MemoryChunk::advice_willneed;
++const int MemoryChunk::advice_dontneed;
++
++const int MemoryChunk::sync_sync;
++const int MemoryChunk::sync_async;
++const int MemoryChunk::sync_invalidate;
++
+ uint32_t MemoryChunk::m_pagesize = getpagesize();
+
+ inline void
+--- src/protocol/request_list.cc
++++ src/protocol/request_list.cc
+@@ -52,6 +52,8 @@
+
+ namespace torrent {
+
++const int request_list_constants::bucket_count;
++
+ const instrumentation_enum request_list_constants::instrumentation_added[bucket_count] = {
+ INSTRUMENTATION_TRANSFER_REQUESTS_QUEUED_ADDED,
+ INSTRUMENTATION_TRANSFER_REQUESTS_UNORDERED_ADDED,
+--- src/torrent/data/file.cc
++++ src/torrent/data/file.cc
+@@ -50,6 +50,15 @@
+
+ namespace torrent {
+
++const int File::flag_active;
++const int File::flag_create_queued;
++const int File::flag_resize_queued;
++const int File::flag_fallocate;
++const int File::flag_previously_created;
++
++const int File::flag_prioritize_first;
++const int File::flag_prioritize_last;
++
+ File::File() :
+ m_fd(-1),
+ m_protection(0),
+--- src/torrent/download.cc
++++ src/torrent/download.cc
+@@ -72,6 +72,20 @@
+
+ namespace torrent {
+
++const int DownloadInfo::flag_open;
++const int DownloadInfo::flag_active;
++const int DownloadInfo::flag_compact;
++const int DownloadInfo::flag_accepting_new_peers;
++const int DownloadInfo::flag_accepting_seeders;
++const int DownloadInfo::flag_private;
++const int DownloadInfo::flag_meta_download;
++const int DownloadInfo::flag_pex_enabled;
++const int DownloadInfo::flag_pex_active;
++
++const int DownloadInfo::public_flags;
++
++const uint32_t DownloadInfo::unlimited;
++
+ const DownloadInfo* Download::info() const { return m_ptr->info(); }
+ const download_data* Download::data() const { return m_ptr->data(); }
+
+--- src/torrent/peer/connection_list.cc
++++ src/torrent/peer/connection_list.cc
+@@ -60,6 +60,11 @@
+
+ namespace torrent {
+
++const int ConnectionList::disconnect_available;
++const int ConnectionList::disconnect_quick;
++const int ConnectionList::disconnect_unwanted;
++const int ConnectionList::disconnect_delayed;
++
+ ConnectionList::ConnectionList(DownloadMain* download) :
+ m_download(download), m_minSize(50), m_maxSize(100) {
+ }
+--- src/torrent/utils/log.cc
++++ src/torrent/utils/log.cc
+@@ -189,7 +189,7 @@
+ pthread_mutex_lock(&log_mutex);
+ std::for_each(m_first, m_last, std::tr1::bind(&log_slot::operator(),
+ std::tr1::placeholders::_1,
+- buffer,
++ (const char*)buffer,
+ std::distance(buffer, first),
+ std::distance(log_groups.begin(), this)));
+ if (dump_data != NULL)
+--- src/utils/instrumentation.h
++++ src/utils/instrumentation.h
+@@ -39,6 +39,8 @@
+
+ #include <tr1/array>
+
++#include <algorithm>
++
+ #include "torrent/common.h"
+ #include "torrent/utils/log.h"
+
+@@ -118,7 +120,7 @@
+
+ inline void
+ instrumentation_initialize() {
+- instrumentation_values.assign(int64_t());
++ std::fill(instrumentation_values.begin(), instrumentation_values.end(), int64_t());
+ }
+
+ inline void
+--- src/utils/queue_buckets.h
++++ src/utils/queue_buckets.h
+@@ -251,7 +251,7 @@
+ instrumentation_update(constants::instrumentation_total[idx], -difference);
+
+ // Consider moving these to a temporary dequeue before releasing:
+- std::for_each(begin, end, std::tr1::function<void (value_type)>(&constants::template destroy<value_type>));
++ std::for_each(begin, end, std::tr1::function<void (value_type&)>(&constants::template destroy<value_type>));
+ queue_at(idx).erase(begin, end);
+ }
+
+--- src/torrent/download_info.h
++++ src/torrent/download_info.h
+@@ -52,7 +52,7 @@
+
+ // This will become a Download 'handle' of kinds.
+
+-class DownloadInfo {
++class LIBTORRENT_EXPORT DownloadInfo {
+ public:
+ typedef std::tr1::function<uint64_t ()> slot_stat_type;
+
Property changes on: trunk/net-p2p/libtorrent/files/extra-clang
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/net-p2p/libtorrent/files/patch-ltmain.sh
===================================================================
--- trunk/net-p2p/libtorrent/files/patch-ltmain.sh 2015-03-28 21:06:55 UTC (rev 18423)
+++ trunk/net-p2p/libtorrent/files/patch-ltmain.sh 2015-03-28 21:10:03 UTC (rev 18424)
@@ -1,10 +0,0 @@
---- ltmain.sh.orig Fri Oct 27 22:47:02 2006
-+++ ltmain.sh Tue Nov 7 10:33:04 2006
-@@ -1256,6 +1256,7 @@
- ;;
-
- -avoid-version)
-+ build_old_libs=no
- avoid_version=yes
- continue
- ;;
Added: trunk/net-p2p/libtorrent/files/patch-src_net_socket__set.h
===================================================================
--- trunk/net-p2p/libtorrent/files/patch-src_net_socket__set.h (rev 0)
+++ trunk/net-p2p/libtorrent/files/patch-src_net_socket__set.h 2015-03-28 21:10:03 UTC (rev 18424)
@@ -0,0 +1,18 @@
+--- src/net/socket_set.h.orig 2012-01-19 11:19:26.000000000 +0100
++++ src/net/socket_set.h 2014-02-02 19:05:15.000000000 +0100
+@@ -53,12 +53,12 @@
+
+ // Propably should rename to EventSet...
+
+-class SocketSet : private std::vector<Event*, rak::cacheline_allocator<> > {
++class SocketSet : private std::vector<Event*, rak::cacheline_allocator<Event *> > {
+ public:
+ typedef uint32_t size_type;
+
+- typedef std::vector<Event*, rak::cacheline_allocator<> > base_type;
+- typedef std::vector<size_type, rak::cacheline_allocator<> > Table;
++ typedef std::vector<Event*, rak::cacheline_allocator<Event *> > base_type;
++ typedef std::vector<size_type, rak::cacheline_allocator<size_type> > Table;
+
+ static const size_type npos = static_cast<size_type>(-1);
+
Property changes on: trunk/net-p2p/libtorrent/files/patch-src_net_socket__set.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net-p2p/libtorrent/files/patch-src_torrent_connection__manager.h
===================================================================
--- trunk/net-p2p/libtorrent/files/patch-src_torrent_connection__manager.h (rev 0)
+++ trunk/net-p2p/libtorrent/files/patch-src_torrent_connection__manager.h 2015-03-28 21:10:03 UTC (rev 18424)
@@ -0,0 +1,10 @@
+--- src/torrent/connection_manager.h
++++ src/torrent/connection_manager.h
+@@ -42,6 +42,7 @@
+
+ #include <list>
+ #include <arpa/inet.h>
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <netinet/in_systm.h>
+ #include <netinet/ip.h>
Property changes on: trunk/net-p2p/libtorrent/files/patch-src_torrent_connection__manager.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/net-p2p/libtorrent/files/patch-src_torrent_utils_thread__base.cc
===================================================================
--- trunk/net-p2p/libtorrent/files/patch-src_torrent_utils_thread__base.cc 2015-03-28 21:06:55 UTC (rev 18423)
+++ trunk/net-p2p/libtorrent/files/patch-src_torrent_utils_thread__base.cc 2015-03-28 21:10:03 UTC (rev 18424)
@@ -1,20 +0,0 @@
---- src/torrent/utils/thread_base.cc.orig
-+++ src/torrent/utils/thread_base.cc
-@@ -88,6 +88,8 @@ thread_base::stop_thread_wait() {
-
- void
- thread_base::interrupt() {
-+ int sleep_length = 0;
-+
- __sync_fetch_and_or(&m_flags, flag_no_timeout);
-
- while (is_polling() && has_no_timeout()) {
-@@ -96,7 +98,8 @@ thread_base::interrupt() {
- if (!(is_polling() && has_no_timeout()))
- return;
-
-- usleep(0);
-+ usleep(sleep_length);
-+ sleep_length = std::min(sleep_length + 50, 1000);
- }
- }
Modified: trunk/net-p2p/libtorrent/pkg-plist
===================================================================
--- trunk/net-p2p/libtorrent/pkg-plist 2015-03-28 21:06:55 UTC (rev 18423)
+++ trunk/net-p2p/libtorrent/pkg-plist 2015-03-28 21:10:03 UTC (rev 18424)
@@ -52,19 +52,14 @@
include/torrent/utils/extents.h
include/torrent/utils/log.h
include/torrent/utils/log_buffer.h
-include/torrent/utils/log_files.h
+include/torrent/utils/net.h
include/torrent/utils/option_strings.h
include/torrent/utils/ranges.h
include/torrent/utils/resume.h
include/torrent/utils/signal_bitfield.h
include/torrent/utils/thread_base.h
-lib/libtorrent.a
-lib/libtorrent.la
+include/torrent/utils/thread_interrupt.h
lib/libtorrent.so
-lib/libtorrent.so.14
+lib/libtorrent.so.18
+lib/libtorrent.so.18.0.0
libdata/pkgconfig/libtorrent.pc
- at dirrmtry include/torrent/utils
- at dirrmtry include/torrent/peer
- at dirrmtry include/torrent/download
- at dirrmtry include/torrent/data
- at dirrmtry include/torrent
More information about the Midnightbsd-cvs
mailing list