From a68ea44af3418cf80d6b8d34bd1f7299af05c19a Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Sat, 14 Mar 2026 16:47:17 -0700
Subject: [PATCH] cabana: use vendored libusb from commaai/dependencies
 (#37681)

---
 SConstruct              | 2 +-
 pyproject.toml          | 1 +
 tools/cabana/SConscript | 7 ++++---
 uv.lock                 | 7 +++++++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/SConstruct b/SConstruct
index 9d3dc8526e..feaadd5a41 100644
--- a/SConstruct
+++ b/SConstruct
@@ -48,7 +48,7 @@ pkgs = [importlib.import_module(name) for name in pkg_names]
 # vendored in commaai/dependencies.
 allowed_system_libs = {
   "EGL", "GLESv2", "GL", "Qt5Charts", "Qt5Core", "Qt5Gui", "Qt5Widgets",
-  "dl", "drm", "gbm", "m", "pthread", "usb-1.0",
+  "dl", "drm", "gbm", "m", "pthread",
 }
 
 def _resolve_lib(env, name):
diff --git a/pyproject.toml b/pyproject.toml
index b60346b031..a754f580bd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -35,6 +35,7 @@ dependencies = [
   "zstd @ git+https://github.com/commaai/dependencies.git@release-zstd#subdirectory=zstd",
   "ncurses @ git+https://github.com/commaai/dependencies.git@release-ncurses#subdirectory=ncurses",
   "zeromq @ git+https://github.com/commaai/dependencies.git@release-zeromq#subdirectory=zeromq",
+  "libusb @ git+https://github.com/commaai/dependencies.git@release-libusb#subdirectory=libusb",
   "git-lfs @ git+https://github.com/commaai/dependencies.git@release-git-lfs#subdirectory=git-lfs",
   "gcc-arm-none-eabi @ git+https://github.com/commaai/dependencies.git@release-gcc-arm-none-eabi#subdirectory=gcc-arm-none-eabi",
 
diff --git a/tools/cabana/SConscript b/tools/cabana/SConscript
index d604fe67ef..dbe4dbc659 100644
--- a/tools/cabana/SConscript
+++ b/tools/cabana/SConscript
@@ -2,6 +2,8 @@ import subprocess
 import os
 import shutil
 
+import libusb
+
 Import('env', 'arch', 'common', 'messaging', 'visionipc', 'cereal')
 
 # Detect Qt - skip build if not available
@@ -72,9 +74,8 @@ else:
   base_libs.append('Qt5Charts')
 
 cabana_env = qt_env.Clone()
-if arch == "Darwin":
-  cabana_env['CPPPATH'] += [f"{brew_prefix}/include"]
-  cabana_env['LIBPATH'] += [f"{brew_prefix}/lib"]
+cabana_env['CPPPATH'] += [libusb.INCLUDE_DIR]
+cabana_env['LIBPATH'] += [libusb.LIB_DIR]
 
 cabana_libs = [cereal, messaging, visionipc, replay_lib, 'avformat', 'avcodec', 'swresample', 'avutil', 'x264', 'z', 'bz2', 'zstd', 'yuv', 'usb-1.0'] + base_libs
 opendbc_path = '-DOPENDBC_FILE_PATH=\'"%s"\'' % (cabana_env.Dir("../../opendbc/dbc").abspath)
diff --git a/uv.lock b/uv.lock
index ce613e08ba..8e597db6ef 100644
--- a/uv.lock
+++ b/uv.lock
@@ -569,6 +569,11 @@ name = "libjpeg"
 version = "3.1.0"
 source = { git = "https://github.com/commaai/dependencies.git?subdirectory=libjpeg&rev=release-libjpeg#83fa530843e5109c51aef14327b6fde5dcb4507b" }
 
+[[package]]
+name = "libusb"
+version = "1.0.29"
+source = { git = "https://github.com/commaai/dependencies.git?subdirectory=libusb&rev=release-libusb#5f188080524c3c6d098ab6cb8d206ceef0394e8e" }
+
 [[package]]
 name = "libusb1"
 version = "3.3.1"
@@ -796,6 +801,7 @@ dependencies = [
     { name = "jeepney" },
     { name = "json-rpc" },
     { name = "libjpeg" },
+    { name = "libusb" },
     { name = "libusb1" },
     { name = "libyuv" },
     { name = "ncurses" },
@@ -875,6 +881,7 @@ requires-dist = [
     { name = "jinja2", marker = "extra == 'docs'" },
     { name = "json-rpc" },
     { name = "libjpeg", git = "https://github.com/commaai/dependencies.git?subdirectory=libjpeg&rev=release-libjpeg" },
+    { name = "libusb", git = "https://github.com/commaai/dependencies.git?subdirectory=libusb&rev=release-libusb" },
     { name = "libusb1" },
     { name = "libyuv", git = "https://github.com/commaai/dependencies.git?subdirectory=libyuv&rev=release-libyuv" },
     { name = "matplotlib", marker = "extra == 'dev'" },