From bf1bc4e4ab7ed2b8ab8f2f24bc1365f93e2c2c6b Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 2 May 2010 13:09:19 +0000
Subject: [PATCH] update libtorrent to 0.12.6 (#7252)

SVN-Revision: 21296
---
 libs/libtorrent/Makefile                      |  4 ++--
 .../patches/100-fix_cross_compile.patch       | 24 +++++++++++++++++++
 .../patches/130-missing_inttypes.patch        | 11 ---------
 3 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 libs/libtorrent/patches/100-fix_cross_compile.patch
 delete mode 100644 libs/libtorrent/patches/130-missing_inttypes.patch

diff --git a/libs/libtorrent/Makefile b/libs/libtorrent/Makefile
index 49c6fae9b..d49f1c344 100644
--- a/libs/libtorrent/Makefile
+++ b/libs/libtorrent/Makefile
@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtorrent
-PKG_REV:=1130
+PKG_REV:=1165
 PKG_VERSION:=0.12.6_r$(PKG_REV)
-PKG_RELEASE:=3
+PKG_RELEASE:=1
 
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/libs/libtorrent/patches/100-fix_cross_compile.patch b/libs/libtorrent/patches/100-fix_cross_compile.patch
new file mode 100644
index 000000000..ab5bca19f
--- /dev/null
+++ b/libs/libtorrent/patches/100-fix_cross_compile.patch
@@ -0,0 +1,24 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,6 @@
+ 
+ AM_INIT_AUTOMAKE
+ AM_CONFIG_HEADER(config.h)
+-AM_PATH_CPPUNIT(1.9.6)
+ AC_DISABLE_STATIC
+ 
+ AM_DISABLE_STATIC
+@@ -117,5 +116,4 @@
+ 	src/protocol/Makefile
+ 	src/tracker/Makefile
+ 	src/utils/Makefile
+-        test/Makefile
+ ])
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = src test
++SUBDIRS = src
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libtorrent.pc
diff --git a/libs/libtorrent/patches/130-missing_inttypes.patch b/libs/libtorrent/patches/130-missing_inttypes.patch
deleted file mode 100644
index 09ff6d898..000000000
--- a/libs/libtorrent/patches/130-missing_inttypes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN libtorrent-0.12.6_r1130/rak/allocators.h libtorrent-0.12.6_r1130.new/rak/allocators.h
---- libtorrent-0.12.6_r1130/rak/allocators.h	2009-12-26 12:16:21.000000000 +0100
-+++ libtorrent-0.12.6_r1130.new/rak/allocators.h	2010-03-29 11:49:51.000000000 +0200
-@@ -43,6 +43,7 @@
- #include <limits>
- #include <stdlib.h>
- #include <sys/types.h>
-+#include <inttypes.h>
- 
- namespace rak {
- 
-- 
2.30.2