[vlc-commits] [Git][videolan/vlc][master] contrib: rav1e: remove i686 unwind patch

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
6e5d01d1 by Steve Lhomme at 2024-07-13T09:09:10+00:00
contrib: rav1e: remove i686 unwind patch

We only build with LLVM for i686 and it doesn't seem needed there.

- - - - -


2 changed files:

- contrib/src/rav1e/rules.mak
- − contrib/src/rav1e/unwind-resume-stub.patch


Changes:

=====================================
contrib/src/rav1e/rules.mak
=====================================
@@ -60,11 +60,6 @@ rav1e-vendor: rav1e-$(RAV1E_VERSION)-vendor.tar.bz2 .sum-rav1e-vendor
 
 rav1e: rav1e-$(RAV1E_VERSION).tar.gz .sum-rav1e
 	$(UNPACK)
-ifdef HAVE_WIN32
-ifndef HAVE_WIN64
-	$(APPLY) $(SRC)/rav1e/unwind-resume-stub.patch
-endif
-endif
 	$(call cargo_vendor_setup,$(UNPACK_DIR),$@)
 	$(MOVE)
 


=====================================
contrib/src/rav1e/unwind-resume-stub.patch deleted
=====================================
@@ -1,55 +0,0 @@
-From d186b5350e425a82dbd4513b5d629dc892c3c4a5 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] 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 | 32 ++++++++++++++++++++++++++++++++
- 1 file changed, 32 insertions(+)
-
-diff --git a/src/lib.rs b/src/lib.rs
-index 3425588d..1b645340 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -486,3 +486,35 @@ pub mod bench {
- 
- #[cfg(fuzzing)]
- pub mod fuzzing;
-+
-+#[no_mangle]
-+#[allow(non_snake_case)]
-+fn _Unwind_GetDataRelBase() {}
-+
-+#[no_mangle]
-+#[allow(non_snake_case)]
-+fn _Unwind_GetIPInfo() {}
-+
-+#[no_mangle]
-+#[allow(non_snake_case)]
-+fn _Unwind_GetLanguageSpecificData() {}
-+
-+#[no_mangle]
-+#[allow(non_snake_case)]
-+fn _Unwind_GetRegionStart() {}
-+
-+#[no_mangle]
-+#[allow(non_snake_case)]
-+fn _Unwind_GetTextRelBase() {}
-+
-+#[no_mangle]
-+#[allow(non_snake_case)]
-+fn _Unwind_Resume() {}
-+
-+#[no_mangle]
-+#[allow(non_snake_case)]
-+fn _Unwind_SetGR() {}
-+
-+#[no_mangle]
-+#[allow(non_snake_case)]
-+fn _Unwind_SetIP() {}
--- 
-2.37.1 (Apple Git-137.1)
-



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/6e5d01d1e20259227033e9efeef79f95cd0145d8

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


VideoLAN code repository instance