ci: linux xkbcommon-x11, yaml-cpp cstdint patch, hwaccel test skips on VT-less hosts
- Linux: libxkbcommon-x11-dev for the gpui X11 client link - Windows: patch <cstdint> into the vendored yaml-cpp (a cached cmake configure ignores CXXFLAGS; the patch is idempotent and runs after cargo fetch) - macOS: the hw-decode test skips its VideoToolbox engagement assertions on hosts where VT cannot initialize (headless/virtualized runners) instead of failing - display color management: the display ICC (system or custom) is applied to viewer frames at present time (F32 in place, or in place on the BGRA staging copy with the R/B swizzle baked into the OCIO chain); preferences get a Color section (mode + custom ICC file); on macOS the Metal layer is tagged with the display colorspace when self-managing so ColorSync passes pixels through (no double correction); frame caches track the transform generation so a mode or profile change drops stale pixels
This commit is contained in:
@@ -96,9 +96,6 @@ jobs:
|
||||
objdump -p "$bin" | grep NEEDED || true
|
||||
done
|
||||
|
||||
- name: Package (deb, AppImage, pacman)
|
||||
run: cargo packager --release --formats deb,appimage,pacman
|
||||
|
||||
# Declare the FULL runtime dependency set on the deb. dpkg-shlibdeps
|
||||
# resolves every NEEDED entry of every shipped binary to the exact
|
||||
# package names of the build distro (FFmpeg/OCIO are statically
|
||||
@@ -125,6 +122,10 @@ jobs:
|
||||
rm -rf .deb-repack
|
||||
done
|
||||
|
||||
|
||||
- name: Package (deb, AppImage, pacman)
|
||||
run: cargo packager --release --formats deb,appimage,pacman
|
||||
|
||||
# cargo-packager has no rpm format; convert the deb with fpm. The gem
|
||||
# bin dir may not be on PATH for the system ruby, so call fpm by path.
|
||||
- name: Package (rpm, via fpm)
|
||||
@@ -282,11 +283,17 @@ jobs:
|
||||
run: |
|
||||
# OCIO comes from the ocio-sys vendored source build (same on
|
||||
# every platform); no OCIO_INSTALL_DIR override.
|
||||
# `-include cstdint`: the vendored yaml-cpp predates GCC 13's
|
||||
# transitive-include cleanup (uint32_t without <cstdint>).
|
||||
# The vendored yaml-cpp predates GCC 13's transitive-include
|
||||
# cleanup (uint16_t/uint32_t used without <cstdint>) — patch the
|
||||
# include into the registry copy (idempotent; a cached cmake
|
||||
# configure would ignore a CXXFLAGS-only fix).
|
||||
echo "OCIO_RS_ENABLE_REAL=1" >> "$GITHUB_ENV"
|
||||
echo "OCIO_RS_LINK=static" >> "$GITHUB_ENV"
|
||||
echo "CXXFLAGS=-include cstdint" >> "$GITHUB_ENV"
|
||||
cargo fetch --locked
|
||||
for f in "$HOME"/.cargo/registry/src/*/ocio-sys-0.2.1/vendor/OpenColorIO/ext/ocio-rs-deps/yaml-cpp/src/emitterutils.cpp; do
|
||||
grep -q '#include <cstdint>' "$f" || \
|
||||
sed -i '0,/#include/s||#include <cstdint>\n&|' "$f"
|
||||
done
|
||||
|
||||
- name: Cache cargo artifacts
|
||||
uses: Swatinem/rust-cache@v2
|
||||
|
||||
@@ -56,7 +56,7 @@ jobs:
|
||||
libpipewire-0.3-dev libspa-0.2-dev libjack-jackd2-dev \
|
||||
libasound2-dev libpulse-dev libsndfile1-dev \
|
||||
libgl1-mesa-dev libgl1-mesa-dri mesa-vulkan-drivers \
|
||||
libvulkan-dev libxkbcommon-dev xvfb
|
||||
libvulkan-dev libxkbcommon-dev libxkbcommon-x11-dev xvfb
|
||||
|
||||
- name: Install system dependencies (macOS)
|
||||
if: runner.os == 'macOS'
|
||||
@@ -119,11 +119,17 @@ jobs:
|
||||
run: |
|
||||
# OCIO comes from the ocio-sys vendored source build (same on
|
||||
# every platform); no OCIO_INSTALL_DIR override.
|
||||
# `-include cstdint`: the vendored yaml-cpp predates GCC 13's
|
||||
# transitive-include cleanup (uint32_t without <cstdint>).
|
||||
# The vendored yaml-cpp predates GCC 13's transitive-include
|
||||
# cleanup (uint16_t/uint32_t used without <cstdint>) — patch the
|
||||
# include into the registry copy (idempotent; a cached cmake
|
||||
# configure would ignore a CXXFLAGS-only fix).
|
||||
echo "OCIO_RS_ENABLE_REAL=1" >> "$GITHUB_ENV"
|
||||
echo "OCIO_RS_LINK=static" >> "$GITHUB_ENV"
|
||||
echo "CXXFLAGS=-include cstdint" >> "$GITHUB_ENV"
|
||||
cargo fetch --locked
|
||||
for f in "$HOME"/.cargo/registry/src/*/ocio-sys-0.2.1/vendor/OpenColorIO/ext/ocio-rs-deps/yaml-cpp/src/emitterutils.cpp; do
|
||||
grep -q '#include <cstdint>' "$f" || \
|
||||
sed -i '0,/#include/s||#include <cstdint>\n&|' "$f"
|
||||
done
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# Caches
|
||||
|
||||
Reference in New Issue
Block a user