diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/libtorrent/Makefile | 17 | ||||
| -rw-r--r-- | package/libtorrent/patches/patch-configure_ac | 6 | ||||
| -rw-r--r-- | package/libtorrent/patches/patch-scripts_ax_check_zlib_m4 | 11 |
3 files changed, 23 insertions, 11 deletions
diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile index fa001a04f..ba4a09ec4 100644 --- a/package/libtorrent/Makefile +++ b/package/libtorrent/Makefile @@ -4,15 +4,15 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libtorrent -PKG_VERSION:= 0.13.4 -PKG_RELEASE:= 2 -PKG_HASH:= 704e097119dc89e2ee4630396b25de1cd64b0549841347ea75b9ef9217084955 +PKG_VERSION:= 0.13.6 +PKG_RELEASE:= 1 +PKG_HASH:= 2838a08c96edfd936aff8fbf99ecbb930c2bfca3337dd1482eb5fccdb80d5a04 PKG_DESCR:= bittorrent library PKG_SECTION:= libs/net -PKG_DEPENDS:= libsigc++ -PKG_BUILDDEP:= libsigc++ gettext-tiny -PKG_URL:= http://libtorrent.rakshasa.no/ -PKG_SITES:= http://distfiles.openadk.org/ +PKG_DEPENDS:= libsigc++ zlib +PKG_BUILDDEP:= libsigc++ zlib gettext-tiny +PKG_URL:= https://rakshasa.github.io/rtorrent/ +PKG_SITES:= http://rtorrent.net/downloads/ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz @@ -32,7 +32,8 @@ $(eval $(call PKG_template,LIBTORRENT,libtorrent,${PKG_VERSION}-${PKG_RELEASE},$ AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --enable-aligned \ --without-kqueue \ - --disable-instrumentation + --disable-instrumentation \ + --with-zlib=$(STAGING_TARGET_DIR) libtorrent-install: ${INSTALL_DIR} ${IDIR_LIBTORRENT}/usr/lib diff --git a/package/libtorrent/patches/patch-configure_ac b/package/libtorrent/patches/patch-configure_ac index c81950e7d..00e1c2fec 100644 --- a/package/libtorrent/patches/patch-configure_ac +++ b/package/libtorrent/patches/patch-configure_ac @@ -1,5 +1,5 @@ ---- libtorrent-0.13.4.orig/configure.ac 2014-05-14 16:18:48.000000000 +0200 -+++ libtorrent-0.13.4/configure.ac 2014-06-06 14:36:37.000000000 +0200 +--- libtorrent-0.13.6.orig/configure.ac 2015-09-03 20:57:38.000000000 +0200 ++++ libtorrent-0.13.6/configure.ac 2016-05-25 21:29:51.436557128 +0200 @@ -19,7 +19,6 @@ AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO AM_INIT_AUTOMAKE @@ -8,7 +8,7 @@ AC_PROG_CXX -@@ -98,7 +97,6 @@ AC_CHECK_FUNCS(posix_memalign) +@@ -99,7 +98,6 @@ AC_CHECK_FUNCS(posix_memalign) TORRENT_CHECK_MADVISE() TORRENT_CHECK_CACHELINE() TORRENT_CHECK_POPCOUNT() diff --git a/package/libtorrent/patches/patch-scripts_ax_check_zlib_m4 b/package/libtorrent/patches/patch-scripts_ax_check_zlib_m4 new file mode 100644 index 000000000..1e629d011 --- /dev/null +++ b/package/libtorrent/patches/patch-scripts_ax_check_zlib_m4 @@ -0,0 +1,11 @@ +--- libtorrent-0.13.6.orig/scripts/ax_check_zlib.m4 2015-08-08 17:01:32.000000000 +0200 ++++ libtorrent-0.13.6/scripts/ax_check_zlib.m4 2016-05-25 21:33:01.003893982 +0200 +@@ -79,7 +79,7 @@ AC_ARG_WITH([zlib], + AC_MSG_RESULT(yes) + if test -d "$withval" + then +- zlib_places="$withval $zlib_places" ++ zlib_places="$withval" + else + AC_MSG_WARN([Sorry, $withval does not exist, checking usual places]) + fi |