usbmuxd: update to the latest git version

Notable changes
- revert default mode back to 1
- add support for modes 4 and 5
- correctly display 10 Gbps USB 3.x
- use more reliable macros to print --version output
- requires libplist 2.6.0

Signed-off-by: Georgi Valkov <gvalkov@gmail.com>

diff --git a/utils/usbmuxd/Makefile b/utils/usbmuxd/Makefile
index 16fc543ecdaecc40d19d8538da508e4aa44a9121..5e0d9cfa27b081e1ebcdaf68aac0a4dc4f78b858 100644 (file)
--- a/utils/usbmuxd/Makefile
+++ b/utils/usbmuxd/Makefile
@@ -12,9 +12,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/libimobiledevice/usbmuxd.git
-PKG_SOURCE_DATE:=2023-10-11
-PKG_SOURCE_VERSION:=360619c5f721f93f0b9d8af1a2df0b926fbcf281
-PKG_MIRROR_HASH:=e674ee39abbbae6dea7364be8b8287db2e333d033c226d4b2ed95f2e61a78576
+PKG_SOURCE_DATE:=2024-09-16
+PKG_SOURCE_VERSION:=0b1b233b57d581515978a09e5a4394bfa4ee4962
+PKG_MIRROR_HASH:=d53ae1ff6f0b0dae434380902427282715a68b9fad38be79cc1dd0095c8f0af7
 
 PKG_MAINTAINER:=Rosen Penev <rosenp@gmail.com>
 PKG_LICENSE:=GPL-2.0-or-later

diff --git a/utils/usbmuxd/patches/001-Revert-usb-Set-default-mode-to-3-to-include-CDC-NCM-.patch b/utils/usbmuxd/patches/001-Revert-usb-Set-default-mode-to-3-to-include-CDC-NCM-.patch
deleted file mode 100644 (file)
index 66af857..0000000
--- a/utils/usbmuxd/patches/001-Revert-usb-Set-default-mode-to-3-to-include-CDC-NCM-.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 906c7bbdd20e8d962f76364dea6e5486220c578b Mon Sep 17 00:00:00 2001
-From: Georgi Valkov <gvalkov@gmail.com>
-Date: Mon, 22 Apr 2024 23:13:48 +0300
-Subject: [PATCH] Revert "usb: Set default mode to 3 to include CDC NCM, and
- fix a log message"
-
-This reverts commit c7a0dd9b82633ea347497626282e3051a469ef50.
----
- src/usb.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/usb.c
-+++ b/src/usb.c
-@@ -691,7 +691,7 @@ static void get_mode_cb(struct libusb_tr
-       unsigned char *data = libusb_control_transfer_get_data(transfer);
- 
-       char* desired_mode_char = getenv(ENV_DEVICE_MODE);
--      int desired_mode = desired_mode_char ? atoi(desired_mode_char) : 3;
-+      int desired_mode = desired_mode_char ? atoi(desired_mode_char) : 1;
-       int guessed_mode = guess_mode(context->dev, dev);
- 
-       // Response is 3:3:3:0 for initial mode, 5:3:3:0 otherwise.

diff --git a/utils/usbmuxd/patches/002-version-print.patch b/utils/usbmuxd/patches/002-version-print.patch
deleted file mode 100644 (file)
index 4da3127..0000000
--- a/utils/usbmuxd/patches/002-version-print.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/main.c
-+++ b/src/main.c
-@@ -584,7 +584,7 @@ static void parse_opts(int argc, char **
-                       ++verbose;
-                       break;
-               case 'V':
--                      printf("%s\n", PACKAGE_STRING);
-+                      printf("%s %s\n", PACKAGE_STRING, PACKAGE_VERSION);
-                       exit(0);
-               case 'U':
-                       drop_privileges = 1;