From nobody Fri Jun 12 15:50:57 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gcPB94bwqz6j2VM for ; Fri, 12 Jun 2026 15:50:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gcPB941Mhz3gt4 for ; Fri, 12 Jun 2026 15:50:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781279457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rX2pRfysCnOOkrfwbs9U3WAa/GBDYgshB0k7b/+5TJw=; b=jI+sngS0fpOleGfRL61+kQrjX6Q++wuPhz5QsS5CEGj1W6GxvNUXngGl+4qE8kM/UjyqRO S2oKjJpYqmOTocQPpUp47axoO2C1O0/nC8oDoiBYaZuZdNS4W7nZ1lDFMdYs2NkSUGbii+ leI5kvLAZLC4Ii5QNAp3/5KKIeZqUQ069KGj15HOya2htuFQT41nw3O+IDTV68U1HOto0n d2uX2A7+CQQAStsBHz8d6eI2nXWDX8ih9yotb+nS+EfTUYujfaTTmS+9WyxtndSKolIgBX 9uAkcB1NV9PCYV2Wgeq/AzjXbxEI+0QGQYFXtXE8l+rz/sFFoOEFnaEN8savsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781279457; a=rsa-sha256; cv=none; b=jSm5eWZ4iA57umiAdJYTt9KEmAtr99XqYJk0x+agISJouZCnKMFxopvW3UditD8Qoz+j2G cCQqst8mknoWruUVkQs42fHE/sB5gGK2PM5lUl6Wuq/jdy85LXHx0cJpmS06CTvQ+gqFt0 /0ZBH8hDpkYOj2DddX9E5zzzC1tFnO537mKSkxleGVgwViVYvIJr+7YSI+6mfwOtlxNLpf in4W4l4GUJRCczHe0TqQsElG/M+5Iw+Z9GqTICIPf/IeOjsUri8eEfd16IPzxsTDEcMK51 olpApNxs6teGD/t1RsnLXkuzXEEPoJwOhJBaAuqQMlYpQKPSvnnvAVlUiWEToA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781279457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rX2pRfysCnOOkrfwbs9U3WAa/GBDYgshB0k7b/+5TJw=; b=XyV/E79nXS3oT2/SyImj9w0uoyEMSwA8KONl7CA5//3uxq0XN2K5AN5WNJ6gjr1/Eo2uAR T0tCugPbzK9OGkv++6N42fjjjvQuVwxLmsg8nThc6QRGLuGKbhjHIIKbGvCbTTmr9fvQV2 NxEhYl6WvkwfbEKNAnLIaIQxc1CLG6paVAS2NCr3iW4dC5vVoXKhjFAbePmLNk9jPBds3i lPCyGFnQLXMsfOsxgIf120YW0nZPs5RzPfqgy9PQH30QqVEftAne9res5KLLPII4lVYZmY bJfUyXCwRq+o3gOK3i0uKgLtqGbybco78mjgxnwo1EfMiAg5LmN2QJ28d5UOgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gcPB93ZkSzkTv for ; Fri, 12 Jun 2026 15:50:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33fce by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 12 Jun 2026 15:50:57 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: d4329efdcdfb - main - devel/android-tools: attempt to fix build on FreeBSD 14 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4329efdcdfb755f4bdd62583a1468e25e696391 Auto-Submitted: auto-generated Date: Fri, 12 Jun 2026 15:50:57 +0000 Message-Id: <6a2c2ae1.33fce.6a593c0a@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=d4329efdcdfb755f4bdd62583a1468e25e696391 commit d4329efdcdfb755f4bdd62583a1468e25e696391 Author: Baptiste Daroussin AuthorDate: 2026-06-10 16:02:25 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-12 15:50:33 +0000 devel/android-tools: attempt to fix build on FreeBSD 14 --- .../files/patch-vendor_adb_client_usb_libusb.cpp | 25 ++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/devel/android-tools/files/patch-vendor_adb_client_usb_libusb.cpp b/devel/android-tools/files/patch-vendor_adb_client_usb_libusb.cpp index eb215f1e08a9..004d7a251eba 100644 --- a/devel/android-tools/files/patch-vendor_adb_client_usb_libusb.cpp +++ b/devel/android-tools/files/patch-vendor_adb_client_usb_libusb.cpp @@ -1,5 +1,5 @@ ---- vendor/adb/client/usb_libusb.cpp.orig 2024-08-29 19:46:57.000000000 +0200 -+++ vendor/adb/client/usb_libusb.cpp 2026-04-13 19:58:23.616588000 +0200 +--- vendor/adb/client/usb_libusb.cpp.orig 2024-08-29 17:46:57 UTC ++++ vendor/adb/client/usb_libusb.cpp @@ -38,6 +38,8 @@ #ifdef ANDROID_TOOLS_USE_BUNDLED_LIBUSB @@ -9,10 +9,14 @@ #else #include #endif -@@ -507,8 +509,10 @@ +@@ -505,10 +507,14 @@ struct LibusbConnection : public Connection { + return 480; + case LIBUSB_SPEED_SUPER: return 5000; ++#ifdef LIBUSB_SPEED_SUPER_PLUS case LIBUSB_SPEED_SUPER_PLUS: return 10000; ++#endif +#ifdef LIBUSB_SPEED_SUPER_PLUS_X2 case LIBUSB_SPEED_SUPER_PLUS_X2: return 20000; @@ -20,15 +24,14 @@ case LIBUSB_SPEED_UNKNOWN: default: return 0; -@@ -526,20 +530,23 @@ +@@ -526,20 +532,23 @@ struct LibusbConnection : public Connection { msb++; } -- switch (1 << msb) { -- case LIBUSB_LOW_SPEED_OPERATION: + // Use literal values from 'enum libusb_supported_speed' (USB spec defined bits) + // to remain portable across libusb implementations that may not expose the enum. -+ switch (1 << msb) { + switch (1 << msb) { +- case LIBUSB_LOW_SPEED_OPERATION: + case (1 << 0): // LIBUSB_LOW_SPEED_OPERATION return 1; - case LIBUSB_FULL_SPEED_OPERATION: @@ -49,7 +52,7 @@ static uint64_t ExtractMaxSuperSpeedPlus(libusb_ssplus_usb_device_capability_descriptor* cap) { // The exponents is one of {bytes, kB, MB, or GB}. We express speed in MB so we use a 0 // multiplier for value which would result in 0MB anyway. -@@ -552,6 +559,7 @@ +@@ -552,6 +561,7 @@ struct LibusbConnection : public Connection { } return max_speed; } @@ -57,7 +60,7 @@ void RetrieveSpeeds() { negotiated_speed_ = ToConnectionSpeed(libusb_get_device_speed(device_.get())); -@@ -563,7 +571,9 @@ +@@ -563,7 +573,9 @@ struct LibusbConnection : public Connection { return; } @@ -68,7 +71,7 @@ switch (bos->dev_capability[i]->bDevCapabilityType) { case LIBUSB_BT_SS_USB_DEVICE_CAPABILITY: { libusb_ss_usb_device_capability_descriptor* cap = nullptr; -@@ -574,6 +584,7 @@ +@@ -574,6 +586,7 @@ struct LibusbConnection : public Connection { libusb_free_ss_usb_device_capability_descriptor(cap); } } break; @@ -76,7 +79,7 @@ case LIBUSB_BT_SUPERSPEED_PLUS_CAPABILITY: { libusb_ssplus_usb_device_capability_descriptor* cap = nullptr; if (!libusb_get_ssplus_usb_device_capability_descriptor( -@@ -582,6 +593,7 @@ +@@ -582,6 +595,7 @@ struct LibusbConnection : public Connection { libusb_free_ssplus_usb_device_capability_descriptor(cap); } } break;