From nobody Mon Apr 13 18:31:30 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 4fvbb65Pvwz6ZWw2 for ; Mon, 13 Apr 2026 18:31:30 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvbb63G7Qz3ZbH for ; Mon, 13 Apr 2026 18:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776105090; 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=7yCM2qvtuoXAYf2wR2hv3SY0RGw8S/Cg0RNZ+fP0de0=; b=i3HZ2F+RzLFqbAaAK1NMnu5ufnPAh3WJ/O2Pgjqz6g/kC+RQPEqNJDIntS6Bu+PSYvxfnC A3vnAeBngQTJJ2ua6fP8Cy/W3KxZjf14smKOv6YuZbYapcz2ihNvUxuPoTKb7qyUVWQg0R 9BCr59eyqAKdsMav+euZAgj28/ky9/pPITscvqgL3Nv4OJ0/S54x8De11OcZlZGM+Gb14E ut3ER8LYpkQ4Ua72ojQtJm8rQX0bGvCCF8zww7f2ouqOkz/8TbvImmNPAWl/bMywdOXBVZ 3ovIbtMRZJeGXgJZA3Iq3sKfTqf22lA1/6XgFJLvSUf3tMvDGfWUe4HhNZmROg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776105090; a=rsa-sha256; cv=none; b=x44mdCAbGkdawjDkd6QDsocq7gguhJqxsm8bpk2LKeWfv6mdKAHEIbqgSkenhnERTKsw8L GpMINx7/S6pZbndjatjFtk1MDrhXIfKiln0noKox2kiP2ypAoMWQVPR5sFdSIIDMtr0Oqi MoF8E1TYnCarWus+kBWjVOTtjH4EqzNubRXkugyhcLRG9F/DWdfiDUzU46Gh0t9KKHoJhE vsN/B/nmT1JLC8j48wZN9Z6IuwOcI7cbYApod7C2VMZYJZ2M4yMgw6ucZ8Sa7BcWHB7JAz iUrnjJu3BGhk+CC40y3pzkzkIIq51zruQKjy9EZCIOMKF4UWL3d5X1Q9dgUi4A== 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=1776105090; 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=7yCM2qvtuoXAYf2wR2hv3SY0RGw8S/Cg0RNZ+fP0de0=; b=DJYwPCPx6XkoZs/rJliu7TiGRJJrtkXwAyJ946z/uyyRw59wzlBr2ziuR9wmAD2Teyu46A oNqMkMLCfmNILSYUPSXpCqc1GVU8oOOUSur9552j6yVjiZzTmVseWy1goTxdDBeE3N2JzP u/wnyaCGGqRdlk7KuQ1/je8w1OtNuP1hHW5ydnrqe5cvKDIhCbCrLxruwR1anBgyA2sz6f UO+5Jmn9j//eLILVqr/q6LgrcTLuSNnWyiwnc/ULynQ1XjLz4h6uAYK7TCf6gbCdo8SboY fx34y07DWl87UzAF/2H9x7QaL2e2xZeJLs1ix9JEqnj52HvZRwzAi7CmumankA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvbb62qjZz1MR for ; Mon, 13 Apr 2026 18:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b2a9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 18:31:30 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 2c5d3da1a28c - main - devel/android-tools: 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 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: 2c5d3da1a28cb534a9a730a94bc1962853c67573 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 18:31:30 +0000 Message-Id: <69dd3682.3b2a9.712f3c91@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c5d3da1a28cb534a9a730a94bc1962853c67573 commit 2c5d3da1a28cb534a9a730a94bc1962853c67573 Author: Baptiste Daroussin AuthorDate: 2026-04-13 18:29:55 +0000 Commit: Baptiste Daroussin CommitDate: 2026-04-13 18:31:22 +0000 devel/android-tools: fix build on FreeBSD 14 the libusb backends uses macros which only exists on FreeBSD 15.0+ switch back to literals so it builds everywhere. PR: 294487 --- .../files/patch-vendor_adb_client_usb_libusb.cpp | 44 +++++++++++++++++++--- 1 file changed, 38 insertions(+), 6 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 948f55ad3ae1..eb215f1e08a9 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 2024-08-29 19:46:57.000000000 +0200 -+++ vendor/adb/client/usb_libusb.cpp 2026-03-21 14:00:02.239458000 +0100 +--- 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 @@ -38,6 +38,8 @@ #ifdef ANDROID_TOOLS_USE_BUNDLED_LIBUSB @@ -20,7 +20,28 @@ case LIBUSB_SPEED_UNKNOWN: default: return 0; -@@ -540,6 +544,7 @@ +@@ -526,20 +530,23 @@ + 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) { ++ case (1 << 0): // LIBUSB_LOW_SPEED_OPERATION + return 1; +- case LIBUSB_FULL_SPEED_OPERATION: ++ case (1 << 1): // LIBUSB_FULL_SPEED_OPERATION + return 12; +- case LIBUSB_HIGH_SPEED_OPERATION: ++ case (1 << 2): // LIBUSB_HIGH_SPEED_OPERATION + return 480; +- case LIBUSB_SUPER_SPEED_OPERATION: ++ case (1 << 3): // LIBUSB_SUPER_SPEED_OPERATION + return 5000; + default: + return 0; } } @@ -28,7 +49,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 +557,7 @@ +@@ -552,6 +559,7 @@ } return max_speed; } @@ -36,7 +57,18 @@ void RetrieveSpeeds() { negotiated_speed_ = ToConnectionSpeed(libusb_get_device_speed(device_.get())); -@@ -574,6 +580,7 @@ +@@ -563,7 +571,9 @@ + return; + } + +- for (int i = 0; i < bos->bNumDeviceCaps; i++) { ++ // Use bNumDeviceCapabilities for portability: on FreeBSD < 15 the field has ++ // this name; on FreeBSD >= 15 and upstream libusb it is a macro alias. ++ for (int i = 0; i < bos->bNumDeviceCapabilities; i++) { + 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 @@ libusb_free_ss_usb_device_capability_descriptor(cap); } } break; @@ -44,7 +76,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 +589,7 @@ +@@ -582,6 +593,7 @@ libusb_free_ssplus_usb_device_capability_descriptor(cap); } } break;