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>
This commit is contained in:
Siavash Sameni
113
vendor/audiopus_sys/opus/doc/build_draft.sh
vendored
Executable file
113
vendor/audiopus_sys/opus/doc/build_draft.sh
vendored
Executable file
@@ -0,0 +1,113 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright (c) 2011-2012 Xiph.Org Foundation and Mozilla Corporation
|
||||
#
|
||||
# This file is extracted from RFC6716. Please see that RFC for additional
|
||||
# information.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
#
|
||||
# - Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
#
|
||||
# - Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution.
|
||||
#
|
||||
# - Neither the name of Internet Society, IETF or IETF Trust, nor the
|
||||
# names of specific contributors, may be used to endorse or promote
|
||||
# products derived from this software without specific prior written
|
||||
# permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
|
||||
# OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||
# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#Stop on errors
|
||||
set -e
|
||||
#Set the CWD to the location of this script
|
||||
[ -n "${0%/*}" ] && cd "${0%/*}"
|
||||
|
||||
toplevel=".."
|
||||
destdir="opus_source"
|
||||
|
||||
echo packaging source code
|
||||
rm -rf "${destdir}"
|
||||
mkdir "${destdir}"
|
||||
mkdir "${destdir}/src"
|
||||
mkdir "${destdir}/silk"
|
||||
mkdir "${destdir}/silk/float"
|
||||
mkdir "${destdir}/silk/fixed"
|
||||
mkdir "${destdir}/silk/fixed/x86"
|
||||
mkdir "${destdir}/silk/fixed/arm"
|
||||
mkdir "${destdir}/silk/fixed/mips"
|
||||
mkdir "${destdir}/silk/x86"
|
||||
mkdir "${destdir}/silk/arm"
|
||||
mkdir "${destdir}/silk/mips"
|
||||
mkdir "${destdir}/celt"
|
||||
mkdir "${destdir}/celt/x86"
|
||||
mkdir "${destdir}/celt/arm"
|
||||
mkdir "${destdir}/celt/mips"
|
||||
mkdir "${destdir}/include"
|
||||
for f in `cat "${toplevel}"/opus_sources.mk "${toplevel}"/celt_sources.mk \
|
||||
"${toplevel}"/silk_sources.mk "${toplevel}"/opus_headers.mk \
|
||||
"${toplevel}"/celt_headers.mk "${toplevel}"/silk_headers.mk \
|
||||
| grep '\.[ch]' | sed -e 's/^.*=//' -e 's/\\\\//'` ; do
|
||||
cp -a "${toplevel}/${f}" "${destdir}/${f}"
|
||||
done
|
||||
cp -a "${toplevel}"/src/opus_demo.c "${destdir}"/src/
|
||||
cp -a "${toplevel}"/src/opus_compare.c "${destdir}"/src/
|
||||
cp -a "${toplevel}"/celt/opus_custom_demo.c "${destdir}"/celt/
|
||||
cp -a "${toplevel}"/Makefile.unix "${destdir}"/Makefile
|
||||
cp -a "${toplevel}"/opus_sources.mk "${destdir}"/
|
||||
cp -a "${toplevel}"/celt_sources.mk "${destdir}"/
|
||||
cp -a "${toplevel}"/silk_sources.mk "${destdir}"/
|
||||
cp -a "${toplevel}"/README.draft "${destdir}"/README
|
||||
cp -a "${toplevel}"/COPYING "${destdir}"/COPYING
|
||||
cp -a "${toplevel}"/tests/run_vectors.sh "${destdir}"/
|
||||
|
||||
GZIP=-9 tar --owner=root --group=root --format=v7 -czf opus_source.tar.gz "${destdir}"
|
||||
echo building base64 version
|
||||
cat opus_source.tar.gz| base64 | tr -d '\n' | fold -w 64 | \
|
||||
sed -e 's/^/\<spanx style="vbare"\>###/' -e 's/$/\<\/spanx\>\<vspace\/\>/' > \
|
||||
opus_source.base64
|
||||
|
||||
|
||||
#echo '<figure>' > opus_compare_escaped.c
|
||||
#echo '<artwork>' >> opus_compare_escaped.c
|
||||
#echo '<![CDATA[' >> opus_compare_escaped.c
|
||||
#cat opus_compare.c >> opus_compare_escaped.c
|
||||
#echo ']]>' >> opus_compare_escaped.c
|
||||
#echo '</artwork>' >> opus_compare_escaped.c
|
||||
#echo '</figure>' >> opus_compare_escaped.c
|
||||
|
||||
if [ ! -d ../opus_testvectors ] ; then
|
||||
echo "Downloading test vectors..."
|
||||
wget 'http://opus-codec.org/testvectors/opus_testvectors.tar.gz'
|
||||
tar -C .. -xvzf opus_testvectors.tar.gz
|
||||
fi
|
||||
echo '<figure>' > testvectors_sha1
|
||||
echo '<artwork>' >> testvectors_sha1
|
||||
echo '<![CDATA[' >> testvectors_sha1
|
||||
(cd ../opus_testvectors; sha1sum *.bit *.dec) >> testvectors_sha1
|
||||
#cd opus_testvectors
|
||||
#sha1sum *.bit *.dec >> ../testvectors_sha1
|
||||
#cd ..
|
||||
echo ']]>' >> testvectors_sha1
|
||||
echo '</artwork>' >> testvectors_sha1
|
||||
echo '</figure>' >> testvectors_sha1
|
||||
|
||||
echo running xml2rfc
|
||||
xml2rfc draft-ietf-codec-opus.xml draft-ietf-codec-opus.html &
|
||||
xml2rfc draft-ietf-codec-opus.xml
|
||||
wait
|
||||
Reference in New Issue
Block a user