diff options
Diffstat (limited to 'comms/usbmuxd/files')
| -rw-r--r-- | comms/usbmuxd/files/patch-configure.ac | 14 | ||||
| -rw-r--r-- | comms/usbmuxd/files/patch-src_usb.c | 20 | ||||
| -rw-r--r-- | comms/usbmuxd/files/usbmuxd.conf.in | 4 |
3 files changed, 24 insertions, 14 deletions
diff --git a/comms/usbmuxd/files/patch-configure.ac b/comms/usbmuxd/files/patch-configure.ac index 40c76ce88439..6a870ed7697e 100644 --- a/comms/usbmuxd/files/patch-configure.ac +++ b/comms/usbmuxd/files/patch-configure.ac @@ -1,19 +1,9 @@ -Remove bash-ism from configure script. Disable udev/systemd detection for *BSD as the catch-all assumes a Linux system. A configuration file for devd(8) is provided by this port instead. ---- configure.ac.orig 2020-06-09 02:57:16 UTC +--- configure.ac.orig 2025-02-01 20:07:39 UTC +++ configure.ac -@@ -36,7 +36,7 @@ if test "x$have_limd" = "xyes"; then - AC_SUBST(libimobiledevice_CFLAGS) - AC_SUBST(libimobiledevice_LIBS) - CACHED_CFLAGS="$CFLAGS" -- CFLAGS+=" $libimobiledevice_CFLAGS" -+ CFLAGS="$CFLAGS $libimobiledevice_CFLAGS" - AC_CACHE_CHECK(for enum idevice_connection_type, ac_cv_enum_idevice_connection_type, - AC_TRY_COMPILE([ - #include <libimobiledevice/libimobiledevice.h> -@@ -125,7 +125,7 @@ case ${host_os} in +@@ -126,7 +126,7 @@ case ${host_os} in AC_SUBST(WINDRES) activation_method="manual" ;; diff --git a/comms/usbmuxd/files/patch-src_usb.c b/comms/usbmuxd/files/patch-src_usb.c new file mode 100644 index 000000000000..3f27871966e8 --- /dev/null +++ b/comms/usbmuxd/files/patch-src_usb.c @@ -0,0 +1,20 @@ +The LIBUSB_SPEED_SUPER_PLUS emum was added in libusb 1.0.24 (December +10, 2020). Support for the LIBUSB_SPEED_SUPER_PLUS enum was much more +recently added to our implementation in [1]. + +[1] https://cgit.freebsd.org/src/commit/?id=f938c0a90313125a9518307e80ca92d4c71f7745 + +--- src/usb.c.orig 2025-02-01 20:07:39 UTC ++++ src/usb.c +@@ -625,9 +625,11 @@ static void device_complete_initialization(struct mode + case LIBUSB_SPEED_SUPER: + usbdev->speed = 5000000000; + break; ++#if defined(__FreeBSD__) && __FreeBSD_version >= 1500044 + case LIBUSB_SPEED_SUPER_PLUS: + usbdev->speed = 10000000000; + break; ++#endif + case LIBUSB_SPEED_HIGH: + case LIBUSB_SPEED_UNKNOWN: + default: diff --git a/comms/usbmuxd/files/usbmuxd.conf.in b/comms/usbmuxd/files/usbmuxd.conf.in index 62b79de65440..18a7a8a11b54 100644 --- a/comms/usbmuxd/files/usbmuxd.conf.in +++ b/comms/usbmuxd/files/usbmuxd.conf.in @@ -10,7 +10,7 @@ notify 100 { match "subsystem" "DEVICE"; match "type" "ATTACH"; match "vendor" "0x05ac"; - match "product" "(0x12[9a][0-9a-f]|0x8600)"; + match "product" "(0x12[9a][0-9a-f]|0x190[1-5]|0x8600)"; action "chgrp %%GROUPS%% /dev/$cdev; chmod g+rw /dev/$cdev"; action "%%PREFIX%%/sbin/usbmuxd -U %%USERS%% -z"; }; @@ -20,7 +20,7 @@ notify 100 { match "subsystem" "DEVICE"; match "type" "DETACH"; match "vendor" "0x05ac"; - match "product" "(0x12[9a][0-9a-f]|0x8600)"; + match "product" "(0x12[9a][0-9a-f]|0x190[1-5]|0x8600)"; action "%%PREFIX%%/sbin/usbmuxd -x"; action "sleep 5"; }; |