Update of /cvsroot/fink/experimental/fangism/finkinfo In directory vz-cvs-3.sog:/tmp/cvs-serv25785
Modified Files: rtorrent.info libtorrent12.info Added Files: libtorrent12.patch Log Message: upstream update 0.8.9/0.12.9, work-in-progress, some porting needed Index: libtorrent12.info =================================================================== RCS file: /cvsroot/fink/experimental/fangism/finkinfo/libtorrent12.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- libtorrent12.info 27 May 2010 01:34:32 -0000 1.3 +++ libtorrent12.info 22 Jun 2011 06:36:52 -0000 1.4 @@ -1,5 +1,5 @@ Package: libtorrent12 -Version: 0.12.6 +Version: 0.12.9 Revision: 1 License: GPL HomePage: http://libtorrent.rakshasa.no @@ -13,9 +13,12 @@ Replaces: libtorrent, libtorrent11 Source: http://libtorrent.rakshasa.no/downloads/libtorrent-%v.tar.gz -Source-MD5: 037499ed708aaf72988cee60e5a8d96b +Source-MD5: b128bbd324f03eb42ef5060080f87548 # Source-SHA1: bf7082f98bd6281493cba94a456697fb88c2c21b +PatchFile: %n.patch +PatchFile-MD5: 2e29651119c128f5c0fd63ddef4db687 + #PKG_CONFIG_PATH: %p/lib/system-openssl/lib/pkgconfig BuildDependsOnly: true Index: rtorrent.info =================================================================== RCS file: /cvsroot/fink/experimental/fangism/finkinfo/rtorrent.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- rtorrent.info 8 May 2010 06:17:58 -0000 1.2 +++ rtorrent.info 22 Jun 2011 06:36:52 -0000 1.3 @@ -1,5 +1,5 @@ Package: rtorrent -Version: 0.8.6 +Version: 0.8.9 Revision: 1 License: GPL HomePage: http://libtorrent.rakshasa.no @@ -11,7 +11,7 @@ libsigc++2-shlibs, libcurl4-shlibs (>= 7.12.0-1), libncursesw5-shlibs, - libtorrent12-shlibs (>= 0.12.6-1) + libtorrent12-shlibs (>= 0.12.9-1) << BuildDepends: << libssh2.1, @@ -19,12 +19,12 @@ libcurl4 (>= 7.12.0-1), pkgconfig (>= 0.9-1), libncursesw5, - libtorrent12 (>= 0.12.6-1) + libtorrent12 (>= 0.12.9-1) << BuildConflicts: openssl-dev, openssl097-dev, openssl098-dev Source: http://libtorrent.rakshasa.no/downloads/%n-%v.tar.gz -Source-MD5: b804c45c01c40312926bcea6b55bb084 +Source-MD5: 629247636cb1210663b52dadbd040a6c # Source-SHA1: ffce3959ba91738bb444d689db3db1e2375b14ce GCC: 4.0 --- NEW FILE: libtorrent12.patch --- --- libtorrent-0.12.9-orig/rak/allocators.h 2011-06-21 22:37:15.000000000 -0700 +++ libtorrent-0.12.9/rak/allocators.h 2011-06-21 22:42:44.000000000 -0700 @@ -77,8 +77,15 @@ static pointer alloc_size(size_type size) { pointer ptr = NULL; +#ifdef HAVE_POSIX_MEMALIGN int __UNUSED result = posix_memalign((void**)&ptr, LT_SMP_CACHE_BYTES, size); +#elif defined(__APPLE__) + // apple-darwin's malloc is already Altivec-aligned (16B) + ptr = static_cast<pointer>(malloc(size)); +#else +#error "Missing equivalent of posix_memalign()." +#endif return ptr; } --- libtorrent-0.12.9-orig/src/torrent/thread_base.h 2011-06-21 23:12:25.000000000 -0700 +++ libtorrent-0.12.9/src/torrent/thread_base.h 2011-06-21 23:33:19.000000000 -0700 @@ -37,6 +37,19 @@ #ifndef LIBTORRENT_THREAD_BASE_H #define LIBTORRENT_THREAD_BASE_H +#if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2)) +#if defined(__APPLE__) +#define USE_DARWIN_ATOMICS +#endif +#endif + +#ifdef USE_DARWIN_ATOMICS +#include <libkern/OSAtomic.h> +#define __sync_add_and_fetch(x, y) OSAtomicIncrement32Barrier(x) +#define __sync_sub_and_fetch(x, y) OSAtomicDecrement32Barrier(x) +#define __sync_lock_test_and_set(x, y) OSAtomicTestAndSetBarrier(y, x) +#endif + #include <pthread.h> #include <sys/types.h> #include <torrent/common.h> ------------------------------------------------------------------------------ Simplify data backup and recovery for your virtual environment with vRanger. Installation's a snap, and flexible recovery options mean your data is safe, secure and there when you need it. Data protection magic? Nope - It's vRanger. Get your free trial download today. http://p.sf.net/sfu/quest-sfdev2dev _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs