[87569] trunk/dports/net/libtorrent-rasterbar
devans at macports.org
devans at macports.org
Fri Nov 25 18:11:34 PST 2011
Revision: 87569
http://trac.macports.org/changeset/87569
Author: devans at macports.org
Date: 2011-11-25 18:11:29 -0800 (Fri, 25 Nov 2011)
Log Message:
-----------
libtorrent-rasterbar: update to version 0.15.9.
Modified Paths:
--------------
trunk/dports/net/libtorrent-rasterbar/Portfile
Added Paths:
-----------
trunk/dports/net/libtorrent-rasterbar/files/patch-configure.diff
Removed Paths:
-------------
trunk/dports/net/libtorrent-rasterbar/files/patch-r6101-speeds-up-hashing.diff
Modified: trunk/dports/net/libtorrent-rasterbar/Portfile
===================================================================
--- trunk/dports/net/libtorrent-rasterbar/Portfile 2011-11-25 22:56:25 UTC (rev 87568)
+++ trunk/dports/net/libtorrent-rasterbar/Portfile 2011-11-26 02:11:29 UTC (rev 87569)
@@ -5,8 +5,7 @@
name libtorrent-rasterbar
conflicts libtorrent-rasterbar-devel
-version 0.15.8
-revision 2
+version 0.15.9
license permissive
categories net
maintainers devans openmaintainer
@@ -21,8 +20,8 @@
A C++ bittorrent library designed to run on anything from embedded systems to large scale \
seed servers. It comes with python bindings and detailed documentation.
-checksums sha1 9e21ebfa6fba19b237754a10ae9b8007781c48f0 \
- rmd160 a6ddd211afe8499c66c5e56c1d3eee26be01c235
+checksums sha1 d86eb9d4452d07715a355d3a67312f162d6eff3a \
+ rmd160 54461ff314af9602309a9a34a97cb481dc38179c
depends_build port:pkgconfig
@@ -30,8 +29,8 @@
port:libgeoip \
port:openssl
-patchfiles patch-bindings-python-setup.py.in.diff \
- patch-r6101-speeds-up-hashing.diff
+patchfiles patch-configure.diff \
+ patch-bindings-python-setup.py.in.diff
post-patch {
reinplace "s|__MP_BUILD_ARCH__|${build_arch}|" ${worksrcpath}/bindings/python/setup.py.in
Added: trunk/dports/net/libtorrent-rasterbar/files/patch-configure.diff
===================================================================
--- trunk/dports/net/libtorrent-rasterbar/files/patch-configure.diff (rev 0)
+++ trunk/dports/net/libtorrent-rasterbar/files/patch-configure.diff 2011-11-26 02:11:29 UTC (rev 87569)
@@ -0,0 +1,14 @@
+--- configure.orig 2011-11-20 17:11:14.000000000 -0800
++++ configure 2011-11-25 15:24:02.000000000 -0800
+@@ -18556,9 +18556,9 @@
+
+
+
+- PYTHON_PREFIX='${prefix}'
++ PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.prefix;'`
+
+- PYTHON_EXEC_PREFIX='${exec_prefix}'
++ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print sys.exec_prefix;'`
+
+
+
Deleted: trunk/dports/net/libtorrent-rasterbar/files/patch-r6101-speeds-up-hashing.diff
===================================================================
--- trunk/dports/net/libtorrent-rasterbar/files/patch-r6101-speeds-up-hashing.diff 2011-11-25 22:56:25 UTC (rev 87568)
+++ trunk/dports/net/libtorrent-rasterbar/files/patch-r6101-speeds-up-hashing.diff 2011-11-26 02:11:29 UTC (rev 87569)
@@ -1,93 +0,0 @@
-Index: src/file_pool.cpp
-===================================================================
---- src/file_pool.cpp (revision 6100)
-+++ src/file_pool.cpp (revision 6101)
-@@ -70,7 +70,8 @@
-
- if ((((e.mode & file::rw_mask) != file::read_write)
- && ((m & file::rw_mask) == file::read_write))
-- || (e.mode & file::no_buffer) != (m & file::no_buffer))
-+ || (e.mode & file::no_buffer) != (m & file::no_buffer)
-+ || (e.mode & file::random_access) != (m & file::random_access))
- {
- // close the file before we open it with
- // the new read/write privilages
-Index: src/file.cpp
-===================================================================
---- src/file.cpp (revision 6100)
-+++ src/file.cpp (revision 6101)
-@@ -172,19 +172,19 @@
- const static open_mode_t mode_array[] =
- {
- // read_only
-- {GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS},
-+ {GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, 0},
- // write_only
-- {GENERIC_WRITE, FILE_SHARE_READ, OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS},
-+ {GENERIC_WRITE, FILE_SHARE_READ, OPEN_ALWAYS, 0},
- // read_write
-- {GENERIC_WRITE | GENERIC_READ, FILE_SHARE_READ, OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS},
-+ {GENERIC_WRITE | GENERIC_READ, FILE_SHARE_READ, OPEN_ALWAYS, 0},
- // invalid option
- {0,0,0,0},
- // read_only no_buffer
-- {GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS | FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING },
-+ {GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING },
- // write_only no_buffer
-- {GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS | FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING },
-+ {GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, OPEN_ALWAYS, FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING },
- // read_write no_buffer
-- {GENERIC_WRITE | GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS | FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING },
-+ {GENERIC_WRITE | GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, OPEN_ALWAYS, FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING },
- // invalid option
- {0,0,0,0}
- };
-@@ -209,8 +209,11 @@
- open_mode_t const& m = mode_array[mode & mode_mask];
- DWORD a = attrib_array[(mode & attribute_mask) >> 12];
-
-+ DWORD extra_flags = ((mode & random_access) ? FILE_FLAG_RANDOM_ACCESS : 0)
-+ | (a ? a : FILE_ATTRIBUTE_NORMAL);
-+
- m_file_handle = CreateFile_(m_path.c_str(), m.rw_mode, m.share_mode, 0
-- , m.create_mode, m.flags | (a ? a : FILE_ATTRIBUTE_NORMAL), 0);
-+ , m.create_mode, m.flags | extra_flags, 0);
-
- if (m_file_handle == INVALID_HANDLE_VALUE)
- {
-@@ -272,8 +275,11 @@
- #endif
-
- #ifdef POSIX_FADV_RANDOM
-- // disable read-ahead
-- posix_fadvise(m_fd, 0, 0, POSIX_FADV_RANDOM);
-+ if (mode & random_access)
-+ {
-+ // disable read-ahead
-+ posix_fadvise(m_fd, 0, 0, POSIX_FADV_RANDOM);
-+ }
- #endif
-
- #endif
-Index: include/libtorrent/file.hpp
-===================================================================
---- include/libtorrent/file.hpp (revision 6100)
-+++ include/libtorrent/file.hpp (revision 6101)
-@@ -100,6 +100,7 @@
- no_buffer = 4,
- mode_mask = rw_mask | no_buffer,
- sparse = 8,
-+ random_access = 32,
-
- attribute_hidden = 0x1000,
- attribute_executable = 0x2000,
-Index: ChangeLog
-===================================================================
---- ChangeLog (revision 6100)
-+++ ChangeLog (revision 6101)
-@@ -1,3 +1,5 @@
-+ * don't open files in random-access mode (speeds up hashing)
-+
- 0.15.8 release
-
- * allow NULL to be passed to create_torrent::set_comment and create_torrent::set_creator
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111125/3074680e/attachment.html>
More information about the macports-changes
mailing list