manawenuz/wz-phone

Fork 0

Files

Siavash Sameni 0683dde5d3

Mirror to GitHub / mirror (push) Failing after 35s

Details

Build Release Binaries / build-amd64 (push) Has been cancelled

Details

fix(windows): vendor audiopus_sys + patch libopus for clang-cl SIMD

cargo-xwin drives the Windows MSVC cross-compile via clang-cl, under
which CMake sets MSVC=1 — causing libopus 1.3.1's `if(NOT MSVC)` guards
to skip the per-file `-msse4.1` / `-mssse3` COMPILE_FLAGS that its x86
SIMD source files need. Clang-cl (unlike real cl.exe) still honors
Clang's target-feature system, so those files then fail to compile
with "always_inline function '_mm_cvtepi16_epi32' requires target
feature 'sse4.1'" errors across silk/NSQ_sse4_1.c, NSQ_del_dec_sse4_1.c,
and VQ_WMat_EC_sse4_1.c.

Earlier attempts to fix this downstream (cargo-xwin toolchain file,
override.cmake CMAKE_C_COMPILE_OBJECT <FLAGS> replace, CFLAGS env vars)
all failed because cargo-xwin rewrites override.cmake from scratch on
every `cargo xwin build` invocation and cmake-rs's -DCMAKE_C_FLAGS=
assembly happens before toolchain FORCE sets propagate.

Fixing it upstream at the source: vendor audiopus_sys 0.2.2 into
vendor/audiopus_sys, patch its bundled opus/CMakeLists.txt to introduce
an MSVC_CL var (true only when CMAKE_C_COMPILER_ID == "MSVC", i.e. real
cl.exe), and flip the eight `if(NOT MSVC)` SIMD guards to
`if(NOT MSVC_CL)`. Clang-cl then gets the GCC-style per-file flags and
the SSE4.1 sources build cleanly. Also flip the `if(MSVC)` global /arch
block at line 445 to `if(MSVC_CL)` so only cl.exe applies /arch:AVX and
clang-cl relies purely on per-file flags (no global/per-file mixing).

Wire via [patch.crates-io] in the workspace root Cargo.toml; the patch
is resolved relative to the workspace root as `vendor/audiopus_sys`.

Upstream context: xiph/opus#256, xiph/opus PR #257 (both stale).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

2026-04-10 14:12:59 +04:00

1.3 KiB

Raw Permalink Blame History

Change Log

An overview of changes:

[0.2.0]

Now requires cmake.
Windows will build via cmake too.
Windows pre-built binaries have been removed.
Updated bindgen to version 0.58.

[0.1.8]

This release adds build support for FreeBSD.

[0.1.7]

Add missing opus-folder.

[0.1.6]

This release removes the bindgen-dependency from the default features. Additionally, the bindgen-feature has been added in order to generate a new binding.

[0.1.4 and 0.1.5]

v0.1.4: This release fixes a problem where audiopus_sys could not find the Opus folder.

v0.1.5: Convert Unix-relevant files' EOLs from CRLF to LF inside the opus-folder.

Fix

Bundle the Opus project again.
Added missing cfg on find_via_pkg_config.

[0.1.3]

Fixes build-issues related to pkg-config.

[0.1.2]

This release adds the ability to bypass pkg-config.

Added:

Ignore pkg-config when LIBOPUS_NO_PKG or OPUS_NO_PKG is set.
Print the dynamic/static build cause via cargo:info.
Add missing repository-link in Cargo.toml.

[0.1.1]

Added:

Copy Opus' source to OUT_DIR before building to avoid modifying and generating files outside of OUT_DIR.

Fixed:

Convert Unix-relevant files' EOLs from CRLF to LF inside the opus-folder.
Resolve unused import warnings when building with Unix.

1.3 KiB Raw Permalink Blame History

Change Log

[0.2.0]

[0.1.8]

[0.1.7]

[0.1.6]

[0.1.4 and 0.1.5]

Fix

[0.1.3]

[0.1.2]

Added:

[0.1.1]

Added:

Fixed:

1.3 KiB

Raw Permalink Blame History