Changeset 26652


Ignore:
Timestamp:
2011-04-14T00:07:14+02:00 (6 years ago)
Author:
luka
Message:

upgrade libtorrent and rtorrent

Location:
packages
Files:
5 edited
4 moved

Legend:

Unmodified
Added
Removed
  • packages/libs/libtorrent/Makefile

    r25822 r26652  
    11# 
    2 # Copyright (C) 2007-2010 OpenWrt.org 
     2# Copyright (C) 2007-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=libtorrent 
    11 PKG_REV:=1189 
     11PKG_REV:=1209 
    1212PKG_VERSION:=0.12.6_r$(PKG_REV) 
    13 PKG_RELEASE:=3 
     13PKG_RELEASE:=1 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
     
    3030  URL:=http://libtorrent.rakshasa.no/ 
    3131  DEPENDS:=+libopenssl +libsigcxx @!LINUX_2_4 
     32  MAINTAINER:=Luka Perkov <openwrt@lukaperkov.net> 
    3233endef 
    3334 
     
    4041endef 
    4142 
    42 ifneq ($(CONFIG_GCC_VERSION_3_4)$(CONFIG_GCC_VERSION_4_1),) 
    43   TARGET_CPPFLAGS += -fno-strict-aliasing 
    44 endif 
    45  
    46 TARGET_CPPFLAGS += -fno-inline 
     43TARGET_CPPFLAGS += -fno-strict-aliasing -fno-inline 
    4744TARGET_LDFLAGS += $(LIBGCC_S) 
    4845 
    49 # XXX: rtorrent needs encryption (--enable-openssl) 
    5046CONFIGURE_ARGS+= \ 
    5147        --enable-shared \ 
  • packages/libs/libtorrent/patches/100-fix_cross_compile.patch

    r21296 r26652  
    1 --- a/configure.ac 
    2 +++ b/configure.ac 
     1Index: libtorrent-0.12.6_r1209/configure.ac 
     2=================================================================== 
     3--- libtorrent-0.12.6_r1209.orig/configure.ac   2011-03-27 12:23:16.000000000 +0200 
     4+++ libtorrent-0.12.6_r1209/configure.ac        2011-04-13 16:33:17.487339738 +0200 
    35@@ -17,7 +17,6 @@ 
    46  
     
    911  
    1012 AM_DISABLE_STATIC 
    11 @@ -117,5 +116,4 @@ 
     13@@ -118,5 +117,4 @@ 
    1214        src/protocol/Makefile 
    1315        src/tracker/Makefile 
     
    1517-        test/Makefile 
    1618 ]) 
    17 --- a/Makefile.am 
    18 +++ b/Makefile.am 
     19Index: libtorrent-0.12.6_r1209/Makefile.am 
     20=================================================================== 
     21--- libtorrent-0.12.6_r1209.orig/Makefile.am    2010-03-01 20:04:58.000000000 +0100 
     22+++ libtorrent-0.12.6_r1209/Makefile.am 2011-04-13 16:33:17.487339738 +0200 
    1923@@ -1,4 +1,4 @@ 
    2024-SUBDIRS = src test 
  • packages/libs/libtorrent/patches/110-fix-no-posix_memalign.patch

    r26651 r26652  
    1 --- a/rak/allocators.h 
    2 +++ b/rak/allocators.h 
    3 @@ -74,17 +74,13 @@ public: 
     1Index: libtorrent-0.12.6_r1209/rak/allocators.h 
     2=================================================================== 
     3--- libtorrent-0.12.6_r1209.orig/rak/allocators.h       2010-11-10 12:40:28.000000000 +0100 
     4+++ libtorrent-0.12.6_r1209/rak/allocators.h    2011-04-13 16:33:28.179339669 +0200 
     5@@ -74,17 +74,13 @@ 
    46   size_type max_size () const throw() { return std::numeric_limits<size_t>::max() / sizeof(T); } 
    57  
     
    2224  
    2325  
    24 @@ -98,6 +94,36 @@ bool operator!= (const cacheline_allocator<T1>&, const cacheline_allocator<T2>&) 
     26@@ -98,6 +94,36 @@ 
    2527   return false; 
    2628 } 
  • packages/libs/libtorrent/patches/120-fix-ipv6_socket_datagram.patch

    r26651 r26652  
    1 --- a/src/net/socket_datagram.cc 
    2 +++ b/src/net/socket_datagram.cc 
    3 @@ -73,6 +73,23 @@ SocketDatagram::write_datagram(const voi 
     1Index: libtorrent-0.12.6_r1209/src/net/socket_datagram.cc 
     2=================================================================== 
     3--- libtorrent-0.12.6_r1209.orig/src/net/socket_datagram.cc     2008-07-05 14:13:12.000000000 +0200 
     4+++ libtorrent-0.12.6_r1209/src/net/socket_datagram.cc  2011-04-13 16:33:33.266840379 +0200 
     5@@ -73,6 +73,23 @@ 
    46   int r; 
    57  
  • packages/libs/libtorrent/patches/121-fix-socket_set-template.patch

    r26651 r26652  
    1 --- a/src/net/socket_set.h 
    2 +++ b/src/net/socket_set.h 
    3 @@ -53,12 +53,12 @@ namespace torrent { 
     1Index: libtorrent-0.12.6_r1209/src/net/socket_set.h 
     2=================================================================== 
     3--- libtorrent-0.12.6_r1209.orig/src/net/socket_set.h   2011-02-12 13:20:09.000000000 +0100 
     4+++ libtorrent-0.12.6_r1209/src/net/socket_set.h        2011-04-13 16:33:38.567388959 +0200 
     5@@ -53,12 +53,12 @@ 
    46  
    57 // Propably should rename to EventSet... 
  • packages/libs/libtorrent/patches/122-fix-uintptr_t-use.patch

    r22628 r26652  
    1 fix the following build error on octeon & ppc 
    2  
    3 In file included from ../../rak/priority_queue_default.h:41, 
    4                  from ./../dht/dht_router.h:40, 
    5                  from tracker_dht.cc:42: 
    6 ../../rak/allocators.h: In static member function 'static T* rak::cacheline_allocator<T>::alloc_size(size_t)': 
    7 ../../rak/allocators.h:109: error: 'uintptr_t' was not declared in this scope 
    8  
    9 --- a/rak/allocators.h 
    10 +++ b/rak/allocators.h 
     1Index: libtorrent-0.12.6_r1209/rak/allocators.h 
     2=================================================================== 
     3--- libtorrent-0.12.6_r1209.orig/rak/allocators.h       2011-04-13 16:33:28.179339669 +0200 
     4+++ libtorrent-0.12.6_r1209/rak/allocators.h    2011-04-13 16:33:48.454840573 +0200 
    115@@ -41,6 +41,7 @@ 
    126  
  • packages/net/rtorrent/Makefile

    r25267 r26652  
    11# 
    2 # Copyright (C) 2007-2010 OpenWrt.org 
     2# Copyright (C) 2007-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
    55# See /LICENSE for more information. 
    6 # 
    76# 
    87 
     
    109 
    1110PKG_NAME:=rtorrent 
    12 PKG_REV:=1189 
     11PKG_REV:=1209 
    1312PKG_VERSION:=0.8.6_r$(PKG_REV) 
    14 PKG_RELEASE:=2 
     13PKG_RELEASE:=1 
    1514 
    1615PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
     
    3231  URL:=http://libtorrent.rakshasa.no/ 
    3332  DEPENDS:=+libcurl +libtorrent +libncurses +libsigcxx +xmlrpc-c-server +libpthread 
     33  MAINTAINER:=Luka Perkov <openwrt@lukaperkov.net> 
    3434endef 
    3535 
     
    4141endef 
    4242 
    43 ifneq ($(CONFIG_GCC_VERSION_3_4)$(CONFIG_GCC_VERSION_4_1),) 
    44 TARGET_CPPFLAGS += -fno-strict-aliasing 
    45 endif 
    46  
     43TARGET_CPPFLAGS += -fno-strict-aliasing -fno-inline 
    4744TARGET_LDFLAGS += -lpthread -Wl,-rpath-link=$(STAGING_DIR)/usr/lib 
    4845 
     
    5451 
    5552define Build/Configure 
    56         (cd $(PKG_BUILD_DIR); ./autogen.sh ); 
     53        ( cd $(PKG_BUILD_DIR); ./autogen.sh ); 
    5754        $(call Build/Configure/Default) 
    5855endef 
  • packages/net/rtorrent/patches/100-fix_cross_compile.patch

    r21299 r26652  
    1 --- a/configure.ac 
    2 +++ b/configure.ac 
     1Index: rtorrent-0.8.6_r1209/configure.ac 
     2=================================================================== 
     3--- rtorrent-0.8.6_r1209.orig/configure.ac      2010-10-05 05:36:14.000000000 +0200 
     4+++ rtorrent-0.8.6_r1209/configure.ac   2011-04-13 16:29:48.619340344 +0200 
    35@@ -2,7 +2,6 @@ 
    46  
     
    1517-        test/Makefile 
    1618 ]) 
    17 --- a/Makefile.am 
    18 +++ b/Makefile.am 
     19Index: rtorrent-0.8.6_r1209/Makefile.am 
     20=================================================================== 
     21--- rtorrent-0.8.6_r1209.orig/Makefile.am       2010-03-19 10:33:25.000000000 +0100 
     22+++ rtorrent-0.8.6_r1209/Makefile.am    2011-04-13 16:29:48.619340344 +0200 
    1923@@ -1,7 +1,4 @@ 
    2024-SUBDIRS = \ 
     
    2630 EXTRA_DIST= \ 
    2731        autogen.sh \ 
    28 --- a/scripts/common.m4 
    29 +++ b/scripts/common.m4 
    30 @@ -209,7 +209,7 @@ dnl   Need to fix this so that it uses t 
     32Index: rtorrent-0.8.6_r1209/scripts/common.m4 
     33=================================================================== 
     34--- rtorrent-0.8.6_r1209.orig/scripts/common.m4 2009-12-19 22:36:44.000000000 +0100 
     35+++ rtorrent-0.8.6_r1209/scripts/common.m4      2011-04-13 16:29:48.619340344 +0200 
     36@@ -209,7 +209,7 @@ 
    3137 AC_DEFUN([TORRENT_CHECK_EXECINFO], [ 
    3238   AC_MSG_CHECKING(for execinfo.h) 
  • packages/net/rtorrent/patches/110-fix-no-posix_memalign.patch

    r26651 r26652  
    1 diff --git a/rak/allocators.h b/rak/allocators.h 
    2 index 0a1b711..2d7b98e 100644 
    3 --- a/rak/allocators.h 
    4 +++ b/rak/allocators.h 
     1Index: rtorrent-0.8.6_r1209/rak/allocators.h 
     2=================================================================== 
     3--- rtorrent-0.8.6_r1209.orig/rak/allocators.h  2010-11-10 12:40:28.000000000 +0100 
     4+++ rtorrent-0.8.6_r1209/rak/allocators.h       2011-04-13 16:30:02.370840196 +0200 
    55@@ -42,6 +42,7 @@ 
    66 #include <cstddef> 
     
    1111  
    1212 namespace rak { 
    13 @@ -74,17 +75,13 @@ public: 
     13@@ -74,17 +75,13 @@ 
    1414   size_type max_size () const throw() { return std::numeric_limits<size_t>::max() / sizeof(T); } 
    1515  
     
    3232  
    3333  
    34 @@ -98,6 +95,36 @@ bool operator!= (const cacheline_allocator<T1>&, const cacheline_allocator<T2>&) 
     34@@ -98,6 +95,36 @@ 
    3535   return false; 
    3636 } 
Note: See TracChangeset for help on using the changeset viewer.