diff options
Diffstat (limited to 'package')
-rw-r--r-- | package/libtorrent/Makefile | 7 | ||||
-rw-r--r-- | package/libtorrent/patches/patch-configure_ac | 18 | ||||
-rw-r--r-- | package/libtorrent/patches/patch-src_tracker_tracker_udp_cc | 11 | ||||
-rw-r--r-- | package/rtorrent/Makefile | 4 | ||||
-rw-r--r-- | package/rtorrent/patches/patch-configure_ac | 8 |
5 files changed, 28 insertions, 20 deletions
diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile index c6143d858..c570c8ade 100644 --- a/package/libtorrent/Makefile +++ b/package/libtorrent/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libtorrent -PKG_VERSION:= 0.13.2 +PKG_VERSION:= 0.13.4 PKG_RELEASE:= 1 -PKG_MD5SUM:= 96c0b81501357df402ab592f59ecaeab +PKG_MD5SUM:= e82f380a9d4b55b379e0e73339c73895 PKG_DESCR:= bittorrent library PKG_SECTION:= libs/net PKG_DEPENDS:= libopenssl libsigc++ -PKG_BUILDDEP:= openssl libsigc++ gettext-tiny +PKG_BUILDDEP:= autotool openssl libsigc++ gettext-tiny PKG_URL:= http://libtorrent.rakshasa.no/ PKG_SITES:= http://libtorrent.rakshasa.no/downloads/ PKG_OPTS:= dev @@ -21,6 +21,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBTORRENT,libtorrent,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --enable-aligned \ --without-kqueue diff --git a/package/libtorrent/patches/patch-configure_ac b/package/libtorrent/patches/patch-configure_ac new file mode 100644 index 000000000..c81950e7d --- /dev/null +++ b/package/libtorrent/patches/patch-configure_ac @@ -0,0 +1,18 @@ +--- 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 +@@ -19,7 +19,6 @@ AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO + + AM_INIT_AUTOMAKE + AC_CONFIG_HEADERS(config.h) +-AM_PATH_CPPUNIT(1.9.6) + + AC_PROG_CXX + +@@ -98,7 +97,6 @@ AC_CHECK_FUNCS(posix_memalign) + TORRENT_CHECK_MADVISE() + TORRENT_CHECK_CACHELINE() + TORRENT_CHECK_POPCOUNT() +-TORRENT_CHECK_EXECINFO() + TORRENT_CHECK_PTHREAD_SETNAME_NP() + TORRENT_MINCORE() + TORRENT_OTFD() diff --git a/package/libtorrent/patches/patch-src_tracker_tracker_udp_cc b/package/libtorrent/patches/patch-src_tracker_tracker_udp_cc deleted file mode 100644 index 5a0b90666..000000000 --- a/package/libtorrent/patches/patch-src_tracker_tracker_udp_cc +++ /dev/null @@ -1,11 +0,0 @@ ---- libtorrent-0.12.4.orig/src/tracker/tracker_udp.cc 2008-05-07 14:19:13.000000000 +0200 -+++ libtorrent-0.12.4/src/tracker/tracker_udp.cc 2009-08-28 17:51:08.510691244 +0200 -@@ -36,6 +36,8 @@ - - #include "config.h" - -+#include <cstdio> -+ - #include <sigc++/adaptors/bind.h> - #include <torrent/connection_manager.h> - diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile index 0148dde08..45e2f945e 100644 --- a/package/rtorrent/Makefile +++ b/package/rtorrent/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= rtorrent -PKG_VERSION:= 0.9.2 +PKG_VERSION:= 0.9.4 PKG_RELEASE:= 1 -PKG_MD5SUM:= 72c3e9ab859bda7cc8aa96c0b508b09f +PKG_MD5SUM:= fd9490a2ac67d0fa2a567c6267845876 PKG_DESCR:= console torrent application PKG_SECTION:= app/p2p PKG_DEPENDS:= libncurses libtorrent libcurl libstdcxx diff --git a/package/rtorrent/patches/patch-configure_ac b/package/rtorrent/patches/patch-configure_ac index 975e059cf..b0285c417 100644 --- a/package/rtorrent/patches/patch-configure_ac +++ b/package/rtorrent/patches/patch-configure_ac @@ -1,9 +1,9 @@ ---- rtorrent-0.9.2.orig/configure.ac 2012-04-20 08:55:30.000000000 +0200 -+++ rtorrent-0.9.2/configure.ac 2014-01-13 12:54:40.000000000 +0100 -@@ -4,7 +4,6 @@ AC_DEFINE(API_VERSION, 6, api version) +--- rtorrent-0.9.4.orig/configure.ac 2014-05-14 16:30:51.000000000 +0200 ++++ rtorrent-0.9.4/configure.ac 2014-06-06 15:23:03.000000000 +0200 +@@ -4,7 +4,6 @@ AC_DEFINE(API_VERSION, 8, api version) AM_INIT_AUTOMAKE - AM_CONFIG_HEADER(config.h) + AC_CONFIG_HEADERS(config.h) -AM_PATH_CPPUNIT(1.9.6) AC_PROG_CXX |