Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rutorrent: upgrade 4.3.7 => 5.1.5 #6404

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft
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
33 changes: 14 additions & 19 deletions cross/libtorrent-rakshasa/Makefile
Original file line number Diff line number Diff line change
@@ -1,32 +1,27 @@
PKG_NAME = libtorrent
PKG_VERS = 0.13.8
PKG_VERS = 0.15.1
PKG_EXT = tar.gz
PKG_DIST_SITE = https://github.com/rakshasa/libtorrent/archive
#PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
#PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
#PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
PKG_GIT_HASH = 71a487c66b136524bce5519cb1f9e855621a9101
PKG_DIST_NAME = $(PKG_GIT_HASH).$(PKG_EXT)
PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-$(PKG_GIT_HASH)
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/rakshasa/rtorrent/releases/download/v$(PKG_VERS)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS = cross/cppunit cross/openssl3 cross/libsigc++ cross/zlib
DEPENDS = cross/zlib cross/openssl3 cross/libsigc++

HOMEPAGE = https://rakshasa.github.io
HOMEPAGE = https://github.com/rakshasa/rtorrent/wiki
COMMENT = LibTorrent is a BitTorrent library written in C++ for *nix, with a focus on high performance and good code.
LICENSE = GPLv2

# requires C++14 support
# A compiler with support for C++14 language features is required.
REQUIRED_MIN_DSM = 7.0
UNSUPPORTED_ARCHS = comcerto2k

GNU_CONFIGURE = 1
PRE_PATCH_TARGET = libtorrent_pre_patch
CONFIGURE_ARGS = --disable-instrumentation --with-zlib=$(STAGING_INSTALL_PREFIX)
ADDITIONAL_CXXFLAGS = -fno-strict-aliasing

include ../../mk/spksrc.cross-cc.mk
CONFIGURE_ARGS = --disable-instrumentation
CONFIGURE_ARGS += --with-zlib=$(STAGING_INSTALL_PREFIX)

# disable some compiler warnings:
ADDITIONAL_CXXFLAGS = -Wno-deprecated-declarations -Wno-deprecated -Wno-terminate -Wno-sign-compare
ADDITIONAL_CFLAGS = -O2

.PHONY: libtorrent_pre_patch
libtorrent_pre_patch:
@$(RUN) autoreconf -fi
include ../../mk/spksrc.cross-cc.mk
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.21
lib:lib/libtorrent.so.21.0.0
lnk:lib/libtorrent.so.23
lib:lib/libtorrent.so.23.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-git71a487c66b136524bce5519cb1f9e855621a9101.tar.gz SHA1 5d19ed169d7cf9ef53ea847a074a24ba5d605993
libtorrent-git71a487c66b136524bce5519cb1f9e855621a9101.tar.gz SHA256 259f80dcced1179a3215225b5dc243b0fe6392fd9b1e97ca4c542b39928c43d3
libtorrent-git71a487c66b136524bce5519cb1f9e855621a9101.tar.gz MD5 60facb50262549eb87073c00865ab88c
libtorrent-0.15.1.tar.gz SHA1 3c4cb30e872f2038cc4efa050b55119af2c1fc55
libtorrent-0.15.1.tar.gz SHA256 ef96bcc1fe8c56108db2f323e562fb982af1e5f3f21086986d133518df874301
libtorrent-0.15.1.tar.gz MD5 02b159afc8ecf23983a2e5b9a0f6073b
30 changes: 7 additions & 23 deletions cross/libtorrent-rakshasa/patches/001-fix-cross-compile.patch
Original file line number Diff line number Diff line change
@@ -1,29 +1,13 @@
--- configure-ORIG 2024-08-30 11:34:24.394575860 +0000
+++ configure 2024-08-30 11:37:24.038698880 +0000
@@ -18196,7 +18196,7 @@ else $as_nop
# disable test execution when cross_compile = yes
#
--- configure.orig 2024-09-28 16:06:43.000000000 +0000
+++ configure 2025-01-18 18:28:08.024342161 +0000
@@ -18375,7 +18375,7 @@
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the byte alignment" >&5
printf %s "checking the byte alignment... " >&6; }

- if test "$cross_compiling" = yes
+ if test "$cross_compiling" = maybe
then :
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -19209,7 +19209,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu


tmp_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+ CXXFLAGS="$CXXFLAGS"

{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler supports __attribute__((visibility(\"default\")))" >&5
printf %s "checking if compiler supports __attribute__((visibility(\"default\")))... " >&6; }
@@ -19247,7 +19247,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

printf "%s\n" "#define SUPPORT_ATTRIBUTE_VISIBILITY 1" >>confdefs.h

- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+ CXXFLAGS="$CXXFLAGS"

else
true
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
36 changes: 10 additions & 26 deletions cross/rtorrent/Makefile
Original file line number Diff line number Diff line change
@@ -1,43 +1,27 @@
PKG_NAME = rtorrent
PKG_VERS = 0.9.8
PKG_VERS = 0.15.1
PKG_EXT = tar.gz
PKG_DIST_SITE = https://github.com/rakshasa/rtorrent/archive
#PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
#PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
#PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
PKG_GIT_HASH = eacf9798e2787df7dd4d5c800a46bac7931ac41c
PKG_DIST_NAME = $(PKG_GIT_HASH).$(PKG_EXT)
PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-$(PKG_GIT_HASH)
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/rakshasa/rtorrent/releases/download/v$(PKG_VERS)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS = cross/ncursesw cross/libsigc++ cross/curl cross/libtorrent-rakshasa cross/xmlrpc-c

HOMEPAGE = https://rakshasa.github.com
COMMENT = rTorrent is a BitTorrent client for ncurses, using the libtorrent library. The client and library is written in C++ with emphasis on speed and efficiency, while delivering equivalent features to those found in GUI based clients in an ncurses client.
LICENSE = GPL

# newer libtorrent-rakshasa requires C++14 support
# Requires compiler with C++14 support
REQUIRED_MIN_DSM = 7.0
UNSUPPORTED_ARCHS = comcerto2k

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
# let it find xml2-config (referenced in xmlrpc-c-config)
ENV += "PATH=$(PATH):$(STAGING_INSTALL_PREFIX)/bin"

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

.PHONY: rtorrent_pre_configure
rtorrent_pre_configure:
cp src/linux-atomic.c $(WORK_DIR)/$(PKG_DIR)/src
# disable some compiler warnings:
ADDITIONAL_CXXFLAGS = -Wno-deprecated-declarations -Wno-unused-parameter -Wno-terminate -Wno-sign-compare -Wno-class-memaccess

.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
include ../../mk/spksrc.cross-cc.mk
6 changes: 3 additions & 3 deletions cross/rtorrent/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
rtorrent-giteacf9798e2787df7dd4d5c800a46bac7931ac41c.tar.gz SHA1 27fcaa6651b46c2b2b7a0275b1de1628e1b0291e
rtorrent-giteacf9798e2787df7dd4d5c800a46bac7931ac41c.tar.gz SHA256 714b06f0938b25df6d4e9e42a080f42abb9407f431a7e461e4de3bb6fc5aab1c
rtorrent-giteacf9798e2787df7dd4d5c800a46bac7931ac41c.tar.gz MD5 a6870aa16acb4dca606ccaded61f1862
rtorrent-0.15.1.tar.gz SHA1 81f6a17e211e099b28ca9b609837953ff6f1d17c
rtorrent-0.15.1.tar.gz SHA256 1d5437d7a6828f2f72a6c309f25f136eda1be69b059d250bc52e0d4185420506
rtorrent-0.15.1.tar.gz MD5 2b2a7f832ad3e0e026ab1bd6d1c15866
41 changes: 0 additions & 41 deletions cross/rtorrent/patches/001-add-building-lib-atomic.patch

This file was deleted.

Loading
Loading