Attachment #252121 for bug #279895




PORTNAME=	android-file-transfer
DISTVERSIONPREFIX=	v
DISTVERSION=	4.3
PORTREVISION?=	1
CATEGORIES=	sysutils

MAINTAINER=	tiago.gasiba@gmail.com
COMMENT=	Android MTP client with minimalistic UI
WWW=		https://github.com/whoozle/android-file-transfer-linux

LICENSE=	GPLv3+

USES=		cmake compiler:c++11-lib pkgconfig
USE_GITHUB=	yes
GH_ACCOUNT=	whoozle
GH_PROJECT=	${PORTNAME}-linux

USES=		cmake compiler:c++11-lib pkgconfig
CMAKE_ON=	USB_BACKEND_LIBUSB
PLIST_FILES=	"@comment lib/libmtp-ng-static.a"

OPTIONS_DEFINE=		CLI FUSE OPENSSL PYTHON QT5 TAGLIB
OPTIONS_DEFAULT=	CLI OPENSSL TAGLIB
OPTIONS_EXCLUDE?=	QT5 # enslaved until subpackaging

CLI_DESC=		CLI (Command-Line Interface) support
TAGLIB_DESC=		Reading audio metadata via taglib
CLI_USES=		readline
CLI_PLIST_FILES=	bin/aft-mtp-cli

FUSE_USES=		fuse
FUSE_CMAKE_BOOL=	BUILD_FUSE
FUSE_PLIST_FILES=	bin/aft-mtp-mount

OPENSSL_USES=		ssl
OPENSSL_CMAKE_BOOL=	BUILD_MTPZ

PYTHON_BUILD_DEPENDS=	pybind11>0:devel/pybind11
PYTHON_USES=		python
PYTHON_CMAKE_BOOL=	BUILD_PYTHON
PYTHON_PLIST_FILES=	${PYTHON_SITELIBDIR}/aftl${PYTHON_EXT_SUFFIX}.so

QT5_USES=		qt:5
QT5_USE=		QT=core,gui,network,widgets,buildtools:build,linguisttools:build,qmake:build
QT5_CMAKE_BOOL=		BUILD_QT_UI
QT5_CMAKE_ON=		-DDESIRED_QT_VERSION:STRING=5
QT5_PLIST_FILES=	bin/android-file-transfer \
			share/applications/android-file-transfer.desktop \
			share/icons/hicolor/512x512/apps/android-file-transfer.png \
			share/metainfo/android-file-transfer.appdata.xml

TAGLIB_DESC=		Reading audio metadata via taglib
TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
TAGLIB_CMAKE_BOOL=	BUILD_TAGLIB


Lines 1-3 Link Here

(-)b/sysutils/android-file-transfer/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1609258228	1	TIMESTAMP = 1721159585
2	SHA256 (whoozle-android-file-transfer-linux-v4.2_GH0.tar.gz) = cc607d68e8a18273c9b56975a70a0e68fbdf9d5b903b2727a345a605ff48a19f	2	SHA256 (whoozle-android-file-transfer-linux-v4.3_GH0.tar.gz) = 8ff658630fc820a7ca0b70025aa47d235b7fb64f5cb6a72ca76a7acbf3435128
3	SIZE (whoozle-android-file-transfer-linux-v4.2_GH0.tar.gz) = 823609	3	SIZE (whoozle-android-file-transfer-linux-v4.3_GH0.tar.gz) = 827232

Added Link Here

(-)b/sysutils/android-file-transfer/files/patch-mtp_backend_libusb_usb_Context.cpp (+11 lines)
1	--- mtp/backend/libusb/usb/Context.cpp.orig 2024-07-16 19:25:15 UTC
2	+++ mtp/backend/libusb/usb/Context.cpp
3	@@ -27,7 +27,7 @@ namespace mtp { namespace usb
4	Context::Context(int debugLevel)
5	{
6	USB_CALL(libusb_init(&_ctx));
7	- libusb_set_debug(_ctx, debugLevel);
8	+ //libusb_set_debug(_ctx, debugLevel);
9	libusb_device **devs;
10	int count = libusb_get_device_list(_ctx, &devs);
11	if (count < 0)




--- python/FindPythonLibsNew.cmake.orig	2024-07-16 20:38:32 UTC
+++ python/FindPythonLibsNew.cmake
@@ -74,13 +74,28 @@ endif()
 #
 # The library suffix is from the config var LDVERSION sometimes, otherwise
 # VERSION. VERSION will typically be like "2.7" on unix, and "27" on windows.
-execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c"
-    "from distutils import sysconfig as s;import sys;import struct;
+execute_process(
+  COMMAND
+    "${Python_EXECUTABLE}" "-c" "
+import sys;import struct;
+import sysconfig as s
+USE_SYSCONFIG = sys.version_info >= (3, 10)
+if not USE_SYSCONFIG:
+    from distutils import sysconfig as ds
 print('.'.join(str(v) for v in sys.version_info));
 print(sys.prefix);
-print(s.get_python_inc(plat_specific=True));
-print(s.get_python_lib(plat_specific=True));
-print(s.get_config_var('SO'));
+if USE_SYSCONFIG:
+    scheme = s.get_default_scheme()
+    if scheme == 'posix_local':
+        # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/
+        scheme = 'posix_prefix'
+    print(s.get_path('platinclude', scheme))
+    print(s.get_path('platlib'))
+    print(s.get_config_var('EXT_SUFFIX') or s.get_config_var('SO'))
+else:
+    print(ds.get_python_inc(plat_specific=True));
+    print(ds.get_python_lib(plat_specific=True));
+    print(ds.get_config_var('EXT_SUFFIX') or ds.get_config_var('SO'));
 print(hasattr(sys, 'gettotalrefcount')+0);
 print(struct.calcsize('@P'));
 print(s.get_config_var('LDVERSION') or s.get_config_var('VERSION'));
@@ -196,7 +211,7 @@ find_package_message(PYTHON
 
 find_package_message(PYTHON
     "Found PythonLibs: ${PYTHON_LIBRARY}"
-    "${PYTHON_EXECUTABLE}${PYTHON_VERSION}")
+    "${Python_EXECUTABLE}${PYTHON_VERSION}")
 
 set(PYTHONLIBS_FOUND TRUE)
 set(PythonLibsNew_FOUND TRUE)

Return to bug 279895

Lines 1-34 Link Here

(-)b/sysutils/android-file-transfer/Makefile (-21 / +20 lines)
1	PORTNAME= android-file-transfer	1	PORTNAME= android-file-transfer
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 4.2	3	DISTVERSION= 4.3
4	PORTREVISION?= 1
5	CATEGORIES= sysutils	4	CATEGORIES= sysutils
6		5
7	MAINTAINER= ports@FreeBSD.org	6	MAINTAINER= tiago.gasiba@gmail.com
8	COMMENT= Android MTP client with minimalistic UI	7	COMMENT= Android MTP client with minimalistic UI
9	WWW= https://github.com/whoozle/android-file-transfer-linux	8	WWW= https://github.com/whoozle/android-file-transfer-linux
10		9
11	LICENSE= GPLv3+	10	LICENSE= GPLv3+
12		11
		12	USES= cmake compiler:c++11-lib pkgconfig
13	USE_GITHUB= yes	13	USE_GITHUB= yes
14	GH_ACCOUNT= whoozle	14	GH_ACCOUNT= whoozle
15	GH_PROJECT= ${PORTNAME}-linux	15	GH_PROJECT= ${PORTNAME}-linux
16		16
17	USES= cmake compiler:c++11-lib pkgconfig
18	CMAKE_ON= USB_BACKEND_LIBUSB	17	CMAKE_ON= USB_BACKEND_LIBUSB
19	PLIST_FILES= "@comment lib/libmtp-ng-static.a"	18	PLIST_FILES= "@comment lib/libmtp-ng-static.a"
20		19
21	OPTIONS_DEFINE= CLI FUSE OPENSSL PYTHON QT5 TAGLIB	20	OPTIONS_DEFINE= CLI FUSE OPENSSL PYTHON QT5 TAGLIB
22	OPTIONS_DEFAULT=CLI FUSE OPENSSL PYTHON QT5 TAGLIB	21	OPTIONS_DEFAULT= CLI OPENSSL TAGLIB
23	OPTIONS_EXCLUDE?= QT5 # enslaved until subpackaging	22	OPTIONS_EXCLUDE?= QT5 # enslaved until subpackaging
24		23
25	CLI_DESC= CLI (Command-Line Interface) support	24	CLI_DESC= CLI (Command-Line Interface) support
26	CLI_USES= readline	25	TAGLIB_DESC= Reading audio metadata via taglib
27	CLI_PLIST_FILES=bin/aft-mtp-cli	26	CLI_USES= readline
		27	CLI_PLIST_FILES= bin/aft-mtp-cli
28		28
29	FUSE_USES= fuse	29	FUSE_USES= fuse
30	FUSE_CMAKE_BOOL=BUILD_FUSE	30	FUSE_CMAKE_BOOL= BUILD_FUSE
31	FUSE_PLIST_FILES=bin/aft-mtp-mount	31	FUSE_PLIST_FILES= bin/aft-mtp-mount
32		32
33	OPENSSL_USES= ssl	33	OPENSSL_USES= ssl
34	OPENSSL_CMAKE_BOOL= BUILD_MTPZ	34	OPENSSL_CMAKE_BOOL= BUILD_MTPZ
Lines 36-53 OPENSSL_CMAKE_BOOL= BUILD_MTPZ Link Here
36	PYTHON_BUILD_DEPENDS= pybind11>0:devel/pybind11	36	PYTHON_BUILD_DEPENDS= pybind11>0:devel/pybind11
37	PYTHON_USES= python	37	PYTHON_USES= python
38	PYTHON_CMAKE_BOOL= BUILD_PYTHON	38	PYTHON_CMAKE_BOOL= BUILD_PYTHON
39	PYTHON_PLIST_FILES= %%PYTHON_SITELIBDIR%%/aftl%%PYTHON_EXT_SUFFIX%%.so	39	PYTHON_PLIST_FILES= ${PYTHON_SITELIBDIR}/aftl${PYTHON_EXT_SUFFIX}.so
40		40
41	QT5_USES= qt:5	41	QT5_USES= qt:5
42	QT5_USE= QT=qmake:build,buildtools:build,linguisttools:build,core,gui,network,widgets	42	QT5_USE= QT=core,gui,network,widgets,buildtools:build,linguisttools:build,qmake:build
43	QT5_CMAKE_BOOL= BUILD_QT_UI	43	QT5_CMAKE_BOOL= BUILD_QT_UI
44	QT5_CMAKE_ON= -DDESIRED_QT_VERSION:STRING=5	44	QT5_CMAKE_ON= -DDESIRED_QT_VERSION:STRING=5
45	QT5_PLIST_FILES= bin/android-file-transfer \	45	QT5_PLIST_FILES= bin/android-file-transfer \
46	share/applications/android-file-transfer.desktop \	46	share/applications/android-file-transfer.desktop \
47	share/icons/hicolor/512x512/apps/android-file-transfer.png \	47	share/icons/hicolor/512x512/apps/android-file-transfer.png \
48	share/metainfo/android-file-transfer.appdata.xml	48	share/metainfo/android-file-transfer.appdata.xml
49		49
50	TAGLIB_DESC= Reading audio metadata via taglib
51	TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib	50	TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib
52	TAGLIB_CMAKE_BOOL= BUILD_TAGLIB	51	TAGLIB_CMAKE_BOOL= BUILD_TAGLIB
53		52

Added Link Here

(-)b/sysutils/android-file-transfer/files/patch-python_FindPythonLibsNew.cmake (-1 / +45 lines)
0	-	1	--- python/FindPythonLibsNew.cmake.orig 2024-07-16 20:38:32 UTC
		2	+++ python/FindPythonLibsNew.cmake
		3	@@ -74,13 +74,28 @@ endif()
		4	#
		5	# The library suffix is from the config var LDVERSION sometimes, otherwise
		6	# VERSION. VERSION will typically be like "2.7" on unix, and "27" on windows.
		7	-execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c"
		8	- "from distutils import sysconfig as s;import sys;import struct;
		9	+execute_process(
		10	+ COMMAND
		11	+ "${Python_EXECUTABLE}" "-c" "
		12	+import sys;import struct;
		13	+import sysconfig as s
		14	+USE_SYSCONFIG = sys.version_info >= (3, 10)
		15	+if not USE_SYSCONFIG:
		16	+ from distutils import sysconfig as ds
		17	print('.'.join(str(v) for v in sys.version_info));
		18	print(sys.prefix);
		19	-print(s.get_python_inc(plat_specific=True));
		20	-print(s.get_python_lib(plat_specific=True));
		21	-print(s.get_config_var('SO'));
		22	+if USE_SYSCONFIG:
		23	+ scheme = s.get_default_scheme()
		24	+ if scheme == 'posix_local':
		25	+ # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/
		26	+ scheme = 'posix_prefix'
		27	+ print(s.get_path('platinclude', scheme))
		28	+ print(s.get_path('platlib'))
		29	+ print(s.get_config_var('EXT_SUFFIX') or s.get_config_var('SO'))
		30	+else:
		31	+ print(ds.get_python_inc(plat_specific=True));
		32	+ print(ds.get_python_lib(plat_specific=True));
		33	+ print(ds.get_config_var('EXT_SUFFIX') or ds.get_config_var('SO'));
		34	print(hasattr(sys, 'gettotalrefcount')+0);
		35	print(struct.calcsize('@P'));
		36	print(s.get_config_var('LDVERSION') or s.get_config_var('VERSION'));
		37	@@ -196,7 +211,7 @@ find_package_message(PYTHON
		38
		39	find_package_message(PYTHON
		40	"Found PythonLibs: ${PYTHON_LIBRARY}"
		41	- "${PYTHON_EXECUTABLE}${PYTHON_VERSION}")
		42	+ "${Python_EXECUTABLE}${PYTHON_VERSION}")
		43
		44	set(PYTHONLIBS_FOUND TRUE)
		45	set(PythonLibsNew_FOUND TRUE)