From cbbb23db4de5640a81f7c36b64adc6e3dc483239 Mon Sep 17 00:00:00 2001 From: Andrey Syutkin Date: Fri, 11 Sep 2026 20:01:14 +0300 Subject: [PATCH] app-misc/far2l: use system libusb with bundled libmtp Signed-off-by: Andrey Syutkin --- app-misc/far2l/far2l-2.9.0_beta.ebuild | 9 ++++++--- app-misc/far2l/far2l-9999.ebuild | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app-misc/far2l/far2l-2.9.0_beta.ebuild b/app-misc/far2l/far2l-2.9.0_beta.ebuild index 87064f8b2d..27f694a301 100644 --- a/app-misc/far2l/far2l-2.9.0_beta.ebuild +++ b/app-misc/far2l/far2l-2.9.0_beta.ebuild @@ -33,7 +33,7 @@ REQUIRED_USE=" RESTRICT="mirror" # media-libs/libmtp provides udev rules and plugdev access for MTP devices. -# far2l itself uses the bundled libmtp/libusb. +# far2l itself uses the bundled libmtp with mtp enabled. RDEPEND=" archive? ( app-arch/libarchive ) aws? ( @@ -42,7 +42,10 @@ RDEPEND=" ) chardet? ( app-i18n/uchardet ) colorer? ( dev-libs/libxml2 ) - mtp? ( media-libs/libmtp ) + mtp? ( + media-libs/libmtp + dev-libs/libusb:1 + ) nfs? ( net-fs/libnfs ) python? ( ${PYTHON_DEPS} @@ -116,7 +119,7 @@ src_configure() { if use mtp; then mycmakeargs+=( - -DMTP_SYSTEM_LIBUSB=OFF + -DMTP_SYSTEM_LIBUSB=ON -DMTP_SYSTEM_LIBMTP=OFF ) fi diff --git a/app-misc/far2l/far2l-9999.ebuild b/app-misc/far2l/far2l-9999.ebuild index 87064f8b2d..27f694a301 100644 --- a/app-misc/far2l/far2l-9999.ebuild +++ b/app-misc/far2l/far2l-9999.ebuild @@ -33,7 +33,7 @@ REQUIRED_USE=" RESTRICT="mirror" # media-libs/libmtp provides udev rules and plugdev access for MTP devices. -# far2l itself uses the bundled libmtp/libusb. +# far2l itself uses the bundled libmtp with mtp enabled. RDEPEND=" archive? ( app-arch/libarchive ) aws? ( @@ -42,7 +42,10 @@ RDEPEND=" ) chardet? ( app-i18n/uchardet ) colorer? ( dev-libs/libxml2 ) - mtp? ( media-libs/libmtp ) + mtp? ( + media-libs/libmtp + dev-libs/libusb:1 + ) nfs? ( net-fs/libnfs ) python? ( ${PYTHON_DEPS} @@ -116,7 +119,7 @@ src_configure() { if use mtp; then mycmakeargs+=( - -DMTP_SYSTEM_LIBUSB=OFF + -DMTP_SYSTEM_LIBUSB=ON -DMTP_SYSTEM_LIBMTP=OFF ) fi