[vlc-commits] [Git][videolan/vlc][master] 6 commits: CI: update win32 image

[Rémi Denis-Courmont (@Courmisch)]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
b5652321 by Tristan Matthews at 2022-02-26T08:31:31+00:00
CI: update win32 image

Fixes https://github.com/rust-lang/rust/issues/77394

- - - - -
7cb9c326 by Tristan Matthews at 2022-02-26T08:31:31+00:00
CI: update win64 image

- - - - -
577d2189 by Tristan Matthews at 2022-02-26T08:31:31+00:00
contrib: cargo: update cargo-c to 0.9.7

- - - - -
c4e17e42 by Tristan Matthews at 2022-02-26T08:31:31+00:00
contrib: update rust to 1.59.0 (latest stable)

- - - - -
c5dcc7c9 by Tristan Matthews at 2022-02-26T08:31:31+00:00
contrib: rav1e: update to 0.5.1

- - - - -
0b82f2d3 by Tristan Matthews at 2022-02-26T08:31:31+00:00
contrib: rav1e: avoid linking error on win32

Workaround for https://github.com/rust-lang/rust/issues/79609

- - - - -


5 changed files:

- contrib/src/cargo/rules.mak
- contrib/src/rav1e/SHA512SUMS
- contrib/src/rav1e/rules.mak
- + contrib/src/rav1e/unwind-resume-stub.patch
- extras/ci/gitlab-ci.yml


Changes:

=====================================
contrib/src/cargo/rules.mak
=====================================
@@ -1,7 +1,7 @@
 # cargo/cargo-c installation via rustup
 
-RUST_VERSION=1.47.0
-CARGOC_VERSION=0.6.13
+RUST_VERSION=1.59.0
+CARGOC_VERSION=0.9.7
 RUSTUP_VERSION=1.22.1
 RUSTUP_URL=https://github.com/rust-lang/rustup/archive/$(RUSTUP_VERSION).tar.gz
 


=====================================
contrib/src/rav1e/SHA512SUMS
=====================================
@@ -1 +1 @@
-d8466c7392cdcd6c6693174cc7148d57a82a8b2328f27b0665a3311e24c9fba136e7f5a35a222004e0554d64005e8b676601e437dcba5365cf69e3b8c61691d8  rav1e-0.4.1.tar.gz
+83a5117f82840575fe6d62b7d959cec94d0e86a9b6f89e400b261ac681f821b6be1a65689b75c12fd2f2e4f0f49daa05a1e0d020612ef790ba66722288115365  rav1e-0.5.1.tar.gz


=====================================
contrib/src/rav1e/rules.mak
=====================================
@@ -1,7 +1,7 @@
 # rav1e
 
-RAV1E_VERSION := 0.4.1
-RAV1E_URL := https://github.com/xiph/rav1e/archive/v$(RAV1E_VERSION).tar.gz
+RAV1E_VERSION := 0.5.1
+RAV1E_URL := https://crates.io/api/v1/crates/rav1e/$(RAV1E_VERSION)/download
 
 ifdef BUILD_RUST
 ifdef BUILD_ENCODERS
@@ -25,6 +25,9 @@ RAV1E_FEATURES=--features=asm
 
 rav1e: rav1e-$(RAV1E_VERSION).tar.gz .sum-rav1e .rav1e-vendor
 	$(UNPACK)
+ifdef HAVE_WIN32
+	$(APPLY) $(SRC)/rav1e/unwind-resume-stub.patch
+endif
 	$(CARGO_VENDOR_SETUP)
 	$(MOVE)
 


=====================================
contrib/src/rav1e/unwind-resume-stub.patch
=====================================
@@ -0,0 +1,27 @@
+From 30b9e63817bf60c3cab0bc6cebb073ee2344ac34 Mon Sep 17 00:00:00 2001
+From: Tristan Matthews <tmatth at videolan.org>
+Date: Fri, 25 Feb 2022 12:30:01 -0500
+Subject: [PATCH 1/1] lib: workaround for
+ https://github.com/rust-lang/rust/issues/79609
+
+This avoids to broken linking on some mingw32 versions. The function
+will never be called since we set `-C panic=abort`.
+---
+ src/lib.rs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/lib.rs b/src/lib.rs
+index 63afa2d5..412bb0e0 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -389,3 +389,7 @@ pub mod bench {
+ 
+ #[cfg(fuzzing)]
+ pub mod fuzzing;
++
++#[no_mangle]
++#[allow(non_snake_case)]
++fn _Unwind_Resume() {}
+-- 
+2.32.0
+


=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -19,8 +19,8 @@ default:
         - amd64
 
 variables:
-    VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32:20201106141924
-    VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64:20201106143728
+    VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32:20220224135804
+    VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64:20220224144130
     VLC_WIN_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-mingw:20211020094514
     VLC_UWP_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-uwp:20211020111246
     VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20210803114245



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a5eb80ea3dc0fd5e4b9e4814cde1a96cb1dcdbf1...0b82f2d30f3853deb6f17b60a94502b14945a128

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


VideoLAN code repository instance