Signed-off-by: Tomasz Moń <[email protected]> --- libs/libtorrent/Makefile | 4 +- .../patches/000-upstream-gcc46-fixes.patch | 31 --------------- .../libtorrent/patches/100-fix_cross_compile.patch | 40 ++++++++++++++------ .../patches/120-fix-ipv6_socket_datagram.patch | 26 ------------- net/rtorrent/Makefile | 4 +- net/rtorrent/patches/100-fix-cross_compile.patch | 38 ++++++++++++------- net/rtorrent/patches/120-fix-ncurses.patch | 13 ------- 7 files changed, 57 insertions(+), 99 deletions(-) delete mode 100644 libs/libtorrent/patches/000-upstream-gcc46-fixes.patch delete mode 100644 libs/libtorrent/patches/120-fix-ipv6_socket_datagram.patch delete mode 100644 net/rtorrent/patches/120-fix-ncurses.patch
diff --git a/libs/libtorrent/Makefile b/libs/libtorrent/Makefile index 42c0ee1..aaa0dde 100644 --- a/libs/libtorrent/Makefile +++ b/libs/libtorrent/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtorrent -PKG_VERSION:=0.12.6 +PKG_VERSION:=0.13.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://libtorrent.rakshasa.no/downloads -PKG_MD5SUM:=037499ed708aaf72988cee60e5a8d96b +PKG_MD5SUM:=96c0b81501357df402ab592f59ecaeab PKG_FIXUP:=autoreconf PKG_BUILD_PARALLEL:=1 diff --git a/libs/libtorrent/patches/000-upstream-gcc46-fixes.patch b/libs/libtorrent/patches/000-upstream-gcc46-fixes.patch deleted file mode 100644 index d8bea4f..0000000 --- a/libs/libtorrent/patches/000-upstream-gcc46-fixes.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/src/data/memory_chunk.cc -+++ b/src/data/memory_chunk.cc -@@ -71,7 +71,7 @@ MemoryChunk::MemoryChunk(char* ptr, char - if (page_align() >= m_pagesize) - throw internal_error("MemoryChunk::MemoryChunk(...) received an page alignment >= page size"); - -- if ((ptrdiff_t)ptr % m_pagesize) -+ if ((std::ptrdiff_t)ptr % m_pagesize) - throw internal_error("MemoryChunk::MemoryChunk(...) is not aligned to a page"); - } - ---- a/src/torrent/data/block.h -+++ b/src/torrent/data/block.h -@@ -40,6 +40,7 @@ - #include <vector> - #include <torrent/common.h> - #include <torrent/data/block_transfer.h> -+#include <cstdlib> - - namespace torrent { - ---- a/src/torrent/data/block_transfer.h -+++ b/src/torrent/data/block_transfer.h -@@ -39,6 +39,7 @@ - - #include <torrent/common.h> - #include <torrent/data/piece.h> -+#include <cstdlib> - - namespace torrent { - diff --git a/libs/libtorrent/patches/100-fix_cross_compile.patch b/libs/libtorrent/patches/100-fix_cross_compile.patch index 7030718..e003f62 100644 --- a/libs/libtorrent/patches/100-fix_cross_compile.patch +++ b/libs/libtorrent/patches/100-fix_cross_compile.patch @@ -1,31 +1,47 @@ +diff --git a/configure.ac b/configure.ac +index 3899ae3..0086ea9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,7 +17,6 @@ AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO) + + AM_INIT_AUTOMAKE + AM_CONFIG_HEADER(config.h) +-AM_PATH_CPPUNIT(1.9.6) + AC_DISABLE_STATIC + + AM_DISABLE_STATIC +diff --git a/scripts/checks.m4 b/scripts/checks.m4 +index 9c6981b..017064b 100644 --- a/scripts/checks.m4 +++ b/scripts/checks.m4 @@ -96,7 +96,7 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [ AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [ AC_MSG_CHECKING(whether kqueue supports pipes and ptys) -- AC_RUN_IFELSE( -+ AC_LINK_IFELSE( - [[#include <fcntl.h> +- AC_RUN_IFELSE([AC_LANG_SOURCE([ ++ AC_LINK_IFELSE([AC_LANG_SOURCE([ + #include <fcntl.h> #include <stdlib.h> #include <unistd.h> +diff --git a/scripts/common.m4 b/scripts/common.m4 +index 3d7e864..6b30bb4 100644 --- a/scripts/common.m4 +++ b/scripts/common.m4 -@@ -184,7 +184,7 @@ AC_DEFUN([TORRENT_CHECK_MADVISE], [ +@@ -223,7 +223,7 @@ dnl Need to fix this so that it uses the stuff defined by the system. AC_DEFUN([TORRENT_CHECK_EXECINFO], [ AC_MSG_CHECKING(for execinfo.h) -- AC_RUN_IFELSE( -+ AC_LINK_IFELSE( - [[#include <execinfo.h> +- AC_RUN_IFELSE([AC_LANG_SOURCE([ ++ AC_LINK_IFELSE([AC_LANG_SOURCE([ + #include <execinfo.h> int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} - ]], -@@ -199,7 +199,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ + ])], +@@ -238,7 +238,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ AC_DEFUN([TORRENT_CHECK_ALIGNED], [ AC_MSG_CHECKING(the byte alignment) -- AC_RUN_IFELSE( -+ AC_LINK_IFELSE( - [[#include <inttypes.h> +- AC_RUN_IFELSE([AC_LANG_SOURCE([ ++ AC_LINK_IFELSE([AC_LANG_SOURCE([ + #include <inttypes.h> int main() { char buf[8] = { 0, 0, 0, 0, 1, 0, 0, 0 }; diff --git a/libs/libtorrent/patches/120-fix-ipv6_socket_datagram.patch b/libs/libtorrent/patches/120-fix-ipv6_socket_datagram.patch deleted file mode 100644 index 1a46627..0000000 --- a/libs/libtorrent/patches/120-fix-ipv6_socket_datagram.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/src/net/socket_datagram.cc -+++ b/src/net/socket_datagram.cc -@@ -73,6 +73,23 @@ SocketDatagram::write_datagram(const voi - int r; - - if (sa != NULL) { -+#ifdef RAK_USE_INET6 -+ if (m_ipv6_socket && sa->family() == rak::socket_address::pf_inet) { -+ uint32_t addr32[4]; -+ sockaddr_in6 mapped_addr; -+ memset(&mapped_addr, 0, sizeof(mapped_addr)); -+ mapped_addr.sin6_family = AF_INET6; -+ addr32[0] = 0; -+ addr32[1] = 0; -+ addr32[2] = htonl(0xffff); -+ addr32[3] = sa->sa_inet()->address_n(); -+ memcpy(mapped_addr.sin6_addr.s6_addr, addr32, sizeof(uint32_t) * 4); -+ mapped_addr.sin6_port = sa->sa_inet()->port_n(); -+ r = ::sendto(m_fileDesc, buffer, length, 0, (sockaddr*)&mapped_addr, sizeof(mapped_addr)); -+ } else if (m_ipv6_socket && sa->family() == rak::socket_address::pf_inet6) { -+ r = ::sendto(m_fileDesc, buffer, length, 0, sa->sa_inet6()->c_sockaddr(), sizeof(rak::socket_address_inet6)); -+ } else -+#endif - r = ::sendto(m_fileDesc, buffer, length, 0, sa->sa_inet()->c_sockaddr(), sizeof(rak::socket_address_inet)); - } else { - r = ::send(m_fileDesc, buffer, length, 0); diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile index 7dad009..dac4b62 100644 --- a/net/rtorrent/Makefile +++ b/net/rtorrent/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rtorrent -PKG_VERSION:=0.8.6 +PKG_VERSION:=0.9.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://libtorrent.rakshasa.no/downloads -PKG_MD5SUM:=b804c45c01c40312926bcea6b55bb084 +PKG_MD5SUM:=72c3e9ab859bda7cc8aa96c0b508b09f PKG_FIXUP:=autoreconf PKG_BUILD_PARALLEL:=1 diff --git a/net/rtorrent/patches/100-fix-cross_compile.patch b/net/rtorrent/patches/100-fix-cross_compile.patch index b52a952..e2f68fb 100644 --- a/net/rtorrent/patches/100-fix-cross_compile.patch +++ b/net/rtorrent/patches/100-fix-cross_compile.patch @@ -1,22 +1,34 @@ -Index: rtorrent-0.8.6/scripts/common.m4 -=================================================================== ---- rtorrent-0.8.6.orig/scripts/common.m4 -+++ rtorrent-0.8.6/scripts/common.m4 -@@ -184,7 +184,7 @@ AC_DEFUN([TORRENT_CHECK_MADVISE], [ +diff --git a/configure.ac b/configure.ac +index b9aa883..306e0a8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4,7 +4,6 @@ AC_DEFINE(API_VERSION, 6, api version) + + AM_INIT_AUTOMAKE + AM_CONFIG_HEADER(config.h) +-AM_PATH_CPPUNIT(1.9.6) + + AC_PROG_CXX + AC_PROG_LIBTOOL +diff --git a/scripts/common.m4 b/scripts/common.m4 +index 751aa34..6aa9eb9 100644 +--- a/scripts/common.m4 ++++ b/scripts/common.m4 +@@ -223,7 +223,7 @@ dnl Need to fix this so that it uses the stuff defined by the system. AC_DEFUN([TORRENT_CHECK_EXECINFO], [ AC_MSG_CHECKING(for execinfo.h) -- AC_RUN_IFELSE( -+ AC_LINK_IFELSE( - [[#include <execinfo.h> +- AC_RUN_IFELSE([AC_LANG_SOURCE([ ++ AC_LINK_IFELSE([AC_LANG_SOURCE([ + #include <execinfo.h> int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} - ]], -@@ -199,7 +199,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ + ])], +@@ -238,7 +238,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ AC_DEFUN([TORRENT_CHECK_ALIGNED], [ AC_MSG_CHECKING(the byte alignment) -- AC_RUN_IFELSE( -+ AC_LINK_IFELSE( - [[#include <inttypes.h> +- AC_RUN_IFELSE([AC_LANG_SOURCE([ ++ AC_LINK_IFELSE([AC_LANG_SOURCE([ + #include <inttypes.h> int main() { char buf[8] = { 0, 0, 0, 0, 1, 0, 0, 0 }; diff --git a/net/rtorrent/patches/120-fix-ncurses.patch b/net/rtorrent/patches/120-fix-ncurses.patch deleted file mode 100644 index e460927..0000000 --- a/net/rtorrent/patches/120-fix-ncurses.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: rtorrent-0.8.6/src/display/canvas.h -=================================================================== ---- rtorrent-0.8.6.orig/src/display/canvas.h -+++ rtorrent-0.8.6/src/display/canvas.h -@@ -48,7 +48,7 @@ class Canvas { - public: - typedef std::vector<Attributes> attributes_list; - -- Canvas(int x = 0, int y = 0, int width = 0, int height = 0) : -+ Canvas(int x = 0, int y = 0, int width = 1, int height = 1) : - m_window(newwin(height, width, y, x)) {} - ~Canvas() { delwin(m_window); } - -- 1.7.10 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
