Ticket #8382: packages.patch

File packages.patch, 6.1 KB (added by Prizoff, 7 years ago)

updates versions to rtorrent-0.8.7_1189, libtorrent-0.12.7_1189, libsigc++-2.2.8, xmlrpc-c-1.24.4_2055

  • net/rtorrent/patches/110-fix-no-posix_memalign.diff

     
    1010 #include <sys/types.h> 
    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  
    1616   pointer allocate(size_type num, const_void_pointer hint = 0) { return alloc_size(num*sizeof(T)); } 
    17 +  void deallocate (pointer p, size_type num) { dealloc_size(p, num*sizeof(T)); } 
    18   
     17- 
    1918-  static pointer alloc_size(size_type size) { 
    2019-    pointer ptr = NULL; 
    2120-    int __UNUSED result = posix_memalign((void**)&ptr, LT_SMP_CACHE_BYTES, size); 
    2221- 
    2322-    return ptr; 
    2423-  } 
     24+  void deallocate (pointer p, size_type num) { dealloc_size(p, num*sizeof(T)); } 
     25 
    2526+  static pointer alloc_size(size_type size); 
    2627+  static void dealloc_size(pointer p, size_type size); 
    2728  
     
    3132 }; 
    3233  
    3334  
    34 @@ -98,6 +95,36 @@ bool operator!= (const cacheline_allocator<T1>&, const cacheline_allocator<T2>&) 
     35@@ -98,6 +95,36 @@ 
    3536   return false; 
    3637 } 
    3738  
  • net/rtorrent/Makefile

     
    1010 
    1111PKG_NAME:=rtorrent 
    1212PKG_REV:=1189 
    13 PKG_VERSION:=0.8.6_r$(PKG_REV) 
     13PKG_VERSION:=0.8.7_r$(PKG_REV) 
    1414PKG_RELEASE:=2 
    1515 
    1616PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
     
    4040 based clients in an ncurses client. 
    4141endef 
    4242 
    43 ifneq ($(CONFIG_GCC_VERSION_3_4)$(CONFIG_GCC_VERSION_4_1),) 
     43ifneq ($(CONFIG_GCC_VERSION_4_1),) 
    4444TARGET_CPPFLAGS += -fno-strict-aliasing 
    4545endif 
    4646 
    47 TARGET_LDFLAGS += -lpthread 
     47TARGET_LDFLAGS+= -lcrypto -lssl -lpthread 
    4848 
    4949CONFIGURE_ARGS+= \ 
    5050        --enable-shared \ 
    5151        --disable-static \ 
    5252        --disable-debug \ 
     53        --disable-werror \ 
    5354        --with-xmlrpc-c \ 
     55        --without-kqueue \ 
    5456 
    5557define Build/Configure 
    5658        (cd $(PKG_BUILD_DIR); ./autogen.sh ); 
  • libs/libtorrent/patches/110-fix-no-posix_memalign.diff

     
    11--- a/rak/allocators.h 
    22+++ b/rak/allocators.h 
    3 @@ -74,17 +74,13 @@ public: 
     3@@ -74,17 +74,13 @@ 
    44   size_type max_size () const throw() { return std::numeric_limits<size_t>::max() / sizeof(T); } 
    55  
    66   pointer allocate(size_type num, const_void_pointer hint = 0) { return alloc_size(num*sizeof(T)); } 
    7 +  void deallocate (pointer p, size_type num) { dealloc_size(p, num*sizeof(T)); } 
    8   
     7- 
    98-  static pointer alloc_size(size_type size) { 
    109-    pointer ptr = NULL; 
    1110-    int __UNUSED result = posix_memalign((void**)&ptr, LT_SMP_CACHE_BYTES, size); 
    1211- 
    1312-    return ptr; 
    1413-  } 
     14+  void deallocate (pointer p, size_type num) { dealloc_size(p, num*sizeof(T)); } 
     15 
    1516+  static pointer alloc_size(size_type size); 
    1617+  static void dealloc_size(pointer p, size_type size); 
    1718  
     
    2122 }; 
    2223  
    2324  
    24 @@ -98,6 +94,36 @@ bool operator!= (const cacheline_allocator<T1>&, const cacheline_allocator<T2>&) 
     25@@ -98,6 +94,36 @@ 
    2526   return false; 
    2627 } 
    2728  
  • libs/libtorrent/Makefile

     
    99 
    1010PKG_NAME:=libtorrent 
    1111PKG_REV:=1189 
    12 PKG_VERSION:=0.12.6_r$(PKG_REV) 
    13 PKG_RELEASE:=3 
     12PKG_VERSION:=0.12.7_r$(PKG_REV) 
     13PKG_RELEASE:=1 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1616PKG_SOURCE_URL:=svn://rakshasa.no/libtorrent/trunk/libtorrent 
     
    2828  CATEGORY:=Libraries 
    2929  TITLE:=Rakshasa's BitTorrent library 
    3030  URL:=http://libtorrent.rakshasa.no/ 
    31   DEPENDS:=+libopenssl +libsigcxx @!LINUX_2_4 
     31  DEPENDS:=+libopenssl +libsigcxx +libpthread @!LINUX_2_4 
    3232endef 
    3333 
    3434define Package/libtorrent/description 
     
    3939 the speed of the official client. 
    4040endef 
    4141 
    42 ifneq ($(CONFIG_GCC_VERSION_3_4)$(CONFIG_GCC_VERSION_4_1),) 
     42ifneq ($(CONFIG_GCC_VERSION_4_1),) 
    4343  TARGET_CPPFLAGS += -fno-strict-aliasing 
    4444endif 
    4545 
     
    4848# XXX: fixes the following error when configure from rtorrent is trying 
    4949# to link against libtorrent on arm (#7026) 
    5050# 
    51 # ./staging_dir/toolchain-arm_v5t_gcc-4.3.3+cs_uClibc-0.9.30.1_eabi/usr/lib/gcc/arm-openwrt-linux-uclibcgnueabi/4.3.3/../../../../arm-openwrt-linux-uclibcgnueabi/bin/ld: conftest: hidden symbol `__sync_add_and_fetch_4' in /media/Scratch/OpenWrt/backfire/build.d/orion/staging_dir/toolchain-arm_v5t_gcc-4.3.3+cs_uClibc-0.9.30.1_eabi/usr/lib/gcc/arm-openwrt-linux-uclibcgnueabi/4.3.3/libgcc.a(linux-atomic.o) is referenced by DSO 
    52 # ./staging_dir/toolchain-arm_v5t_gcc-4.3.3+cs_uClibc-0.9.30.1_eabi/usr/lib/gcc/arm-openwrt-linux-uclibcgnueabi/4.3.3/../../../../arm-openwrt-linux-uclibcgnueabi/bin/ld: final link failed: Nonrepresentable section on output 
    53 # 
     51 
    5452ifneq ($(CONFIG_arm)$(CONFIG_armeb),) 
    5553  TARGET_LDFLAGS += -Wl,--whole-archive -lgcc -lgcc_s -Wl,--no-whole-archive 
    5654endif 
  • libs/libsigc++/Makefile

     
    88include $(TOPDIR)/rules.mk 
    99 
    1010PKG_NAME:=libsigc++ 
    11 PKG_VERSION:=2.2.6 
     11PKG_VERSION:=2.2.8 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1515PKG_SOURCE_URL:=@GNOME/libsigc++/2.2 
    16 PKG_MD5SUM:=d216ef85785e0d17eda9b0326cfdcf71 
     16PKG_MD5SUM:=1198425eab9fd605721a278c651b8dd8 
    1717 
    1818PKG_FIXUP = libtool 
    1919 
  • libs/xmlrpc-c/Makefile

     
    99include $(TOPDIR)/rules.mk 
    1010 
    1111PKG_NAME:=xmlrpc-c 
    12 PKG_REV:=1913 
    13 PKG_VERSION:=1.22.2_r$(PKG_REV) 
     12PKG_REV:=2055 
     13PKG_VERSION:=1.24.4_r$(PKG_REV) 
    1414PKG_RELEASE:=1 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1616PKG_SOURCE_URL:=http://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/advanced