Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits: cd901b53 by Steve Lhomme at 2026-06-03T06:03:15+00:00 contrib: vpx: pass the AS as environment on non-x86 Android It's not part of the HOSTVAR environment. But it's set in config.mak since [^1]. On x86 target --as is set to auto and will pick yasm/nasm. On other platforms we should use the assembler set in AS. [^1]: https://code.videolan.org/videolan/libvlcjni/-/commit/f8d8c2fcf3e63494b0c9dd16dbf22f39e1962e6c - - - - - 9c0d10ce by Steve Lhomme at 2026-06-03T06:03:15+00:00 Revert "contrib: vpx: fix build with NDK25" This reverts commit 7be5d4d844361de2461c557ef0114eed3cdc5aee. AS is properly passed via config.mak [^1]. With recent NDK it's llvm-as and not $(HOST)-as. [^1]: https://code.videolan.org/videolan/libvlcjni/-/commit/35f7a15c4542e7825d512b1f66fdd8fd7f63c549 - - - - - 1 changed file: - contrib/src/vpx/rules.mak Changes: ===================================== contrib/src/vpx/rules.mak ===================================== @@ -163,11 +163,12 @@ ifdef HAVE_ANDROID # toolchains, therefore pass the HOSTVARS directly to bypass any detection. ifneq ($(shell $(VPX_CROSS)gcc -v >/dev/null 2>&1 || echo FAIL),) VPX_HOSTVARS = $(HOSTVARS) + +ifeq ($(filter $(ARCH),i386 x86_64),) +# use CCAS for platforms not using nasm/yasm +VPX_HOSTVARS += AS="$(CCAS)" endif -# Depends on "arm-linux-androideabi-as" that is removed in NDK25 -ifeq ($(ARCH),arm) -VPX_CONF += --disable-neon_asm endif endif View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8548c6fbc52385f52aa037336b7a09e017d549ff...9c0d10ce7fc692e7978b4f243ff5e210035a5400 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8548c6fbc52385f52aa037336b7a09e017d549ff...9c0d10ce7fc692e7978b4f243ff5e210035a5400 You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help
_______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
