Compare commits

...

3 Commits

Author SHA1 Message Date
Adeeb Shihadeh
6fe17e7b31 add libjpeg-turbo package (#15)
Vendors libjpeg-turbo 3.1.0 as a static library for openpilot, following
the same pattern as zstd/ncurses/zeromq.

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-24 10:09:19 -08:00
Adeeb Shihadeh
2377af3f1f fix git-lfs on macOS 2026-02-23 22:59:08 -08:00
Adeeb Shihadeh
b9f89a5a5d disable LTO for zstd to fix cross-version linking on macOS
LTO bitcode is compiler-version-specific. The wheel built with
clang 17 produces bitcode that clang 16 (used in openpilot CI)
cannot read. Disable IPO to produce standard object files.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-23 22:46:55 -08:00
6 changed files with 143 additions and 2 deletions

View File

@@ -49,7 +49,6 @@ else
fi
chmod +x "$INSTALL_DIR/git-lfs"
strip "$INSTALL_DIR/git-lfs" 2>/dev/null || true
rm -f "$FILENAME"

56
libjpeg/build.sh Executable file
View File

@@ -0,0 +1,56 @@
#!/usr/bin/env bash
set -e
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
cd "$DIR"
VERSION="3.1.0"
INSTALL_DIR="$DIR/libjpeg/install"
# Idempotent: skip if already built
if [ -f "$INSTALL_DIR/lib/libjpeg.a" ]; then
echo "libjpeg already present, skipping build."
exit 0
fi
NJOBS="$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 2)"
# Clone
if [ ! -d "libjpeg-turbo-src" ]; then
git clone --depth 1 --branch "${VERSION}" https://github.com/libjpeg-turbo/libjpeg-turbo.git libjpeg-turbo-src
fi
# Build
PREFIX="$DIR/build/prefix"
mkdir -p "$DIR/build"
cmake -S libjpeg-turbo-src -B "$DIR/build" \
-DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF \
-DCMAKE_INSTALL_PREFIX="$PREFIX" \
-DCMAKE_INSTALL_LIBDIR=lib \
-DENABLE_SHARED=OFF \
-DENABLE_STATIC=ON \
-DWITH_TURBOJPEG=OFF
cmake --build "$DIR/build" -j"$NJOBS"
cmake --install "$DIR/build"
# Copy to package install dir
rm -rf "$INSTALL_DIR"
mkdir -p "$INSTALL_DIR"/{lib,include}
# Library
cp "$PREFIX/lib/libjpeg.a" "$INSTALL_DIR/lib/"
# Headers
cp "$PREFIX/include/jpeglib.h" "$INSTALL_DIR/include/"
cp "$PREFIX/include/jconfig.h" "$INSTALL_DIR/include/"
cp "$PREFIX/include/jerror.h" "$INSTALL_DIR/include/"
cp "$PREFIX/include/jmorecfg.h" "$INSTALL_DIR/include/"
# Clean up
rm -rf libjpeg-turbo-src "$DIR/build"
echo "Installed libjpeg to $INSTALL_DIR"
du -sh "$INSTALL_DIR"

View File

@@ -0,0 +1,10 @@
import os
DIR = os.path.join(os.path.dirname(__file__), "install")
LIB_DIR = os.path.join(DIR, "lib")
INCLUDE_DIR = os.path.join(DIR, "include")
def smoketest():
assert os.path.isfile(os.path.join(LIB_DIR, "libjpeg.a")), "libjpeg.a not found"
assert os.path.isfile(os.path.join(INCLUDE_DIR, "jpeglib.h")), "jpeglib.h not found"

15
libjpeg/pyproject.toml Normal file
View File

@@ -0,0 +1,15 @@
[build-system]
requires = ["setuptools>=64", "wheel"]
build-backend = "setuptools.build_meta"
[project]
name = "libjpeg"
version = "3.1.0"
description = "libjpeg-turbo JPEG library (static build)"
requires-python = ">=3.8"
[tool.setuptools.packages.find]
include = ["libjpeg*"]
[tool.setuptools.package-data]
libjpeg = ["install/**/*"]

61
libjpeg/setup.py Normal file
View File

@@ -0,0 +1,61 @@
import os
import platform
import subprocess
from setuptools.command.build_py import build_py
try:
from wheel.bdist_wheel import bdist_wheel
except ImportError:
bdist_wheel = None
class BuildLibjpeg(build_py):
"""Run build.sh to compile libjpeg-turbo before collecting package data."""
def run(self):
pkg_dir = os.path.dirname(os.path.abspath(__file__))
marker = os.path.join(pkg_dir, "libjpeg", "install", "lib", "libjpeg.a")
if not os.path.exists(marker):
build_script = os.path.join(pkg_dir, "build.sh")
subprocess.check_call(["bash", build_script], cwd=pkg_dir)
super().run()
cmdclass = {"build_py": BuildLibjpeg}
if bdist_wheel is not None:
class PlatformWheel(bdist_wheel):
"""Produce a platform-specific, Python-version-agnostic wheel."""
def finalize_options(self):
super().finalize_options()
self.root_is_pure = False
def get_tag(self):
system = platform.system()
machine = platform.machine()
if system == "Linux":
plat = f"linux_{machine}"
elif system == "Darwin":
plat = "macosx_11_0_arm64"
else:
plat = f"{system.lower()}_{machine}"
return "py3", "none", plat
cmdclass["bdist_wheel"] = PlatformWheel
def setup():
from setuptools import setup as _setup
_setup(cmdclass=cmdclass)
if __name__ == "__main__":
setup()

View File

@@ -26,7 +26,7 @@ mkdir -p "$DIR/build"
cmake -S zstd-src/build/cmake -B "$DIR/build" \
-DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF \
-DCMAKE_INSTALL_PREFIX="$PREFIX" \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \