From 8f4860908f72ee0734ee8f416627a4d8ab4ac01c Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Thu, 11 Feb 2021 15:05:20 -0600 Subject: [PATCH] Update patch metadata. --- debian/patches/10_mimalloc_restrict_cpu_yield.patch | 6 ++++-- debian/patches/11_update_js_three_r111.patch | 7 ++++++- ...ch => 12_Remove-march-native-from-mimalloc-build.patch} | 7 ++++++- debian/patches/series | 2 +- 4 files changed, 17 insertions(+), 5 deletions(-) rename debian/patches/{0007-Remove-march-native-from-mimalloc-build.patch => 12_Remove-march-native-from-mimalloc-build.patch} (84%) diff --git a/debian/patches/10_mimalloc_restrict_cpu_yield.patch b/debian/patches/10_mimalloc_restrict_cpu_yield.patch index 7579cc8..f05babe 100644 --- a/debian/patches/10_mimalloc_restrict_cpu_yield.patch +++ b/debian/patches/10_mimalloc_restrict_cpu_yield.patch @@ -1,7 +1,9 @@ Subject: Restricts cpu yield instructions a little. -From: Ryan Pavlik -Last-Updated: 2021-01-23 Forwarded: https://github.com/microsoft/mimalloc/pull/350 +From: Ryan Pavlik +Last-Update: 2021-02-11 +Applied-Upstream: 3.0.0, https://github.com/solvespace/solvespace/commit/cdeb6c90fb753a2b0f6d033affedbcceab046758 + adding clobber for ARM and preventing older 32 bits chips not supporting this instruction. diff --git a/debian/patches/11_update_js_three_r111.patch b/debian/patches/11_update_js_three_r111.patch index 4488a29..5115862 100644 --- a/debian/patches/11_update_js_three_r111.patch +++ b/debian/patches/11_update_js_three_r111.patch @@ -1,6 +1,11 @@ +Subject: Update javascript to be compatible with threejs r111 +Forwarded: https://github.com/solvespace/solvespace/pull/906 From: Ryan Pavlik +Last-Update: 2021-02-11 +Applied-Upstream: 3.0.0, https://github.com/solvespace/solvespace/commit/d16e33ac48cb717f24a06a30e268227c860476d2 + Date: Tue, 19 Jan 2021 17:22:35 -0600 -Subject: Update javascript to be compatible with threejs r111 + --- res/threejs/SolveSpaceControls.js | 8 ++++---- diff --git a/debian/patches/0007-Remove-march-native-from-mimalloc-build.patch b/debian/patches/12_Remove-march-native-from-mimalloc-build.patch similarity index 84% rename from debian/patches/0007-Remove-march-native-from-mimalloc-build.patch rename to debian/patches/12_Remove-march-native-from-mimalloc-build.patch index 8c18e31..40f0282 100644 --- a/debian/patches/0007-Remove-march-native-from-mimalloc-build.patch +++ b/debian/patches/12_Remove-march-native-from-mimalloc-build.patch @@ -1,6 +1,11 @@ +Subject: Remove -march=native from mimalloc build. +Bug: https://github.com/microsoft/mimalloc/issues/361 +Bug: https://github.com/solvespace/solvespace/issues/934 From: Ryan Pavlik +Last-Update: 2021-02-11 + Date: Wed, 10 Feb 2021 16:20:25 -0600 -Subject: Remove -march=native from mimalloc build. + --- extlib/mimalloc/CMakeLists.txt | 5 ----- diff --git a/debian/patches/series b/debian/patches/series index 6941368..7cad336 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,4 +4,4 @@ 04_use_system_unifont.patch 10_mimalloc_restrict_cpu_yield.patch 11_update_js_three_r111.patch -0007-Remove-march-native-from-mimalloc-build.patch +12_Remove-march-native-from-mimalloc-build.patch -- 2.30.2