mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-21 00:25:50 +00:00
- Update libtorrent to 0.13.4
- Update rtorrent to 0.9.4 - Convert to new LIB_DEPENDS format - Remove uneeded ?= - Remove libtorrent-devel and rtorrent-devel ports since the non devel port has a newer version and no development release is available anymore PR: 191621 Submitted by: Colin <anonymous.bug.report@gmail.com>
This commit is contained in:
Guido Falsi
parent
0224bdcd41
commit
136fdffb5c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=361124
2
MOVED
2
MOVED
@ -6241,3 +6241,5 @@ print/texinfo-lite|print/indexinfo|2014-07-06|Replaced by indexinfo to handle in
|
||||
audio/linnya||2014-07-07|Deprecated upstream
|
||||
databases/slony1|databases/slony1v2|2014-07-07|Unsupported: consider using slony1 v2 instead
|
||||
lang/see-devel|lang/see|2014-07-07|lang/see is up to date no need for see-devel
|
||||
net-p2p/libtorrent-devel||2014-07-07|libtorrent port has newer version, use that instead
|
||||
net-p2p/rtorrent-devel||2014-07-07|rtorrent port has newer version, use that instead
|
||||
|
||||
@ -46,7 +46,6 @@
|
||||
SUBDIR += libktorrent
|
||||
SUBDIR += libpdtp
|
||||
SUBDIR += libtorrent
|
||||
SUBDIR += libtorrent-devel
|
||||
SUBDIR += libtorrent-rasterbar
|
||||
SUBDIR += libtorrent-rasterbar-python
|
||||
SUBDIR += linux-jigdo
|
||||
@ -84,7 +83,6 @@
|
||||
SUBDIR += retroshare
|
||||
SUBDIR += rtgui
|
||||
SUBDIR += rtorrent
|
||||
SUBDIR += rtorrent-devel
|
||||
SUBDIR += shx
|
||||
SUBDIR += solidcoin
|
||||
SUBDIR += squall
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= libtorrent-devel
|
||||
PORTVERSION= 0.13.3
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= net-p2p
|
||||
MASTER_SITES= http://libtorrent.rakshasa.no/downloads/
|
||||
DISTNAME= ${PORTNAME:S/-devel//}-${PORTVERSION}
|
||||
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
COMMENT= BitTorrent Library written in C++ (development version)
|
||||
|
||||
LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20
|
||||
|
||||
CONFLICTS= libtorrent-[0-9]* \
|
||||
rblibtorrent-[0-9]* \
|
||||
rblibtorrent-devel-[0-9]*
|
||||
|
||||
USE_AUTOTOOLS= libtool
|
||||
USES= pathfix pkgconfig
|
||||
USE_OPENSSL= yes
|
||||
USE_LDCONFIG= yes
|
||||
GNU_CONFIGURE= yes
|
||||
|
||||
OPTIONS_DEFINE= KQUEUE IPV6
|
||||
OPTIONS_DEFAULT= KQUEUE
|
||||
KQUEUE_DESC= Use kqueue(2) support
|
||||
|
||||
.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"
|
||||
.endif
|
||||
|
||||
CONFIGURE_ARGS+= --disable-debug
|
||||
|
||||
# Workaround to build on > 10.x
|
||||
.if ${OSVERSION} >= 1000000
|
||||
USE_GCC= yes
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/configure
|
||||
|
||||
.if ${PORT_OPTIONS:MKQUEUE}
|
||||
CONFIGURE_ARGS+= --with-kqueue
|
||||
.endif
|
||||
|
||||
.if ${PORT_OPTIONS:MIPV6}
|
||||
CONFIGURE_ARGS+= --enable-ipv6
|
||||
.endif
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
@ -1,2 +0,0 @@
|
||||
SHA256 (libtorrent-0.13.3.tar.gz) = 34317d6783b7f8d0805274c9467475b5432a246c0de8e28fc16e3b0b43f35677
|
||||
SIZE (libtorrent-0.13.3.tar.gz) = 732847
|
||||
@ -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
|
||||
;;
|
||||
@ -1,20 +0,0 @@
|
||||
*** src/data/memory_chunk.cc.orig Wed Feb 10 09:55:42 2010
|
||||
--- src/data/memory_chunk.cc Wed Feb 10 09:56:26 2010
|
||||
***************
|
||||
*** 78,87 ****
|
||||
--- 78,90 ----
|
||||
void
|
||||
MemoryChunk::unmap() {
|
||||
if (!is_valid())
|
||||
throw internal_error("MemoryChunk::unmap() called on an invalid object");
|
||||
|
||||
+ if (msync(m_ptr, m_end - m_ptr,MS_INVALIDATE) != 0)
|
||||
+ throw internal_error("MemoryChunk::unmap() - msync() system call failed");
|
||||
+
|
||||
if (munmap(m_ptr, m_end - m_ptr) != 0)
|
||||
throw internal_error("MemoryChunk::unmap() system call failed: " + std::string(rak::error_number::current().c_str()));
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
--- src/torrent/poll_kqueue.cc.orig 2008-12-09 10:47:34.000000000 +0000
|
||||
+++ src/torrent/poll_kqueue.cc 2008-12-09 10:48:10.000000000 +0000
|
||||
@@ -52,6 +52,8 @@
|
||||
#include <sys/event.h>
|
||||
#include <sys/select.h>
|
||||
#include <sys/time.h>
|
||||
+
|
||||
+#include <assert.h>
|
||||
#endif
|
||||
|
||||
namespace torrent {
|
||||
@@ -113,7 +113,7 @@
|
||||
if (fd == -1)
|
||||
return NULL;
|
||||
|
||||
- return new PollKQueue(fd, 1024, maxOpenSockets);
|
||||
+ return new PollKQueue(fd, 16384, maxOpenSockets);
|
||||
}
|
||||
|
||||
PollKQueue::PollKQueue(int fd, int maxEvents, int maxOpenSockets) :
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
@ -1,5 +0,0 @@
|
||||
LibTorrent is a BitTorrent library written in C++ for *nix. It is
|
||||
designed to avoid redundant copying and storing of data that other
|
||||
clients and libraries suffer from. Licensed under the GPL.
|
||||
|
||||
WWW: http://libtorrent.rakshasa.no/
|
||||
@ -1,71 +0,0 @@
|
||||
include/torrent/bitfield.h
|
||||
include/torrent/chunk_manager.h
|
||||
include/torrent/common.h
|
||||
include/torrent/connection_manager.h
|
||||
include/torrent/data/block.h
|
||||
include/torrent/data/block_list.h
|
||||
include/torrent/data/block_transfer.h
|
||||
include/torrent/data/chunk_utils.h
|
||||
include/torrent/data/download_data.h
|
||||
include/torrent/data/file.h
|
||||
include/torrent/data/file_list.h
|
||||
include/torrent/data/file_list_iterator.h
|
||||
include/torrent/data/file_manager.h
|
||||
include/torrent/data/file_utils.h
|
||||
include/torrent/data/piece.h
|
||||
include/torrent/data/transfer_list.h
|
||||
include/torrent/dht_manager.h
|
||||
include/torrent/download.h
|
||||
include/torrent/download/choke_group.h
|
||||
include/torrent/download/choke_queue.h
|
||||
include/torrent/download/download_manager.h
|
||||
include/torrent/download/group_entry.h
|
||||
include/torrent/download/resource_manager.h
|
||||
include/torrent/download_info.h
|
||||
include/torrent/error.h
|
||||
include/torrent/event.h
|
||||
include/torrent/exceptions.h
|
||||
include/torrent/hash_string.h
|
||||
include/torrent/http.h
|
||||
include/torrent/object.h
|
||||
include/torrent/object_raw_bencode.h
|
||||
include/torrent/object_static_map.h
|
||||
include/torrent/object_stream.h
|
||||
include/torrent/path.h
|
||||
include/torrent/peer/choke_status.h
|
||||
include/torrent/peer/client_info.h
|
||||
include/torrent/peer/client_list.h
|
||||
include/torrent/peer/connection_list.h
|
||||
include/torrent/peer/peer.h
|
||||
include/torrent/peer/peer_info.h
|
||||
include/torrent/peer/peer_list.h
|
||||
include/torrent/poll.h
|
||||
include/torrent/poll_epoll.h
|
||||
include/torrent/poll_kqueue.h
|
||||
include/torrent/poll_select.h
|
||||
include/torrent/rate.h
|
||||
include/torrent/throttle.h
|
||||
include/torrent/torrent.h
|
||||
include/torrent/tracker.h
|
||||
include/torrent/tracker_controller.h
|
||||
include/torrent/tracker_list.h
|
||||
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
|
||||
lib/libtorrent.so
|
||||
lib/libtorrent.so.17
|
||||
libdata/pkgconfig/libtorrent.pc
|
||||
@dirrmtry include/torrent/utils
|
||||
@dirrmtry include/torrent/peer
|
||||
@dirrmtry include/torrent/download
|
||||
@dirrmtry include/torrent/data
|
||||
@dirrmtry include/torrent
|
||||
@ -1,24 +1,19 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= libtorrent
|
||||
PORTVERSION= 0.13.2
|
||||
PORTREVISION= 3
|
||||
PORTVERSION= 0.13.4
|
||||
CATEGORIES= net-p2p
|
||||
MASTER_SITES= http://libtorrent.rakshasa.no/downloads/ \
|
||||
${MASTER_SITE_LOCAL}
|
||||
MASTER_SITE_SUBDIR= flz/libtorrent
|
||||
MASTER_SITES= http://libtorrent.rakshasa.no/downloads/
|
||||
|
||||
MAINTAINER?= ports@FreeBSD.org
|
||||
COMMENT?= BitTorrent Library written in C++
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
COMMENT= BitTorrent Library written in C++
|
||||
|
||||
LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20
|
||||
LIB_DEPENDS= libsigc-2.0.so:${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
|
||||
@ -38,6 +33,13 @@ CONFIGURE_ENV= OPENSSL_LIBS="-L/usr/lib -ssl -crypto" OPENSSL_CFLAGS="-I/usr/inc
|
||||
|
||||
CONFIGURE_ARGS+= --disable-debug
|
||||
|
||||
# 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
|
||||
|
||||
# Workaround to build on >= 10.x
|
||||
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
|
||||
CXXFLAGS+= -std=c++11
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,9 +1,6 @@
|
||||
You guys are doing it wrong. And clang is strict about it.
|
||||
This makes rtorrent link again.
|
||||
|
||||
--- src/data/memory_chunk.cc 2013-12-07 17:21:35.803392000 +0100
|
||||
+++ old/data/memory_chunk.cc 2013-12-07 17:47:23.430285373 +0100
|
||||
@@ -54,6 +54,29 @@ extern "C" int madvise(void *, size_t, i
|
||||
--- src/data/memory_chunk.cc
|
||||
+++ src/data/memory_chunk.cc
|
||||
@@ -54,6 +54,22 @@
|
||||
|
||||
namespace torrent {
|
||||
|
||||
@ -13,19 +10,12 @@ This makes rtorrent link again.
|
||||
+const int MemoryChunk::prot_none;
|
||||
+const int MemoryChunk::map_shared;
|
||||
+
|
||||
+#ifdef USE_MADVISE
|
||||
+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;
|
||||
+#else
|
||||
+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;
|
||||
+#endif
|
||||
+
|
||||
+const int MemoryChunk::sync_sync;
|
||||
+const int MemoryChunk::sync_async;
|
||||
+const int MemoryChunk::sync_invalidate;
|
||||
@ -33,8 +23,19 @@ This makes rtorrent link again.
|
||||
uint32_t MemoryChunk::m_pagesize = getpagesize();
|
||||
|
||||
inline void
|
||||
--- src/torrent/data/file.cc 2013-12-07 17:21:35.590392000 +0100
|
||||
+++ old/torrent/data/file.cc 2013-12-07 17:45:59.975290599 +0100
|
||||
--- 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 {
|
||||
@ -51,8 +52,8 @@ This makes rtorrent link again.
|
||||
File::File() :
|
||||
m_fd(-1),
|
||||
m_protection(0),
|
||||
--- src/torrent/download.cc 2013-12-07 17:21:35.721391000 +0100
|
||||
+++ old/torrent/download.cc 2013-12-07 17:44:19.498298036 +0100
|
||||
--- src/torrent/download.cc
|
||||
+++ src/torrent/download.cc
|
||||
@@ -72,6 +72,20 @@
|
||||
|
||||
namespace torrent {
|
||||
@ -74,8 +75,8 @@ This makes rtorrent link again.
|
||||
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 2013-12-07 17:21:35.676392000 +0100
|
||||
+++ old/torrent/peer/connection_list.cc 2013-12-07 17:44:32.385410379 +0100
|
||||
--- src/torrent/peer/connection_list.cc
|
||||
+++ src/torrent/peer/connection_list.cc
|
||||
@@ -60,6 +60,11 @@
|
||||
|
||||
namespace torrent {
|
||||
@ -88,3 +89,56 @@ This makes rtorrent link again.
|
||||
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;
|
||||
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- ./src/torrent/connection_manager.h.orig 2013-10-25 09:26:00.379999391 +0100
|
||||
+++ ./src/torrent/connection_manager.h 2013-10-25 09:26:18.486351796 +0100
|
||||
@@ -40,6 +40,7 @@
|
||||
#define LIBTORRENT_CONNECTION_MANAGER_H
|
||||
|
||||
#include <sys/socket.h>
|
||||
+#include <sys/types.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/in_systm.h>
|
||||
@ -1,5 +1,5 @@
|
||||
--- ./src/torrent/connection_manager.h.orig 2013-12-15 17:55:18.427951513 +0400
|
||||
+++ ./src/torrent/connection_manager.h 2013-12-15 17:55:43.459221755 +0400
|
||||
--- src/torrent/connection_manager.h
|
||||
+++ src/torrent/connection_manager.h
|
||||
@@ -42,6 +42,7 @@
|
||||
|
||||
#include <list>
|
||||
@ -1,19 +0,0 @@
|
||||
--- src/torrent/utils/log.cc.orig 2012-03-20 16:10:16.000000000 +0100
|
||||
+++ src/torrent/utils/log.cc 2014-02-02 18:49:35.000000000 +0100
|
||||
@@ -158,6 +158,7 @@
|
||||
va_list ap;
|
||||
unsigned int buffer_size = 4096;
|
||||
char buffer[buffer_size];
|
||||
+ char *bufp = buffer;
|
||||
char* first = buffer;
|
||||
|
||||
if (hash != NULL && subsystem != NULL) {
|
||||
@@ -176,7 +177,7 @@
|
||||
pthread_mutex_lock(&log_mutex);
|
||||
std::for_each(m_first, m_last, tr1::bind(&log_slot::operator(),
|
||||
tr1::placeholders::_1,
|
||||
- buffer,
|
||||
+ bufp,
|
||||
std::distance(buffer, first),
|
||||
std::distance(log_groups.begin(), this)));
|
||||
if (dump_data != NULL)
|
||||
@ -1,21 +0,0 @@
|
||||
--- src/torrent/utils/log.h.orig 2012-04-20 08:41:43.000000000 +0200
|
||||
+++ src/torrent/utils/log.h 2014-02-02 18:40:40.000000000 +0100
|
||||
@@ -124,15 +124,15 @@
|
||||
|
||||
#define lt_log_print(log_group, ...) \
|
||||
if (torrent::log_groups[log_group].valid()) \
|
||||
- torrent::log_groups[log_group].internal_print(NULL, NULL, NULL, NULL, __VA_ARGS__);
|
||||
+ torrent::log_groups[log_group].internal_print(NULL, NULL, NULL, 0, __VA_ARGS__);
|
||||
|
||||
#define lt_log_print_info(log_group, log_info, log_subsystem, ...) \
|
||||
if (torrent::log_groups[log_group].valid()) \
|
||||
- torrent::log_groups[log_group].internal_print(&log_info->hash(), log_subsystem, NULL, NULL, __VA_ARGS__);
|
||||
+ torrent::log_groups[log_group].internal_print(&log_info->hash(), log_subsystem, NULL, 0, __VA_ARGS__);
|
||||
|
||||
#define lt_log_print_data(log_group, log_data, log_subsystem, ...) \
|
||||
if (torrent::log_groups[log_group].valid()) \
|
||||
- torrent::log_groups[log_group].internal_print(&log_data->hash(), log_subsystem, NULL, NULL, __VA_ARGS__);
|
||||
+ torrent::log_groups[log_group].internal_print(&log_data->hash(), log_subsystem, NULL, 0, __VA_ARGS__);
|
||||
|
||||
#define lt_log_print_dump(log_group, log_dump_data, log_dump_size, ...) \
|
||||
if (torrent::log_groups[log_group].valid()) \
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
@ -52,16 +52,16 @@ include/torrent/tracker_list.h
|
||||
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
|
||||
@dirrmtry include/torrent/utils
|
||||
@dirrmtry include/torrent/peer
|
||||
|
||||
@ -1,64 +0,0 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= rtorrent-devel
|
||||
PORTVERSION= 0.9.3
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= net-p2p
|
||||
MASTER_SITES= http://libtorrent.rakshasa.no/downloads/
|
||||
DISTNAME= ${PORTNAME:S/-devel//}-${PORTVERSION}
|
||||
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
COMMENT= BitTorrent Client written in C++ (development version)
|
||||
|
||||
BUILD_DEPENDS= libtorrent-devel=0.13.3_2:${PORTSDIR}/net-p2p/libtorrent-devel
|
||||
RUN_DEPENDS= libtorrent-devel=0.13.3_2:${PORTSDIR}/net-p2p/libtorrent-devel
|
||||
LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
|
||||
|
||||
CONFLICTS= rtorrent-[0-9]*
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USES= pkgconfig
|
||||
LDFLAGS+= -pthread
|
||||
CONFIGURE_ARGS= --disable-debug
|
||||
|
||||
SUB_FILES= pkg-message
|
||||
|
||||
PORTDOCS= README
|
||||
|
||||
OPTIONS_DEFINE= XMLRPC IPV6 DOCS
|
||||
OPTIONS_DEFAULT= XMLRPC
|
||||
XMLRPC_DESC= Compile with xmlrpc-c support
|
||||
|
||||
.include <bsd.port.options.mk>
|
||||
|
||||
.if ${ARCH} == arm
|
||||
BROKEN= Does not configure on arm
|
||||
.endif
|
||||
|
||||
# Workaround to build and segfault on > 10.x
|
||||
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
|
||||
USE_GCC= yes
|
||||
LDFLAGS+= -lc++
|
||||
.endif
|
||||
|
||||
.if ${PORT_OPTIONS:MXMLRPC}
|
||||
CONFIGURE_ARGS+= --with-xmlrpc-c
|
||||
LIB_DEPENDS+= libxmlrpc.so:${PORTSDIR}/net/xmlrpc-c-devel
|
||||
.else
|
||||
CONFIGURE_ARGS+= --with-xmlrpc-c=no
|
||||
.endif
|
||||
|
||||
.if ${PORT_OPTIONS:MIPV6}
|
||||
CONFIGURE_ARGS+= --enable-ipv6
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/configure
|
||||
|
||||
post-install:
|
||||
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/rtorrent.rc ${STAGEDIR}${EXAMPLESDIR}
|
||||
${MKDIR} ${STAGEDIR}${DOCSDIR}
|
||||
${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
|
||||
|
||||
.include <bsd.port.mk>
|
||||
@ -1,2 +0,0 @@
|
||||
SHA256 (rtorrent-0.9.3.tar.gz) = 9e93ca41beb1afe74ad7ad8013e0d53ae3586c9b0e97263d722f721535cc7310
|
||||
SIZE (rtorrent-0.9.3.tar.gz) = 583311
|
||||
@ -1,11 +0,0 @@
|
||||
--- src/thread_base.cc.orig 2011-04-05 11:26:11.000000000 +0100
|
||||
+++ src/thread_base.cc 2011-06-09 18:59:41.375670521 +0100
|
||||
@@ -61,7 +61,7 @@
|
||||
|
||||
static const unsigned int max_size = 32;
|
||||
|
||||
- thread_queue_hack() { std::memset(this, 0, sizeof(thread_queue_hack)); }
|
||||
+ thread_queue_hack() : m_lock(0) { std::memset(this, 0, sizeof(thread_queue_hack)); }
|
||||
|
||||
void lock() { while (!__sync_bool_compare_and_swap(&m_lock, 0, 1)) usleep(0); }
|
||||
void unlock() { __sync_bool_compare_and_swap(&m_lock, 1, 0); }
|
||||
@ -1,8 +0,0 @@
|
||||
------------------------------------------------------------------
|
||||
An example configuration file for rtorrent has been installed in
|
||||
%%EXAMPLESDIR%%. Read it for more information on
|
||||
how to tweak rtorrent configuration.
|
||||
|
||||
Note that there are hash performance issues on *BSD:
|
||||
- http://libtorrent.rakshasa.no/wiki/RTorrentPerformanceTuning
|
||||
------------------------------------------------------------------
|
||||
@ -1,11 +0,0 @@
|
||||
Rtorrent is a ncurses BitTorrent Client written in C++ for *nix.
|
||||
|
||||
Main Features are :
|
||||
* Use an URL or file path to add torrents at runtime
|
||||
* Stop/delete/resume torrents
|
||||
* Optionally loads/saves/deletes torrents automatically in a session directory
|
||||
* Safe fast resume support
|
||||
* Peer's download speed calculated from incoming HAVE messages
|
||||
* Peer download progress
|
||||
|
||||
WWW: http://libtorrent.rakshasa.no/
|
||||
@ -1,3 +0,0 @@
|
||||
bin/rtorrent
|
||||
%%EXAMPLESDIR%%/rtorrent.rc
|
||||
@dirrm %%EXAMPLESDIR%%
|
||||
@ -1,20 +1,17 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME?= rtorrent
|
||||
PORTVERSION= 0.9.2
|
||||
PORTREVISION= 5
|
||||
PORTNAME= rtorrent
|
||||
PORTVERSION= 0.9.4
|
||||
CATEGORIES= net-p2p
|
||||
MASTER_SITES= http://libtorrent.rakshasa.no/downloads/
|
||||
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
COMMENT= BitTorrent Client written in C++
|
||||
|
||||
BUILD_DEPENDS= libtorrent=0.13.2_3:${PORTSDIR}/net-p2p/libtorrent
|
||||
RUN_DEPENDS= libtorrent=0.13.2_3:${PORTSDIR}/net-p2p/libtorrent
|
||||
BUILD_DEPENDS= libtorrent=0.13.4:${PORTSDIR}/net-p2p/libtorrent
|
||||
RUN_DEPENDS= libtorrent=0.13.4:${PORTSDIR}/net-p2p/libtorrent
|
||||
LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
|
||||
|
||||
CONFLICTS= rtorrent-devel-[0-9]*
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USES= pkgconfig
|
||||
LDFLAGS+= -pthread
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (rtorrent-0.9.2.tar.gz) = 5c8f8c780bee376afce3c1cde2f5ecb928f40bac23b2b8171deed5cf3c888c3d
|
||||
SIZE (rtorrent-0.9.2.tar.gz) = 591837
|
||||
SHA256 (rtorrent-0.9.4.tar.gz) = bc0a2c1ee613b68f37021beaf4e64a9252f91ed06f998c1e897897c354ce7e84
|
||||
SIZE (rtorrent-0.9.4.tar.gz) = 601913
|
||||
|
||||
Loading…
Reference in New Issue
Block a user