From 71bc748d983a2466c115895801c7ee8888a047fa Mon Sep 17 00:00:00 2001 From: Mike Solar Date: Sun, 30 Aug 2026 16:28:09 +0800 Subject: [PATCH] build: point ocio-sys at the fork carrying the zlib-ng detection fix The vendored minizip-ng prefers find_package(ZLIBNG) over the classic zlib the OCIO install scripts pass, so hosts with zlib-ng installed (Arch) produced zng_* references the vendored zlib cannot satisfy and the final link failed. Mike-Solar/ocio-rs@ddb677d disables the ZLIBNG package lookup; the fork main now carries that plus the cstdint fix. --- Cargo.lock | 2 +- Cargo.toml | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d44cd518b..675956ce8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5208,7 +5208,7 @@ dependencies = [ [[package]] name = "ocio-sys" version = "0.2.1" -source = "git+https://github.com/shaloong/ocio-rs.git?branch=main#933c65dc4e8e4e22767174f0e22b07fe7af42e07" +source = "git+https://github.com/Mike-Solar/ocio-rs.git?branch=main#ddb677d8a71d1047c2dd3f8a04fc88f7c5c23ccc" dependencies = [ "cc", "cmake", diff --git a/Cargo.toml b/Cargo.toml index f4010c228..f0e0f6ffd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -68,8 +68,10 @@ debug-assertions = false [profile.dev] opt-level = 1 -# ocio-sys 0.2.1's vendored yaml-cpp misses and fails to build on -# GCC >= 16; the fork carries exactly that fix (d39c509) until a fixed -# release lands on crates.io. +# ocio-sys 0.2.1's vendored sources fail to build on GCC >= 16 (yaml-cpp +# misses ) and misdetect a system zlib-ng (minizip-ng then emits +# zng_* symbols the vendored zlib cannot satisfy). The fork tracks +# shaloong/ocio-rs main plus both build fixes; return to the crates.io +# release once it carries them. [patch.crates-io] -ocio-sys = { git = "https://github.com/shaloong/ocio-rs.git", branch = "main" } +ocio-sys = { git = "https://github.com/Mike-Solar/ocio-rs.git", branch = "main" }