mawei/sunnypilot-tesla
1
0
Fork 0
mirror of https://github.com/dzid26/sunnypilot.git synced 2026-06-08 07:44:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

cabana: use vendored libusb from commaai/dependencies (#37681)

Browse Source
This commit is contained in:
Adeeb Shihadeh
2026-03-14 16:47:17 -07:00
committed by GitHub
parent 5e7f5dd840
commit a68ea44af3
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@@ -48,7 +48,7 @@ pkgs = [importlib.import_module(name) for name in pkg_names]
# vendored in commaai/dependencies. # vendored in commaai/dependencies.
allowed_system_libs = { allowed_system_libs = {
"EGL", "GLESv2", "GL", "Qt5Charts", "Qt5Core", "Qt5Gui", "Qt5Widgets", "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): def _resolve_lib(env, name):

1
pyproject.toml
View File

@@ -35,6 +35,7 @@ dependencies = [
"zstd @ git+https://github.com/commaai/dependencies.git@release-zstd#subdirectory=zstd", "zstd @ git+https://github.com/commaai/dependencies.git@release-zstd#subdirectory=zstd",
"ncurses @ git+https://github.com/commaai/dependencies.git@release-ncurses#subdirectory=ncurses", "ncurses @ git+https://github.com/commaai/dependencies.git@release-ncurses#subdirectory=ncurses",
"zeromq @ git+https://github.com/commaai/dependencies.git@release-zeromq#subdirectory=zeromq", "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", "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", "gcc-arm-none-eabi @ git+https://github.com/commaai/dependencies.git@release-gcc-arm-none-eabi#subdirectory=gcc-arm-none-eabi",

7
tools/cabana/SConscript
View File

@@ -2,6 +2,8 @@ import subprocess
import os import os
import shutil import shutil
import libusb
Import('env', 'arch', 'common', 'messaging', 'visionipc', 'cereal') Import('env', 'arch', 'common', 'messaging', 'visionipc', 'cereal')
# Detect Qt - skip build if not available # Detect Qt - skip build if not available
@@ -72,9 +74,8 @@ else:
base_libs.append('Qt5Charts') base_libs.append('Qt5Charts')
cabana_env = qt_env.Clone() cabana_env = qt_env.Clone()
if arch == "Darwin": cabana_env['CPPPATH'] += [libusb.INCLUDE_DIR]
cabana_env['CPPPATH'] += [f"{brew_prefix}/include"] cabana_env['LIBPATH'] += [libusb.LIB_DIR]
cabana_env['LIBPATH'] += [f"{brew_prefix}/lib"]
cabana_libs = [cereal, messaging, visionipc, replay_lib, 'avformat', 'avcodec', 'swresample', 'avutil', 'x264', 'z', 'bz2', 'zstd', 'yuv', 'usb-1.0'] + base_libs 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) opendbc_path = '-DOPENDBC_FILE_PATH=\'"%s"\'' % (cabana_env.Dir("../../opendbc/dbc").abspath)

7
uv.lock generated
View File

@@ -569,6 +569,11 @@ name = "libjpeg"
version = "3.1.0" version = "3.1.0"
source = { git = "https://github.com/commaai/dependencies.git?subdirectory=libjpeg&rev=release-libjpeg#83fa530843e5109c51aef14327b6fde5dcb4507b" } 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]] [[package]]
name = "libusb1" name = "libusb1"
version = "3.3.1" version = "3.3.1"
@@ -796,6 +801,7 @@ dependencies = [
{ name = "jeepney" }, { name = "jeepney" },
{ name = "json-rpc" }, { name = "json-rpc" },
{ name = "libjpeg" }, { name = "libjpeg" },
{ name = "libusb" },
{ name = "libusb1" }, { name = "libusb1" },
{ name = "libyuv" }, { name = "libyuv" },
{ name = "ncurses" }, { name = "ncurses" },
@@ -875,6 +881,7 @@ requires-dist = [
{ name = "jinja2", marker = "extra == 'docs'" }, { name = "jinja2", marker = "extra == 'docs'" },
{ name = "json-rpc" }, { name = "json-rpc" },
{ name = "libjpeg", git = "https://github.com/commaai/dependencies.git?subdirectory=libjpeg&rev=release-libjpeg" }, { 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 = "libusb1" },
{ name = "libyuv", git = "https://github.com/commaai/dependencies.git?subdirectory=libyuv&rev=release-libyuv" }, { name = "libyuv", git = "https://github.com/commaai/dependencies.git?subdirectory=libyuv&rev=release-libyuv" },
{ name = "matplotlib", marker = "extra == 'dev'" }, { name = "matplotlib", marker = "extra == 'dev'" },