Changeset 26664


Ignore:
Timestamp:
2011-04-14T22:49:19+02:00 (7 years ago)
Author:
luka
Message:

downgrade libtorrent and rtorrent; rtorrent crashes only solution was to use stable and not svn version (8733)

Location:
packages
Files:
1 added
5 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • packages/libs/libtorrent/Makefile

    r26652 r26664  
    99 
    1010PKG_NAME:=libtorrent 
    11 PKG_REV:=1209 
    12 PKG_VERSION:=0.12.6_r$(PKG_REV) 
     11PKG_VERSION:=0.12.6 
    1312PKG_RELEASE:=1 
    1413 
    15 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    16 PKG_SOURCE_URL:=svn://rakshasa.no/libtorrent/trunk/libtorrent 
    17 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) 
    18 PKG_SOURCE_VERSION:=$(PKG_REV) 
    19 PKG_SOURCE_PROTO:=svn 
     14PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     15PKG_SOURCE_URL:=http://libtorrent.rakshasa.no/downloads 
     16PKG_MD5SUM:=037499ed708aaf72988cee60e5a8d96b 
    2017 
    2118PKG_FIXUP:=libtool 
     19PKG_BUILD_PARALLEL:=1 
    2220PKG_INSTALL:=1 
    2321 
    … …  
    3432 
    3533define Package/libtorrent/description 
    36  LibTorrent is a BitTorrent library written in C++ for *nix, with a focus 
    37  on high performance and good code. The library differentiates itself from 
    38  other implementations by transfering directly from file pages to the 
    39  network stack. On high-bandwidth connections it is able to seed at 3 times 
    40  the speed of the official client. 
     34 LibTorrent is a BitTorrent library written in C++ for *nix, with a focus on 
     35 high performance and good code. The library differentiates itself from other 
     36 implementations by transfering directly from file pages to the network stack. 
     37 On high-bandwidth connections it is able to seed at 3 times the speed of the 
     38 official client. 
    4139endef 
    4240 
    … …  
    5250 
    5351define Build/Configure 
    54         (cd $(PKG_BUILD_DIR); ./autogen.sh ); 
     52        ( cd $(PKG_BUILD_DIR); ./autogen.sh ); 
    5553        $(call Build/Configure/Default) 
    5654endef 
    … …  
    7169 
    7270$(eval $(call BuildPackage,libtorrent)) 
    73  

  • packages/libs/libtorrent/patches/100-fix_cross_compile.patch

    r26652 r26664  
    1 Index: libtorrent-0.12.6_r1209/configure.ac 
     1Index: libtorrent-0.12.6/scripts/checks.m4 
    22=================================================================== 
    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 
    5 @@ -17,7 +17,6 @@ 
     3--- libtorrent-0.12.6.orig/scripts/checks.m4 
     4+++ libtorrent-0.12.6/scripts/checks.m4 
     5@@ -96,7 +96,7 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [ 
     6 AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [ 
     7   AC_MSG_CHECKING(whether kqueue supports pipes and ptys) 
    68  
    7  AM_INIT_AUTOMAKE 
    8  AM_CONFIG_HEADER(config.h) 
    9 -AM_PATH_CPPUNIT(1.9.6) 
    10  AC_DISABLE_STATIC 
     9-  AC_RUN_IFELSE( 
     10+  AC_LINK_IFELSE( 
     11     [[#include <fcntl.h> 
     12       #include <stdlib.h> 
     13       #include <unistd.h> 
     14Index: libtorrent-0.12.6/scripts/common.m4 
     15=================================================================== 
     16--- libtorrent-0.12.6.orig/scripts/common.m4 
     17+++ libtorrent-0.12.6/scripts/common.m4 
     18@@ -184,7 +184,7 @@ AC_DEFUN([TORRENT_CHECK_MADVISE], [ 
     19 AC_DEFUN([TORRENT_CHECK_EXECINFO], [ 
     20   AC_MSG_CHECKING(for execinfo.h) 
    1121  
    12  AM_DISABLE_STATIC 
    13 @@ -118,5 +117,4 @@ 
    14         src/protocol/Makefile 
    15         src/tracker/Makefile 
    16         src/utils/Makefile 
    17 -        test/Makefile 
    18  ]) 
    19 Index: 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 
    23 @@ -1,4 +1,4 @@ 
    24 -SUBDIRS = src test 
    25 +SUBDIRS = src 
     22-  AC_RUN_IFELSE( 
     23+  AC_LINK_IFELSE( 
     24     [[#include <execinfo.h> 
     25       int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} 
     26     ]], 
     27@@ -199,7 +199,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ 
     28 AC_DEFUN([TORRENT_CHECK_ALIGNED], [ 
     29   AC_MSG_CHECKING(the byte alignment) 
    2630  
    27  pkgconfigdir = $(libdir)/pkgconfig 
    28  pkgconfig_DATA = libtorrent.pc 
     31-  AC_RUN_IFELSE( 
     32+  AC_LINK_IFELSE( 
     33     [[#include <inttypes.h> 
     34       int main() { 
     35         char buf[8] = { 0, 0, 0, 0, 1, 0, 0, 0 }; 

  • packages/libs/libtorrent/patches/120-fix-ipv6_socket_datagram.patch

    r26652 r26664  
    1 Index: libtorrent-0.12.6_r1209/src/net/socket_datagram.cc 
     1Index: libtorrent-0.12.6/src/net/socket_datagram.cc 
    22=================================================================== 
    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 @@ 
     3--- libtorrent-0.12.6.orig/src/net/socket_datagram.cc 
     4+++ libtorrent-0.12.6/src/net/socket_datagram.cc 
     5@@ -73,6 +73,23 @@ SocketDatagram::write_datagram(const voi 
    66   int r; 
    77  

  • packages/net/rtorrent/Makefile

    r26652 r26664  
    99 
    1010PKG_NAME:=rtorrent 
    11 PKG_REV:=1209 
    12 PKG_VERSION:=0.8.6_r$(PKG_REV) 
     11PKG_VERSION:=0.8.6 
    1312PKG_RELEASE:=1 
    1413 
    15 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    16 PKG_SOURCE_URL:=svn://rakshasa.no/libtorrent/trunk/rtorrent 
    17 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) 
    18 PKG_SOURCE_VERSION:=$(PKG_REV) 
    19 PKG_SOURCE_PROTO:=svn 
     14PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     15PKG_SOURCE_URL:=http://libtorrent.rakshasa.no/downloads 
     16PKG_MD5SUM:=b804c45c01c40312926bcea6b55bb084 
    2017 
    2118PKG_FIXUP:=libtool 
     19PKG_BUILD_PARALLEL:=1 
    2220PKG_INSTALL:=1 
    2321 
    … …  
    3634define Package/rtorrent/description 
    3735 rTorrent is a BitTorrent client for ncurses, using the libtorrent library. 
    38  The client and library are written in C++ with emphasis on speed and 
    39  efficiency, while delivering equivalent features to those found in GUI 
    40  based clients in an ncurses client. 
     36 The client and library is written in C++ with emphasis on speed and 
     37 efficiency, while delivering equivalent features to those found in GUI based 
     38 clients in an ncurses client.  
    4139endef 
    4240 

  • packages/net/rtorrent/patches/120-fix-ncurses.patch

    r26653 r26664  
    1 Index: rtorrent-0.8.6_r1209/src/display/canvas.h 
     1Index: rtorrent-0.8.6/src/display/canvas.h 
    22=================================================================== 
    3 --- rtorrent-0.8.6_r1209.orig/src/display/canvas.h      2011-04-13 17:29:03.218889497 +0200 
    4 +++ rtorrent-0.8.6_r1209/src/display/canvas.h   2011-04-13 17:29:22.814923068 +0200 
    5 @@ -48,7 +48,7 @@ 
     3--- rtorrent-0.8.6.orig/src/display/canvas.h 
     4+++ rtorrent-0.8.6/src/display/canvas.h 
     5@@ -48,7 +48,7 @@ class Canvas { 
    66 public: 
    77   typedef std::vector<Attributes> attributes_list; 
    88  
    9 -  Canvas(int x = 0, int y = 0, int width = 0, int height = 0); 
    10 +  Canvas(int x = 0, int y = 0, int width = 1, int height = 1); 
     9-  Canvas(int x = 0, int y = 0, int width = 0, int height = 0) : 
     10+  Canvas(int x = 0, int y = 0, int width = 1, int height = 1) : 
     11     m_window(newwin(height, width, y, x)) {} 
    1112   ~Canvas() { delwin(m_window); } 
    1213  
    13    void                refresh()                                               { wnoutrefresh(m_window); } 
Note: See TracChangeset for help on using the changeset viewer.