From ab83f9798300a2853c669f324ba3c1f232d02d60 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 12 Dec 2023 16:13:31 -0500
Subject: [PATCH 1/2] libmtp: split tools/examples, udev rules

---
 srcpkgs/libmtp-udev     |  1 +
 srcpkgs/libmtp/template | 23 +++++++++++++++++++++--
 srcpkgs/mtp-tools       |  1 +
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/libmtp-udev
 create mode 120000 srcpkgs/mtp-tools

diff --git a/srcpkgs/libmtp-udev b/srcpkgs/libmtp-udev
new file mode 120000
index 0000000000000..e966e1f9db2e5
--- /dev/null
+++ b/srcpkgs/libmtp-udev
@@ -0,0 +1 @@
+libmtp
\ No newline at end of file
diff --git a/srcpkgs/libmtp/template b/srcpkgs/libmtp/template
index 8f87793b08e4d..ad03a6bd5dfee 100644
--- a/srcpkgs/libmtp/template
+++ b/srcpkgs/libmtp/template
@@ -1,12 +1,13 @@
 # Template file for 'libmtp'
 pkgname=libmtp
 version=1.1.21
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --with-udev=/usr/lib/udev
  --with-udev-group=plugdev"
 hostmakedepends="pkg-config"
 makedepends="libgcrypt-devel libusb-devel"
+depends="libmtp-udev"
 short_desc="Library for Microsoft's Media Transfer Protocol (MTP)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
@@ -17,7 +18,7 @@ checksum=c4ffa5ab8c8f48c91b0047f2e253c101c418d5696a5ed65c839922a4280872a7
 
 if [ "$CROSS_BUILD" ]; then
 	# XXX needs host mtp-hotplug
-	hostmakedepends+=" libmtp"
+	hostmakedepends+=" mtp-tools"
 fi
 
 pre_configure() {
@@ -35,3 +36,21 @@ libmtp-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+libmtp-udev_package() {
+	short_desc+=" - udev rules"
+	pkg_install() {
+		vmove usr/lib/udev/hwdb.d/69-libmtp.hwdb
+		vmove usr/lib/udev/rules.d/69-libmtp.rules
+		# this is hardcoded within the above rule
+		vmove usr/lib/udev/mtp-probe
+	}
+}
+
+mtp-tools_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - example tools"
+	pkg_install() {
+		vmove "usr/bin/*"
+	}
+}
diff --git a/srcpkgs/mtp-tools b/srcpkgs/mtp-tools
new file mode 120000
index 0000000000000..e966e1f9db2e5
--- /dev/null
+++ b/srcpkgs/mtp-tools
@@ -0,0 +1 @@
+libmtp
\ No newline at end of file

From b07f40abf7b4c8df07f17f21301812ed42c84b23 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 24 Nov 2023 16:55:28 -0500
Subject: [PATCH 2/2] android-file-transfer-linux: add libmtp-udev to depends,
 update to 4.3

it ships libmtp-ng but no udev rules
---
 srcpkgs/android-file-transfer-linux/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index 4480fb0ab6692..430deb820282f 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,15 +1,16 @@
 # Template file for 'android-file-transfer-linux'
 pkgname=android-file-transfer-linux
-version=4.2
-revision=3
+version=4.3
+revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIB=1"
 hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"
 makedepends="file-devel fuse-devel qt5-devel readline-devel
  qt5-tools-devel"
+depends="libmtp-udev"
 short_desc="Android File Transfer for Linux"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/whoozle/android-file-transfer-linux"
 distfiles="https://github.com/whoozle/android-file-transfer-linux/archive/v${version}.tar.gz"
-checksum=cc607d68e8a18273c9b56975a70a0e68fbdf9d5b903b2727a345a605ff48a19f
+checksum=8ff658630fc820a7ca0b70025aa47d235b7fb64f5cb6a72ca76a7acbf3435128