Changeset 19651


Ignore:
Timestamp:
2010-02-16T04:06:27+01:00 (8 years ago)
Author:
swalker
Message:

[packages] rtorrent: update to 0.8.6_r1130 (#6685)

Location:
packages/net/rtorrent
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • packages/net/rtorrent/Makefile

    r19499 r19651  
    11# 
    2 # Copyright (C) 2007-2009 OpenWrt.org 
     2# Copyright (C) 2007-2010 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010 
    1111PKG_NAME:=rtorrent 
     12PKG_REV:=1130 
     13PKG_VERSION:=0.8.6_r$(PKG_REV) 
     14PKG_RELEASE:=1 
    1215 
    13 PKG_REV:=1123 
    14 PKG_VERSION:=0.8.6_r$(PKG_REV) 
    15 PKG_RELEASE:=2 
    16 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     16PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1717PKG_SOURCE_URL:=svn://rakshasa.no/libtorrent/trunk/rtorrent 
    1818PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) 
     
    2020PKG_SOURCE_PROTO:=svn 
    2121 
    22 PKG_FIXUP = libtool 
     22PKG_FIXUP:=libtool 
     23PKG_INSTALL:=1 
    2324 
    2425include $(INCLUDE_DIR)/package.mk 
     
    3031  TITLE:=BitTorrent client for ncurses 
    3132  URL:=http://libtorrent.rakshasa.no/ 
    32   DEPENDS:=+libcurl +libtorrent +libncurses +libsigcxx +xmlrpc-c 
     33  DEPENDS:=+libcurl +libtorrent +libncurses +libsigcxx +xmlrpc-c +libpthread 
    3334endef 
    3435 
     
    4445endif 
    4546 
     47TARGET_LDFLAGS += -lpthread 
     48 
    4649CONFIGURE_ARGS+= \ 
    4750        --enable-shared \ 
     
    5558endef 
    5659 
    57 define Build/Compile 
    58         $(MAKE) -C $(PKG_BUILD_DIR) \ 
    59                 DESTDIR="$(PKG_INSTALL_DIR)" \ 
    60                 all install 
    61 endef 
    62  
    6360define Package/rtorrent/install 
    6461        $(INSTALL_DIR) $(1)/usr/bin 
    65         $(CP) $(PKG_INSTALL_DIR)/usr/bin/rtorrent $(1)/usr/bin/ 
     62        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rtorrent $(1)/usr/bin/ 
    6663endef 
    6764 
  • packages/net/rtorrent/patches/100-fix_cross_compile.patch

    r18553 r19651  
    1 diff -durN a/scripts/common.m4 b/scripts/common.m4 
    2 --- a/scripts/common.m4 2009-11-13 10:44:23.000000000 +0300 
    3 +++ b/scripts/common.m4 2009-11-05 11:20:35.000000000 +0300 
    4 @@ -184,7 +183,7 @@ 
     1--- a/scripts/common.m4 
     2+++ b/scripts/common.m4 
     3@@ -209,7 +209,7 @@ dnl   Need to fix this so that it uses t 
    54 AC_DEFUN([TORRENT_CHECK_EXECINFO], [ 
    65   AC_MSG_CHECKING(for execinfo.h) 
  • packages/net/rtorrent/patches/110-fix-no-posix_memalign.diff

    r19499 r19651  
    1 Index: rtorrent/rak/allocators.h 
    2 =================================================================== 
    3 --- rtorrent/rak/allocators.h   (revision 1121) 
    4 +++ rtorrent/rak/allocators.h   (working copy) 
    5 @@ -74,17 +74,13 @@ 
     1--- a/rak/allocators.h 
     2+++ b/rak/allocators.h 
     3@@ -42,6 +42,7 @@ 
     4 #include <cstddef> 
     5 #include <limits> 
     6 #include <stdlib.h> 
     7+#include <stdint.h> 
     8 #include <sys/types.h> 
     9  
     10 namespace rak { 
     11@@ -74,17 +75,13 @@ public: 
    612   size_type max_size () const throw() { return std::numeric_limits<size_t>::max() / sizeof(T); } 
    713  
     
    1218-    pointer ptr = NULL; 
    1319-    int __UNUSED result = posix_memalign((void**)&ptr, LT_SMP_CACHE_BYTES, size); 
     20- 
     21-    return ptr; 
     22-  } 
    1423+  static pointer alloc_size(size_type size); 
    1524+  static void dealloc_size(pointer p, size_type size); 
    1625  
    17 -    return ptr; 
    18 -  } 
    19 - 
    2026   void construct (pointer p, const T& value) { new((void*)p)T(value); } 
    2127   void destroy (pointer p) { p->~T(); } 
     
    2430  
    2531  
    26 @@ -98,8 +94,38 @@ 
     32@@ -98,6 +95,36 @@ bool operator!= (const cacheline_allocat 
    2733   return false; 
    2834 } 
     
    4753+ 
    4854+  return ptr; 
    49  } 
    50   
     55+} 
     56+ 
    5157+template <class T> 
    5258+inline void cacheline_allocator<T>::dealloc_size(pointer p, size_type size) { 
     
    5864+} 
    5965+ 
    60 +} 
    61 + 
     66 } 
     67  
    6268 // 
    63  // Operator new with custom allocators: 
    64  // 
Note: See TracChangeset for help on using the changeset viewer.