Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cross/libtorrent-rakshasa/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PKG_NAME = libtorrent
PKG_VERS = 0.14.0
PKG_VERS = 0.16.4
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/rakshasa/rtorrent/releases/download/v0.10.0
PKG_DIST_SITE = https://github.com/rakshasa/rtorrent/releases/download/v$(PKG_VERS)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS = cross/zlib cross/openssl3 cross/libsigc++
Expand Down
4 changes: 2 additions & 2 deletions cross/libtorrent-rakshasa/PLIST
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
lnk:lib/libtorrent.so
lnk:lib/libtorrent.so.22
lib:lib/libtorrent.so.22.0.0
lnk:lib/libtorrent.so.34
lib:lib/libtorrent.so.34.0.0
6 changes: 3 additions & 3 deletions cross/libtorrent-rakshasa/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
libtorrent-0.14.0.tar.gz SHA1 177c05ddcaee270688c05f3d20e378daf18e3a1f
libtorrent-0.14.0.tar.gz SHA256 17b816da5807c7b3455a1a48aae8dacf0f4ef75b1a4372c758948710066fd3ec
libtorrent-0.14.0.tar.gz MD5 97d46c67411a451cf14b3e447377d542
libtorrent-0.16.4.tar.gz SHA1 0768e96397376dcc03cb855bfba01f276f4f4b65
libtorrent-0.16.4.tar.gz SHA256 d80e06080a70c796cfd8d1831ca751eb33ab01c2f3269c7fe6966b44c46b517d
libtorrent-0.16.4.tar.gz MD5 f72f09c4ad03b2f7564834ea4a207066
18 changes: 1 addition & 17 deletions cross/rtorrent/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = rtorrent
PKG_VERS = 0.10.0
PKG_VERS = 0.16.4
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/rakshasa/rtorrent/releases/download/v$(PKG_VERS)
Expand All @@ -17,23 +17,7 @@ UNSUPPORTED_ARCHS = comcerto2k
REQUIRED_MIN_SRM = 1.3

GNU_CONFIGURE = 1
PRE_CONFIGURE_TARGET = rtorrent_pre_configure
PRE_PATCH_TARGET = rtorrent_pre_patch
PRE_COMPILE_TARGET = rtorrent_pre_compile

CONFIGURE_ARGS = --with-xmlrpc-c=$(STAGING_INSTALL_PREFIX)/bin/xmlrpc-c-config

include ../../mk/spksrc.cross-cc.mk

.PHONY: rtorrent_pre_configure
rtorrent_pre_configure:
cp src/linux-atomic.c $(WORK_DIR)/$(PKG_DIR)/src

.PHONY: rtorrent_pre_patch
rtorrent_pre_patch:
@$(RUN) autoreconf -fi

.PHONY: rtorrent_pre_compile
rtorrent_pre_compile:
@$(RUN) libtool --tag=CC --mode=compile $(TC_PATH)$(TC_PREFIX)gcc -g -O2 -MT src/linux-atomic.lo -MD -MP -MF src/linux-atomic.Tpo -c -o src/linux-atomic.lo src/linux-atomic.c
@$(RUN) libtool --tag=CC --mode=link $(TC_PATH)$(TC_PREFIX)gcc -g -O2 -o src/liblinux-atomic.la src/linux-atomic.lo
6 changes: 3 additions & 3 deletions cross/rtorrent/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
rtorrent-0.10.0.tar.gz SHA1 c717a1f60f3b0efd74f5b82887c15380ead63164
rtorrent-0.10.0.tar.gz SHA256 cc65bba7abead24151f10af116eca2342b0c320fdff3cb8d604c0af09215d3aa
rtorrent-0.10.0.tar.gz MD5 94556d3c9838c0b89abefb33ac0118ed
rtorrent-0.16.4.tar.gz SHA1 a147a687d6b975b48cad198324766bf236d44f33
rtorrent-0.16.4.tar.gz SHA256 4fd458f025544c77eea63962a7866848bf06fb420a2b8cee12978b8e2d2add8f
rtorrent-0.16.4.tar.gz MD5 6e3f164e6917c9bd57df736721374a91
41 changes: 0 additions & 41 deletions cross/rtorrent/patches/001-add-building-lib-atomic.patch

This file was deleted.

23 changes: 23 additions & 0 deletions cross/rtorrent/patches/001-command-ui-math-functors.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--- src/command_ui.cc 2025-11-04 15:45:21
+++ src/command_ui.cc.new 2025-11-20 19:55:42
@@ -862,13 +862,13 @@
CMD2_ANY_VALUE("convert.xb", std::bind(&apply_to_xb, std::placeholders::_2));
CMD2_ANY_VALUE("convert.throttle", std::bind(&apply_to_throttle, std::placeholders::_2));

- CMD2_ANY_LIST("math.add", [](auto, const auto& args) { return apply_math_basic("math.add", std::plus(), args); });
- CMD2_ANY_LIST("math.sub", [](auto, const auto& args) { return apply_math_basic("math.sub", std::minus(), args); });
- CMD2_ANY_LIST("math.mul", [](auto, const auto& args) { return apply_math_basic("math.mul", std::multiplies(), args); });
- CMD2_ANY_LIST("math.div", [](auto, const auto& args) { return apply_math_basic("math.div", std::divides(), args); });
- CMD2_ANY_LIST("math.mod", [](auto, const auto& args) { return apply_math_basic("math.mod", std::modulus(), args); });
- CMD2_ANY_LIST("math.min", [](auto, const auto& args) { return apply_arith_basic(std::less(), args); });
- CMD2_ANY_LIST("math.max", [](auto, const auto& args) { return apply_arith_basic(std::greater(), args); });
+ CMD2_ANY_LIST("math.add", [](auto, const auto& args) { return apply_math_basic("math.add", std::plus<int64_t>(), args); });
+ CMD2_ANY_LIST("math.sub", [](auto, const auto& args) { return apply_math_basic("math.sub", std::minus<int64_t>(), args); });
+ CMD2_ANY_LIST("math.mul", [](auto, const auto& args) { return apply_math_basic("math.mul", std::multiplies<int64_t>(), args); });
+ CMD2_ANY_LIST("math.div", [](auto, const auto& args) { return apply_math_basic("math.div", std::divides<int64_t>(), args); });
+ CMD2_ANY_LIST("math.mod", [](auto, const auto& args) { return apply_math_basic("math.mod", std::modulus<int64_t>(), args); });
+ CMD2_ANY_LIST("math.min", [](auto, const auto& args) { return apply_arith_basic(std::less<int64_t>(), args); });
+ CMD2_ANY_LIST("math.max", [](auto, const auto& args) { return apply_arith_basic(std::greater<int64_t>(), args); });
CMD2_ANY_LIST("math.cnt", std::bind(&apply_arith_count, std::placeholders::_2));
CMD2_ANY_LIST("math.avg", std::bind(&apply_arith_other, "average", std::placeholders::_2));
CMD2_ANY_LIST("math.med", std::bind(&apply_arith_other, "median", std::placeholders::_2));
Loading