From nobody Tue Apr 25 09:05:45 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q5GLf648hz46tfv; Tue, 25 Apr 2023 09:05:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q5GLd3cdwz3qH6; Tue, 25 Apr 2023 09:05:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682413545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=41aTe0ZjHYNxHUJ0svUjfL2K0qKYUUPz0ajJnWq1Zno=; b=AUrVo6LELk7PjKjg+ZwocCL1uPggnvuI08LrNb21FxC/ZKfhFSkIWDTq7ccwTQ8+hpRHAz MO3DPV0KfEyM8AtIQPDbGojCTfuzcdHxOryeHAdo728vbTJtS1mQcPARtpdO6tr7X0J3li sesde1frCwcRisIJhzLMrq53Kt2N26+KL5sw6UmgKsM/qg2eHiaj6leKSh9nfjVL2Ja7hY cJjIthDG1Gc5aPvsqtDh2Arr0ssv6i//oinT02CRhzeIDadgg6ZuG6kV8cumYzENU24T3x 44RODtRHSE6uKcklVhY784E/YLZgStAgMCOINvJW2FUohT3Y9yWoc3fLRhe8pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682413545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=41aTe0ZjHYNxHUJ0svUjfL2K0qKYUUPz0ajJnWq1Zno=; b=Q9fGnEb0fcsH6M0IFiQaiE7H6QUrkHTQzwxGeNjJdgBQh6Gx+tA/lyWDTcJlEcSgFIaKrM tbCc7FM9bVWY674X/2UnjdBEjJ7OFIBiZggPaQEEFrne9CpTt7oHyPTc3ES4RS3pzRZld9 ehC4dYLwmu7qMQV5R0NDIKqRUWfJZhARqSFmmES+kdbGBHZ+ExOEIWIBTilnkzq5SthM2N 9Z34XznVhisOBwcytfyR8PqtITLkHKGqjlKgaB1xAy9Z2MbOJX+vUdFHUu3Hboc2Vjjt4w uWQpRY681kXIr3DAnvo0bGyfzK9KKvR1LkvN4HzeHzy4qcxD8kWDFo05c+WfZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682413545; a=rsa-sha256; cv=none; b=ZWR/kyCx5fseFCRp0rshwvoE/PdnMYauaYRFtuF7AImNOyFiwAlhqG7gRsAFqQc570lYIv xfPSeoUqzqJNXT/Y7fImLks+bsmRxLMkRY5osMfXwtWyNNn3Atj9PN1mr40V2HEpHEzFhs iPWm5Y0+5kXLEwPeahfd4R+nKSoPUjAD+hMn5DV1bSiRM9+q3697ZHdCcfH9K0bn5YIAaS 4s8g/5xDbDnFn3H47qM3KZO+7M2PmEOxzBQJcWecoZp6nZYa3gx+UDRTqNRqAkpO8OpfwB DQzJXxEWJt1R+lDXgCilu4p9g21uUsQOwvhhR41/gkiCuPd8x1EjVtanoSKAnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q5GLd2kHLz122j; Tue, 25 Apr 2023 09:05:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33P95jUn097862; Tue, 25 Apr 2023 09:05:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33P95jfs097861; Tue, 25 Apr 2023 09:05:45 GMT (envelope-from git) Date: Tue, 25 Apr 2023 09:05:45 GMT Message-Id: <202304250905.33P95jfs097861@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: d9bf924e99dd - main - net-p2p/qbittorrent: Adjust default settings when using libtorrent-rasterbar 2.x List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9bf924e99dd21a80d29cae265fdfa2bf0b77486 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d9bf924e99dd21a80d29cae265fdfa2bf0b77486 commit d9bf924e99dd21a80d29cae265fdfa2bf0b77486 Author: Daniel Engberg AuthorDate: 2023-04-25 08:52:48 +0000 Commit: Daniel Engberg CommitDate: 2023-04-25 09:05:39 +0000 net-p2p/qbittorrent: Adjust default settings when using libtorrent-rasterbar 2.x * Disable memmory mapped file handling and use "POSIX-compliant" * Backport commit 8bcac1bed28f93c0712e915f43294b1e5fd03659 which reduces FilePoolSize * Change status to experimental This change only applies to new installs, if you have a configuration already you need to apply these changes by hand References: https://github.com/qbittorrent/qBittorrent/commit/8bcac1bed28f93c0712e915f43294b1e5fd03659 https://github.com/arvidn/libtorrent/issues/6667#issuecomment-1502670412 PR: 270765 Reviewed by: yuri (previous revision) --- net-p2p/qbittorrent/Makefile | 3 ++- .../files/extrapatch-libtorrent-rasterbar2-settings | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile index 43d20ca3aeec..b92a9c896e9f 100644 --- a/net-p2p/qbittorrent/Makefile +++ b/net-p2p/qbittorrent/Makefile @@ -54,7 +54,7 @@ OPTIONS_DEFAULT= DBUS LIBTORRENT1 LIBTORRENT_DESC= libtorrent version number to use LIBTORRENT1_DESC= Version 1.x (default) -LIBTORRENT2_DESC= Version 2.x (unstable, has memory issues) +LIBTORRENT2_DESC= Version 2.x (experimental) DEBUG_CONFIGURE_ENABLE= debug DBUS_CONFIGURE_ENABLE= qt-dbus @@ -64,6 +64,7 @@ LIBTORRENT1_BUILD_DEPENDS= libtorrent-rasterbar>0:net-p2p/libtorrent-rasterbar LIBTORRENT1_RUN_DEPENDS= libtorrent-rasterbar>0:net-p2p/libtorrent-rasterbar LIBTORRENT2_BUILD_DEPENDS= libtorrent-rasterbar2>0:net-p2p/libtorrent-rasterbar2 LIBTORRENT2_RUN_DEPENDS= libtorrent-rasterbar2>0:net-p2p/libtorrent-rasterbar2 +LIBTORRENT2_EXTRA_PATCHES= ${FILESDIR}/extrapatch-libtorrent-rasterbar2-settings PYTHON_DESC= Install Python to support some plugin functionality PYTHON_USES= python:3.6+,run diff --git a/net-p2p/qbittorrent/files/extrapatch-libtorrent-rasterbar2-settings b/net-p2p/qbittorrent/files/extrapatch-libtorrent-rasterbar2-settings new file mode 100644 index 000000000000..673afe7f73fe --- /dev/null +++ b/net-p2p/qbittorrent/files/extrapatch-libtorrent-rasterbar2-settings @@ -0,0 +1,17 @@ +--- src/base/bittorrent/sessionimpl.cpp.orig 2023-02-27 22:40:57 UTC ++++ src/base/bittorrent/sessionimpl.cpp +@@ -396,12 +396,12 @@ SessionImpl::SessionImpl(QObject *parent) + , m_announceToAllTiers(BITTORRENT_SESSION_KEY(u"AnnounceToAllTiers"_qs), true) + , m_asyncIOThreads(BITTORRENT_SESSION_KEY(u"AsyncIOThreadsCount"_qs), 10) + , m_hashingThreads(BITTORRENT_SESSION_KEY(u"HashingThreadsCount"_qs), 1) +- , m_filePoolSize(BITTORRENT_SESSION_KEY(u"FilePoolSize"_qs), 5000) ++ , m_filePoolSize(BITTORRENT_SESSION_KEY(u"FilePoolSize"_qs), 500) + , m_checkingMemUsage(BITTORRENT_SESSION_KEY(u"CheckingMemUsageSize"_qs), 32) + , m_diskCacheSize(BITTORRENT_SESSION_KEY(u"DiskCacheSize"_qs), -1) + , m_diskCacheTTL(BITTORRENT_SESSION_KEY(u"DiskCacheTTL"_qs), 60) + , m_diskQueueSize(BITTORRENT_SESSION_KEY(u"DiskQueueSize"_qs), (1024 * 1024)) +- , m_diskIOType(BITTORRENT_SESSION_KEY(u"DiskIOType"_qs), DiskIOType::Default) ++ , m_diskIOType(BITTORRENT_SESSION_KEY(u"DiskIOType"_qs), DiskIOType::Posix) + , m_diskIOReadMode(BITTORRENT_SESSION_KEY(u"DiskIOReadMode"_qs), DiskIOReadMode::EnableOSCache) + , m_diskIOWriteMode(BITTORRENT_SESSION_KEY(u"DiskIOWriteMode"_qs), DiskIOWriteMode::EnableOSCache) + #ifdef Q_OS_WIN