Skip to content

Commit a68ea44

Browse files
cabana: use vendored libusb from commaai/dependencies (commaai#37681)
1 parent 5e7f5dd commit a68ea44

4 files changed

Lines changed: 13 additions & 4 deletions

File tree

SConstruct

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ pkgs = [importlib.import_module(name) for name in pkg_names]
4848
# vendored in commaai/dependencies.
4949
allowed_system_libs = {
5050
"EGL", "GLESv2", "GL", "Qt5Charts", "Qt5Core", "Qt5Gui", "Qt5Widgets",
51-
"dl", "drm", "gbm", "m", "pthread", "usb-1.0",
51+
"dl", "drm", "gbm", "m", "pthread",
5252
}
5353

5454
def _resolve_lib(env, name):

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ dependencies = [
3535
"zstd @ git+https://github.com/commaai/dependencies.git@release-zstd#subdirectory=zstd",
3636
"ncurses @ git+https://github.com/commaai/dependencies.git@release-ncurses#subdirectory=ncurses",
3737
"zeromq @ git+https://github.com/commaai/dependencies.git@release-zeromq#subdirectory=zeromq",
38+
"libusb @ git+https://github.com/commaai/dependencies.git@release-libusb#subdirectory=libusb",
3839
"git-lfs @ git+https://github.com/commaai/dependencies.git@release-git-lfs#subdirectory=git-lfs",
3940
"gcc-arm-none-eabi @ git+https://github.com/commaai/dependencies.git@release-gcc-arm-none-eabi#subdirectory=gcc-arm-none-eabi",
4041

tools/cabana/SConscript

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import subprocess
22
import os
33
import shutil
44

5+
import libusb
6+
57
Import('env', 'arch', 'common', 'messaging', 'visionipc', 'cereal')
68

79
# Detect Qt - skip build if not available
@@ -72,9 +74,8 @@ else:
7274
base_libs.append('Qt5Charts')
7375

7476
cabana_env = qt_env.Clone()
75-
if arch == "Darwin":
76-
cabana_env['CPPPATH'] += [f"{brew_prefix}/include"]
77-
cabana_env['LIBPATH'] += [f"{brew_prefix}/lib"]
77+
cabana_env['CPPPATH'] += [libusb.INCLUDE_DIR]
78+
cabana_env['LIBPATH'] += [libusb.LIB_DIR]
7879

7980
cabana_libs = [cereal, messaging, visionipc, replay_lib, 'avformat', 'avcodec', 'swresample', 'avutil', 'x264', 'z', 'bz2', 'zstd', 'yuv', 'usb-1.0'] + base_libs
8081
opendbc_path = '-DOPENDBC_FILE_PATH=\'"%s"\'' % (cabana_env.Dir("../../opendbc/dbc").abspath)

uv.lock

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)