From 62b1bd2c9ed275f94f0db7710adffed934ae1018 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 20 Feb 2024 08:48:41 +0100
Subject: libtorrent: update to 0.13.8, but broken
---
package/libtorrent/Makefile | 11 ++++++-----
package/libtorrent/patches/patch-configure_ac | 18 ------------------
.../libtorrent/patches/patch-scripts_ax_check_zlib_m4 | 11 -----------
3 files changed, 6 insertions(+), 34 deletions(-)
delete mode 100644 package/libtorrent/patches/patch-configure_ac
delete mode 100644 package/libtorrent/patches/patch-scripts_ax_check_zlib_m4
(limited to 'package')
diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile
index f631b37fd..1ff5c5b01 100644
--- a/package/libtorrent/Makefile
+++ b/package/libtorrent/Makefile
@@ -4,29 +4,30 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= libtorrent
-PKG_VERSION:= 0.13.6
+PKG_VERSION:= 0.13.8
PKG_RELEASE:= 1
-PKG_HASH:= 2838a08c96edfd936aff8fbf99ecbb930c2bfca3337dd1482eb5fccdb80d5a04
+PKG_HASH:= ed115a28f4ae8cfcd33b94a597c076ca74fd549867a26e4fac9505c27288e983
PKG_DESCR:= bittorrent library
PKG_SECTION:= libs/net
PKG_DEPENDS:= libsigc++ zlib libressl
PKG_BUILDDEP:= libsigc++ zlib libressl
PKG_NEEDS:= intl
PKG_URL:= https://rakshasa.github.io/rtorrent/
-PKG_SITES:= http://rtorrent.net/downloads/
+PKG_SITES:= https://github.com/rakshasa/rtorrent/releases/download/v0.9.8/
PKG_OPTS:= dev
+PKG_CFLINE_LIBTORRENT:= depends on ADK_BROKEN
+
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
include ${ADK_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 \
--disable-instrumentation \
- --with-zlib=$(STAGING_TARGET_DIR)
+ --without-zlib
libtorrent-install:
${INSTALL_DIR} ${IDIR_LIBTORRENT}/usr/lib
diff --git a/package/libtorrent/patches/patch-configure_ac b/package/libtorrent/patches/patch-configure_ac
deleted file mode 100644
index 00e1c2fec..000000000
--- a/package/libtorrent/patches/patch-configure_ac
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
- AC_CONFIG_HEADERS(config.h)
--AM_PATH_CPPUNIT(1.9.6)
-
- AC_PROG_CXX
-
-@@ -99,7 +98,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-scripts_ax_check_zlib_m4 b/package/libtorrent/patches/patch-scripts_ax_check_zlib_m4
deleted file mode 100644
index 1e629d011..000000000
--- a/package/libtorrent/patches/patch-scripts_ax_check_zlib_m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
--
cgit v1.2.3