[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: opus: Simplify a condition for Windows on aarch64

[Tristan Matthews (@tmatth)]

Tristan Matthews pushed to branch master at VideoLAN / VLC


Commits:
c7c46352 by Martin Storsjö at 2024-03-12T00:13:21+00:00
contrib: opus: Simplify a condition for Windows on aarch64

While the CI configuration where this is encountered is LLVM specific
(because there is no upstream GCC that targets Windows on aarch64),
the issue that Opus lacks a RTCD implementation for Windows on
AArch64; this is not toolchain specific. Thus remove the unnecessary
HAVE_CLANG condition.

Also simplify the naming of the OS/arch combination (even if the
old naming presumably was chosen to match the CI configuration).

- - - - -
f2fca0cb by Martin Storsjö at 2024-03-12T00:13:21+00:00
contrib: opus: Disable RTCD for Windows armv7

Similarly to aarch64 Windows, Opus lacks an implementation of the
runtime cpu detection for armv7 Windows as well.

- - - - -


1 changed file:

- contrib/src/opus/rules.mak


Changes:

=====================================
contrib/src/opus/rules.mak
=====================================
@@ -24,11 +24,13 @@ ifndef HAVE_FPU
 OPUS_CONF += -D fixed-point=true
 endif
 
-# disable rtcd on win64-arm-llvm
+# disable rtcd on aarch64-windows
 ifeq ($(ARCH)-$(HAVE_WIN32),aarch64-1)
-ifdef HAVE_CLANG
 OPUS_CONF += -D rtcd=disabled
 endif
+# disable rtcd on armv7-windows
+ifeq ($(ARCH)-$(HAVE_WIN32),arm-1)
+OPUS_CONF += -D rtcd=disabled
 endif
 
 .opus: opus crossfile.meson



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/04381d694c9198c419bdb97c32e769a4cff90271...f2fca0cba80d187130b408d6b65928671fb1046e

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/04381d694c9198c419bdb97c32e769a4cff90271...f2fca0cba80d187130b408d6b65928671fb1046e
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance