[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: Update cargo-c to 0.9.20 and rust to 1.69.0

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
615483a3 by Vikram Kangotra at 2023-06-10T20:48:26+00:00
contrib: Update cargo-c to 0.9.20 and rust to 1.69.0

This update is necessary for the wasm32-unknown-emscripten build, as it depends on
cargo-c version 0.9.20. Additionally, cargo-c requires a minimum Rust version of 1.69.0.

- - - - -
2fe052a3 by Vikram Kangotra at 2023-06-10T20:48:26+00:00
contrib: Add RUST_TARGET for emscripten

This commit introduces the choice of wasm32-unknown-emscripten as the target triple for writing Rust modules
in VLC. By selecting wasm32-unknown-emscripten, we leverage the asm.js ABI and Emscripten toolchain,
allowing seamless integration of Rust code with VLC's existing JavaScript-based infrastructure.

While wasm32-unknown-unknown offers a more general-purpose standalone WebAssembly deployment,
wasm32-unknown-emscripten aligns better with VLC's goal of extending its capabilities specifically
for web browsers.

- - - - -
6db5fb2b by Vikram Kangotra at 2023-06-10T20:48:26+00:00
contrib: enable rav1e for wasm32-emscripten

- - - - -


3 changed files:

- contrib/src/cargo/rules.mak
- contrib/src/main-rust.mak
- extras/package/wasm-emscripten/build.sh


Changes:

=====================================
contrib/src/cargo/rules.mak
=====================================
@@ -1,7 +1,7 @@
 # cargo/cargo-c installation via rustup
 
-RUST_VERSION=1.66.1
-CARGOC_VERSION=0.9.15
+RUST_VERSION=1.69.0
+CARGOC_VERSION=0.9.20
 RUSTUP_VERSION=1.25.1
 RUSTUP_URL=$(GITHUB)/rust-lang/rustup/archive/$(RUSTUP_VERSION).tar.gz
 


=====================================
contrib/src/main-rust.mak
=====================================
@@ -41,6 +41,8 @@ endif
 endif
 else ifdef HAVE_BSD
 RUST_TARGET = $(HOST)
+else ifdef HAVE_EMSCRIPTEN
+RUST_TARGET = $(HOST)
 endif
 
 # For now, VLC don't support Tier 3 platforms (ios 32bit, tvOS).


=====================================
extras/package/wasm-emscripten/build.sh
=====================================
@@ -131,7 +131,7 @@ diagnostic "vlc contribs: bootstrap"
             --disable-spatialaudio --disable-speex \
             --disable-speexdsp --disable-taglib --disable-zvbi \
             --disable-rnnoise --disable-libaribcaption \
-            --host=wasm32-unknown-emscripten
+            --host=wasm32-unknown-emscripten --enable-rav1e
 
 diagnostic "vlc contribs: make"
 if [ "$VLC_USE_PREBUILT_CONTRIBS" -ne "0" ]; then



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3ecfdc5deb966231cef613e6dda1f228cafb2c64...6db5fb2b64bcd267fb60ab7e6896f94c561a1b49

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3ecfdc5deb966231cef613e6dda1f228cafb2c64...6db5fb2b64bcd267fb60ab7e6896f94c561a1b49
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance