this patches updates libtorrent to 0.13.2
Signed-off-by: Peter Wagner <[email protected]>
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..81eb97d 100644
--- a/libs/libtorrent/patches/100-fix_cross_compile.patch
+++ b/libs/libtorrent/patches/100-fix_cross_compile.patch
@@ -1,31 +1,41 @@
+--- 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
--- 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>
--- 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 t
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 };
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
