Commit 13762037 authored by Vicente Olivert Riera's avatar Vicente Olivert Riera Committed by Peter Korsgaard
Browse files

libtorrent: bump to version 0.13.6 

- Bump to version 0.13.6.

- Add a hash file.

- Change the website URL to the new official one.

- Help the build system to find the zlib headers, otherwise the
  configure script will fail like this:

    checking if zlib is wanted... yes
    checking for inflateEnd in -lz... no
    checking zlib.h usability... no
    checking zlib.h presence... no
    checking for zlib.h... no
    configure: error: either specify a valid zlib installation with
    --with-zlib=DIR or disable zlib usage with --without-zlib

- Disable instrumentation support by default since it avoids runtime
  failures on rtorrent for some architectures like MIPS, PowerPC or ARM:

    https://github.com/rakshasa/rtorrent/issues/156



- Tweak the 0001-cross_compile.patch for this new version.

Signed-off-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent d37bf8f1

package/libtorrent/0001-cross_compile.patch

+40 −14
Original line number Diff line number Diff line 
Fix cross compilation, based on OpenWRT patch.

From c4cc0ba76c81e1967c648be423f5f0312ac9d87f Mon Sep 17 00:00:00 2001

From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

Date: Mon, 5 Oct 2015 00:40:25 +0100

Subject: [PATCH] Fix cross compilation, based on OpenWRT patch.



[Vincent: tweak the patch for version 0.13.6]



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

---

 configure.ac      |    1 -

 scripts/checks.m4 |    2 +-

 scripts/common.m4 |    4 ++--

 3 files changed, 3 insertions(+), 4 deletions(-)



diff -Nura libtorrent-0.13.3.orig/configure.ac libtorrent-0.13.3/configure.ac

--- libtorrent-0.13.3.orig/configure.ac	2012-10-31 07:38:59.345752076 -0300

+++ libtorrent-0.13.3/configure.ac	2012-10-31 07:39:06.454799361 -0300

@@ -19,7 +19,6 @@

diff --git a/configure.ac b/configure.ac

index ba994ee..7696466 100644

--- a/configure.ac

+++ b/configure.ac

@@ -19,7 +19,6 @@ AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO)

 

 AM_INIT_AUTOMAKE

 AM_CONFIG_HEADER(config.h)

 AC_CONFIG_HEADERS(config.h)

-AM_PATH_CPPUNIT(1.9.6)

 

 AC_PROG_CXX

 

diff -Nura libtorrent-0.13.3.orig/scripts/checks.m4 libtorrent-0.13.3/scripts/checks.m4

--- libtorrent-0.13.3.orig/scripts/checks.m4	2012-10-31 07:38:59.342752057 -0300

+++ libtorrent-0.13.3/scripts/checks.m4	2012-10-31 07:39:06.454799361 -0300

@@ -96,7 +96,7 @@

diff --git a/scripts/checks.m4 b/scripts/checks.m4

index 598f39b..0e5abe0 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)
@@ -25,10 +38,11 @@ diff -Nura libtorrent-0.13.3.orig/scripts/checks.m4 libtorrent-0.13.3/scripts/ch 
       #include <fcntl.h>

       #include <stdlib.h>

       #include <unistd.h>

diff -Nura libtorrent-0.13.3.orig/scripts/common.m4 libtorrent-0.13.3/scripts/common.m4

--- libtorrent-0.13.3.orig/scripts/common.m4	2012-10-31 07:38:59.342752057 -0300

+++ libtorrent-0.13.3/scripts/common.m4	2012-10-31 07:39:32.550972826 -0300

@@ -223,7 +223,7 @@

diff --git a/scripts/common.m4 b/scripts/common.m4

index 5127624..cc68269 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)
@@ -37,3 +51,15 @@ diff -Nura libtorrent-0.13.3.orig/scripts/common.m4 libtorrent-0.13.3/scripts/co 
       #include <execinfo.h>

       int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}

       ])],

@@ -238,7 +238,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [

 AC_DEFUN([TORRENT_CHECK_ALIGNED], [

   AC_MSG_CHECKING(the byte alignment)

 

-  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 };

-- 

1.7.1

package/libtorrent/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ config BR2_PACKAGE_LIBTORRENT 
	help

	  BitTorrent library written in C++ for *nix



	  http://libtorrent.rakshasa.no/

	  http://rtorrent.net/downloads/



comment "libtorrent needs a toolchain w/ C++, threads"

	depends on BR2_ARCH_HAS_ATOMICS

package/libtorrent/libtorrent.hash

0 → 100644
+2 −0
Original line number Diff line number Diff line 
# Locally calculated

sha256 2838a08c96edfd936aff8fbf99ecbb930c2bfca3337dd1482eb5fccdb80d5a04  libtorrent-0.13.6.tar.gz

package/libtorrent/libtorrent.mk

+7 −4
Original line number Diff line number Diff line
@@ -4,12 +4,15 @@ 
#

################################################################################



LIBTORRENT_VERSION = 0.13.3

LIBTORRENT_SITE = http://libtorrent.rakshasa.no/downloads

LIBTORRENT_VERSION = 0.13.6

LIBTORRENT_SITE = http://rtorrent.net/downloads

LIBTORRENT_DEPENDENCIES = host-pkgconf libsigc \

	$(if $(BR2_PACKAGE_OPENSSL),openssl)

	$(if $(BR2_PACKAGE_OPENSSL),openssl) \

	$(if $(BR2_PACKAGE_ZLIB),zlib)

LIBTORRENT_CONF_OPTS = --enable-aligned \

	$(if $(BR2_PACKAGE_OPENSSL),--enable-openssl,--disable-openssl)

	--disable-instrumentation \

	$(if $(BR2_PACKAGE_OPENSSL),--enable-openssl,--disable-openssl) \

	$(if $(BR2_PACKAGE_ZLIB),--with-zlib=$(STAGING_DIR)/usr,--without-zlib)

LIBTORRENT_INSTALL_STAGING = YES

LIBTORRENT_AUTORECONF = YES

LIBTORRENT_LICENSE = GPLv2