From 020d8b092bb5ce5a7735f739bbbb7d1e01aa167f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Wed, 3 Dec 2025 21:36:13 +0300 Subject: [PATCH] Blender 5 update (#26688) * audaspace: Update to 1.8.0 * blender: Update to 5.0.0 * Add missing header for math functions --- mingw-w64-audaspace/PKGBUILD | 15 ++-- .../0001-mingw-buildsystem.patch | 9 -- .../0002-fix-mingw-w64-definitions.patch | 61 ++----------- .../0008-mingw-use-X11-like-path-layout.patch | 4 +- .../0009-include-missing-headers.patch | 42 +++++++++ mingw-w64-blender/0024-openvdb-shared.patch | 8 +- .../0039-no-WRL-on-mingw-w64.patch | 85 ++++++++++--------- mingw-w64-blender/0040-wintab-msvc_try.patch | 22 +++++ mingw-w64-blender/PKGBUILD | 28 +++--- 9 files changed, 143 insertions(+), 131 deletions(-) create mode 100644 mingw-w64-blender/0040-wintab-msvc_try.patch diff --git a/mingw-w64-audaspace/PKGBUILD b/mingw-w64-audaspace/PKGBUILD index 38df4d941d..54cb7aa982 100644 --- a/mingw-w64-audaspace/PKGBUILD +++ b/mingw-w64-audaspace/PKGBUILD @@ -3,8 +3,8 @@ _realname=audaspace pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.7.0 -pkgrel=2 +pkgver=1.8.0 +pkgrel=1 pkgdesc="A high level audio library written in C++ with language bindings for Python (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -27,13 +27,11 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" source=("${_realname}-${pkgver}.tar.gz::https://github.com/audaspace/audaspace/archive/v${pkgver}.tar.gz" 0100-mingw-relocate.patch 0101-mingw-exports.patch - 0102-mingw-python.patch - https://github.com/audaspace/audaspace/commit/fa006ac74c505c7c4e969cc3e5537c979b581cc9.patch) -sha256sums=('e1c1283276da7b484863c9b191140b4508fe0b79557234bf88419b793eb743a8' + 0102-mingw-python.patch) +sha256sums=('60fabd54b3f3ca1042a7c9bb4171d06325295a77081a0b07377df79266b67004' '2f007f5a2ea5cc1d186608e9e65e927e6659622ef0e652a8fda75a8327a0800c' '8cf2aefb1973177ec3d75443e47ba95c66ca113076e615af0a8f6c8de1398da0' - '16f8833e51b6e97019842297286c713e270bc9fe836950b93d10842d99d8c89c' - 'd033bfdf24c3de5ce69737a9d05aa9fe8cf83d2d5cc2e69d273546aaf5357812') + '16f8833e51b6e97019842297286c713e270bc9fe836950b93d10842d99d8c89c') # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -50,8 +48,7 @@ prepare() { apply_patch_with_msg \ 0100-mingw-relocate.patch \ 0101-mingw-exports.patch \ - 0102-mingw-python.patch \ - fa006ac74c505c7c4e969cc3e5537c979b581cc9.patch + 0102-mingw-python.patch } build() { diff --git a/mingw-w64-blender/0001-mingw-buildsystem.patch b/mingw-w64-blender/0001-mingw-buildsystem.patch index 1a3ce868ed..1ae34283d7 100644 --- a/mingw-w64-blender/0001-mingw-buildsystem.patch +++ b/mingw-w64-blender/0001-mingw-buildsystem.patch @@ -10,15 +10,6 @@ diff -Naur blender-4.5.2/CMakeLists.txt blender-4.5.2-patched/CMakeLists.txt option(WITH_SYSTEM_FREETYPE "Use the freetype library provided by the operating system" OFF) option(WITH_SYSTEM_EIGEN3 "Use the systems Eigen3 library" OFF) else() -@@ -521,7 +521,7 @@ - # Compression - option(WITH_LZO "Enable fast LZO compression (used for pointcache)" ON) - option(WITH_LZMA "Enable best LZMA compression, (used for pointcache)" ON) --if(UNIX AND NOT APPLE) -+if((UNIX AND NOT APPLE) OR MINGW) - option(WITH_SYSTEM_LZO "Use the system LZO library" OFF) - endif() - option(WITH_DRACO "Enable Draco mesh compression Python module (used for glTF)" ON) @@ -541,7 +541,7 @@ option(WITH_FREESTYLE "Enable Freestyle (advanced edges rendering)" ON) diff --git a/mingw-w64-blender/0002-fix-mingw-w64-definitions.patch b/mingw-w64-blender/0002-fix-mingw-w64-definitions.patch index bc1c5960bb..d58e72579d 100644 --- a/mingw-w64-blender/0002-fix-mingw-w64-definitions.patch +++ b/mingw-w64-blender/0002-fix-mingw-w64-definitions.patch @@ -90,20 +90,18 @@ diff -Naur blender-4.5.2/extern/quadriflow/src/dedge.cpp blender-4.5.2-patched/e namespace qflow { inline int dedge_prev(int e, int deg) { return (e % deg == 0u) ? e + (deg - 1) : e - 1; } -diff -Naur blender-4.5.2/intern/clog/clog.c blender-4.5.2-patched/intern/clog/clog.c ---- blender-4.5.2/intern/clog/clog.c 2025-08-26 12:19:16.553608200 +0300 -+++ blender-4.5.2-patched/intern/clog/clog.c 2025-08-26 12:19:53.462471100 +0300 -@@ -26,8 +26,8 @@ +diff -Naur blender-4.5.2/intern/clog/clog.cc blender-4.5.2-patched/intern/clog/clog.cc +--- blender-4.5.2/intern/clog/clog.cc 2025-08-26 12:19:16.553608200 +0300 ++++ blender-4.5.2-patched/intern/clog/clog.cc 2025-08-26 12:19:53.462471100 +0300 +@@ -29,7 +29,7 @@ # include #endif -#if defined(_MSC_VER) --# include +#if defined(_WIN32) -+# include - - # include /* This needs to be included after Windows.h. */ - # include + # ifndef NOMINMAX + # define NOMINMAX + # endif @@ -385,7 +385,7 @@ static uint64_t clg_timestamp_ticks_get(void) { @@ -149,19 +147,6 @@ diff -Naur blender-4.5.2/intern/cycles/util/defines.h blender-4.5.2-patched/inte # define __forceinline inline __attribute__((always_inline)) # endif # define ccl_try_align(...) __attribute__((aligned(__VA_ARGS__))) -diff -Naur blender-4.5.2/intern/cycles/util/log.h blender-4.5.2-patched/intern/cycles/util/log.h ---- blender-4.5.2/intern/cycles/util/log.h 2025-08-26 12:19:17.429206600 +0300 -+++ blender-4.5.2-patched/intern/cycles/util/log.h 2025-08-26 12:19:53.488468300 +0300 -@@ -6,7 +6,9 @@ - - #if defined(WITH_CYCLES_LOGGING) && !defined(__KERNEL_GPU__) - # include // IWYU pragma: export -+# define GLOG_NO_ABBREVIATED_SEVERITIES - # include // IWYU pragma: export -+# undef GLOG_NO_ABBREVIATED_SEVERITIES - #endif - - #include diff -Naur blender-4.5.2/intern/cycles/util/murmurhash.cpp blender-4.5.2-patched/intern/cycles/util/murmurhash.cpp --- blender-4.5.2/intern/cycles/util/murmurhash.cpp 2025-08-26 12:19:17.438173000 +0300 +++ blender-4.5.2-patched/intern/cycles/util/murmurhash.cpp 2025-08-26 12:19:53.493469700 +0300 @@ -292,18 +277,6 @@ diff -Naur blender-4.5.2/source/blender/blenlib/BLI_winstuff.h blender-4.5.2-pat /** Directory reading compatibility with UNIX. */ struct dirent { -diff -Naur blender-4.5.2/source/blender/blenlib/intern/BLI_mmap.cc blender-4.5.2-patched/source/blender/blenlib/intern/BLI_mmap.cc ---- blender-4.5.2/source/blender/blenlib/intern/BLI_mmap.cc 2025-08-26 12:19:13.797771100 +0300 -+++ blender-4.5.2-patched/source/blender/blenlib/intern/BLI_mmap.cc 2025-08-26 12:19:53.588522200 +0300 -@@ -188,7 +188,7 @@ - return false; - } - --#ifndef WIN32 -+#ifndef _MSC_VER - /* If an error occurs in this call, sigbus_handler will be called and will set - * file->io_error to true. */ - memcpy(dest, file->memory + offset, length); diff -Naur blender-4.5.2/source/blender/blenlib/intern/path_utils.cc blender-4.5.2-patched/source/blender/blenlib/intern/path_utils.cc --- blender-4.5.2/source/blender/blenlib/intern/path_utils.cc 2025-08-26 12:19:13.786189100 +0300 +++ blender-4.5.2-patched/source/blender/blenlib/intern/path_utils.cc 2025-08-26 12:19:53.600518200 +0300 @@ -405,23 +378,3 @@ diff -Naur blender-4.5.2/source/blender/imbuf/movie/intern/movie_write.hh blende # define _USE_MATH_DEFINES # endif # include // IWYU pragma: keep -diff -Naur blender-4.5.2/source/blender/imbuf/intern/readimage.cc blender-4.5.2-patched/source/blender/imbuf/intern/readimage.cc ---- blender-4.5.2/source/blender/imbuf/intern/readimage.cc 2025-08-26 12:35:21.665271900 +0300 -+++ blender-4.5.2-patched/source/blender/imbuf/intern/readimage.cc 2025-08-26 15:52:29.473609300 +0300 -@@ -173,14 +173,14 @@ - * same way as in #BLI_mmap_read. Note that if the mmap becomes invalid mid-way through reading, - * external calls in #IMB_load_image_from_memory could leave unfreed memory, but this is the - * limitation of current exception handling method. Ref #139472. */ --#ifdef WIN32 -+#ifdef _MSC_VER - __try - { - #endif - - ibuf = IMB_load_image_from_memory(mem, size, flags, filepath, filepath, r_colorspace); - --#ifdef WIN32 -+#ifdef _MSC_VER - } - __except (GetExceptionCode() == EXCEPTION_IN_PAGE_ERROR ? EXCEPTION_EXECUTE_HANDLER : - EXCEPTION_CONTINUE_SEARCH) diff --git a/mingw-w64-blender/0008-mingw-use-X11-like-path-layout.patch b/mingw-w64-blender/0008-mingw-use-X11-like-path-layout.patch index 2c99c4e814..59cbc0ef99 100644 --- a/mingw-w64-blender/0008-mingw-use-X11-like-path-layout.patch +++ b/mingw-w64-blender/0008-mingw-use-X11-like-path-layout.patch @@ -52,6 +52,6 @@ diff -Naur blender-4.5.2/intern/ghost/intern/GHOST_SystemPathsWin32.cc blender-4 +#endif + - const char *GHOST_SystemPathsWin32::getUserSpecialDir(GHOST_TUserSpecialDirTypes type) const + std::optional GHOST_SystemPathsWin32::getUserSpecialDir( + GHOST_TUserSpecialDirTypes type) const { - const char *special_dir = nullptr; diff --git a/mingw-w64-blender/0009-include-missing-headers.patch b/mingw-w64-blender/0009-include-missing-headers.patch index 67bdcd259a..f9973eaabd 100644 --- a/mingw-w64-blender/0009-include-missing-headers.patch +++ b/mingw-w64-blender/0009-include-missing-headers.patch @@ -21,6 +21,17 @@ diff -Naur blender-4.5.2/extern/glog/src/symbolize.h blender-4.5.2-patched/exter #if defined(__ELF__) // defined by gcc #if defined(__OpenBSD__) #include +diff -Naur blender-5.0.0/intern/ghost/intern/GHOST_SystemWin32.cc blender-5.0.0-patched/intern/ghost/intern/GHOST_SystemWin32.cc +--- blender-5.0.0/intern/ghost/intern/GHOST_SystemWin32.cc 2025-08-26 12:23:03.002466700 +0300 ++++ blender-5.0.0-patched/intern/ghost/intern/GHOST_SystemWin32.cc 2025-08-26 12:23:40.123623400 +0300 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + #include "utf_winfunc.hh" + #include "utfconv.hh" diff -Naur blender-4.5.2/intern/ghost/intern/GHOST_Wintab.cc blender-4.5.2-patched/intern/ghost/intern/GHOST_Wintab.cc --- blender-4.5.2/intern/ghost/intern/GHOST_Wintab.cc 2025-08-26 12:23:03.002466700 +0300 +++ blender-4.5.2-patched/intern/ghost/intern/GHOST_Wintab.cc 2025-08-26 12:23:40.123623400 +0300 @@ -91,3 +102,34 @@ diff -Naur blender-4.5.2/source/creator/creator.cc blender-4.5.2-patched/source/ #ifdef WIN32 # include "utfconv.hh" +--- blender-5.0.0/intern/libmv/libmv/numeric/numeric.h.orig 2025-12-03 13:01:24.012351000 +0300 ++++ blender-5.0.0/intern/libmv/libmv/numeric/numeric.h 2025-12-03 13:02:51.951592300 +0300 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #if !defined(__MINGW32__) + # if defined(_WIN32) || defined(__APPLE__) || defined(__NetBSD__) || \ +--- blender-5.0.0/intern/slim/intern/edge_lengths.cpp.orig 2025-12-03 13:09:02.739877800 +0300 ++++ blender-5.0.0/intern/slim/intern/edge_lengths.cpp 2025-12-03 13:09:33.995737800 +0300 +@@ -11,6 +11,8 @@ + + #include "edge_lengths.h" + ++#include ++ + namespace slim { + + template +--- blender-5.0.0/intern/slim/intern/uv_initializer.cpp.orig 2025-12-03 13:11:38.726339400 +0300 ++++ blender-5.0.0/intern/slim/intern/uv_initializer.cpp 2025-12-03 13:11:41.520989500 +0300 +@@ -9,6 +9,7 @@ + #include "uv_initializer.h" + + #include ++#include + + namespace slim { + diff --git a/mingw-w64-blender/0024-openvdb-shared.patch b/mingw-w64-blender/0024-openvdb-shared.patch index 001e4f1d3c..bcde96d05a 100644 --- a/mingw-w64-blender/0024-openvdb-shared.patch +++ b/mingw-w64-blender/0024-openvdb-shared.patch @@ -1,10 +1,10 @@ diff -Naur blender-4.5.2/extern/mantaflow/CMakeLists.txt blender-4.5.2-patched/extern/mantaflow/CMakeLists.txt --- blender-4.5.2/extern/mantaflow/CMakeLists.txt 2025-08-26 12:30:06.033544100 +0300 +++ blender-4.5.2-patched/extern/mantaflow/CMakeLists.txt 2025-08-26 12:31:05.241090300 +0300 -@@ -85,7 +85,7 @@ - list(APPEND LIB - ${OPENVDB_LIBRARIES} - ) +@@ -79,7 +79,7 @@ + endif() + + if(WITH_OPENVDB) - if(WIN32) + if(MSVC) # OpenVDB emits lots of these, they should be suppressed through other diff --git a/mingw-w64-blender/0039-no-WRL-on-mingw-w64.patch b/mingw-w64-blender/0039-no-WRL-on-mingw-w64.patch index a00258c770..d8a7cccea9 100644 --- a/mingw-w64-blender/0039-no-WRL-on-mingw-w64.patch +++ b/mingw-w64-blender/0039-no-WRL-on-mingw-w64.patch @@ -135,62 +135,69 @@ diff -Naur blender-4.5.2/intern/ghost/intern/GHOST_TrackpadWin32.cc blender-4.5. diff -Naur blender-4.5.2/intern/ghost/intern/GHOST_WindowWin32.cc blender-4.5.2-patched/intern/ghost/intern/GHOST_WindowWin32.cc --- blender-4.5.2/intern/ghost/intern/GHOST_WindowWin32.cc 2025-08-26 12:34:17.369439100 +0300 +++ blender-4.5.2-patched/intern/ghost/intern/GHOST_WindowWin32.cc 2025-08-26 12:34:58.465645200 +0300 -@@ -83,7 +83,9 @@ - m_normal_state(GHOST_kWindowStateNormal), - m_user32(::LoadLibrary("user32.dll")), - m_parentWindowHwnd(parentwindow ? parentwindow->m_hWnd : HWND_DESKTOP), +@@ -81,8 +81,10 @@ + last_pointer_tablet_data_(GHOST_TABLET_DATA_NONE), + normal_state_(GHOST_kWindowStateNormal), + user32_(::LoadLibrary("user32.dll")), +- parent_window_hwnd_(parent_window ? parent_window->h_wnd_ : HWND_DESKTOP), ++ parent_window_hwnd_(parent_window ? parent_window->h_wnd_ : HWND_DESKTOP) +#ifdef _MSC_VER - m_directManipulationHelper(nullptr), + direct_manipulation_helper_(nullptr) +#endif - m_debug_context(is_debug) { - DWORD style = parentwindow ? -@@ -217,7 +219,7 @@ - /* Allow the showing of a progress bar on the taskbar. */ + DWORD style = parent_window ? + WS_POPUPWINDOW | WS_CAPTION | WS_MAXIMIZEBOX | WS_MINIMIZEBOX | WS_SIZEBOX : +@@ -216,13 +216,16 @@ CoCreateInstance( - CLSID_TaskbarList, nullptr, CLSCTX_INPROC_SERVER, IID_ITaskbarList3, (LPVOID *)&m_Bar); -- + CLSID_TaskbarList, nullptr, CLSCTX_INPROC_SERVER, IID_ITaskbarList3, (LPVOID *)&bar_); + +#ifdef _MSC_VER /* Initialize Direct Manipulation. */ - m_directManipulationHelper = GHOST_DirectManipulationHelper::create(m_hWnd, getDPIHint()); - } -@@ -253,6 +255,7 @@ - } - - return m_directManipulationHelper->getTrackpadInfo(); + direct_manipulation_helper_ = GHOST_DirectManipulationHelper::create(h_wnd_, getDPIHint()); +#endif + + /* Initialize HDR info. */ + updateHDRInfo(); } ++#ifdef _MSC_VER + void GHOST_WindowWin32::updateDirectManipulation() + { + if (!direct_manipulation_helper_) { +@@ -255,6 +258,7 @@ + + return direct_manipulation_helper_->getTrackpadInfo(); + } ++#endif + GHOST_WindowWin32::~GHOST_WindowWin32() -@@ -306,9 +309,10 @@ - ::DestroyWindow(m_hWnd); - m_hWnd = 0; + { +@@ -308,8 +312,10 @@ + h_wnd_ = 0; } -- + +#ifdef _MSC_VER - delete m_directManipulationHelper; - m_directManipulationHelper = nullptr; + delete direct_manipulation_helper_; + direct_manipulation_helper_ = nullptr; +#endif } void GHOST_WindowWin32::adjustWindowRectForClosestMonitor(LPRECT win_rect, -@@ -1116,14 +1120,14 @@ - DwmSetWindowAttribute(this->m_hWnd, 20, &DarkMode, sizeof(DarkMode)); +@@ -1028,12 +1034,14 @@ } } -- + +#ifdef _MSC_VER void GHOST_WindowWin32::updateDPI() { - if (m_directManipulationHelper) { - m_directManipulationHelper->setDPI(getDPIHint()); + if (direct_manipulation_helper_) { + direct_manipulation_helper_->setDPI(getDPIHint()); } } -- +#endif + uint16_t GHOST_WindowWin32::getDPIHint() { - if (m_user32) { diff -Naur blender-4.5.2/intern/ghost/intern/GHOST_WindowWin32.hh blender-4.5.2-patched/intern/ghost/intern/GHOST_WindowWin32.hh --- blender-4.5.2/intern/ghost/intern/GHOST_WindowWin32.hh 2025-08-26 12:34:17.438438400 +0300 +++ blender-4.5.2-patched/intern/ghost/intern/GHOST_WindowWin32.hh 2025-08-26 12:34:58.469645300 +0300 @@ -204,7 +211,7 @@ diff -Naur blender-4.5.2/intern/ghost/intern/GHOST_WindowWin32.hh blender-4.5.2- #include "GHOST_Window.hh" #include "GHOST_Wintab.hh" #ifdef WITH_INPUT_IME -@@ -290,7 +292,9 @@ +@@ -289,7 +291,9 @@ */ GHOST_TabletData getTabletData(); @@ -214,7 +221,7 @@ diff -Naur blender-4.5.2/intern/ghost/intern/GHOST_WindowWin32.hh blender-4.5.2- uint16_t getDPIHint() override; -@@ -314,6 +318,7 @@ +@@ -313,6 +317,7 @@ void endIME(); #endif /* WITH_INPUT_IME */ @@ -222,20 +229,20 @@ diff -Naur blender-4.5.2/intern/ghost/intern/GHOST_WindowWin32.hh blender-4.5.2- /* * Drive DirectManipulation context. */ -@@ -327,6 +332,7 @@ +@@ -329,6 +334,7 @@ + void onPointerHitTest(WPARAM wParam); GHOST_TTrackpadInfo getTrackpadInfo(); - +#endif - private: - /** - * \param type: The type of rendering context create. + + /* Update HDR info on initialization and window changes. */ + void updateHDRInfo(); @@ -413,7 +419,9 @@ - HWND m_parentWindowHwnd; + HWND parent_window_hwnd_; +#ifdef _MSC_VER - GHOST_DirectManipulationHelper *m_directManipulationHelper; + GHOST_DirectManipulationHelper *direct_manipulation_helper_; +#endif #ifdef WITH_INPUT_IME diff --git a/mingw-w64-blender/0040-wintab-msvc_try.patch b/mingw-w64-blender/0040-wintab-msvc_try.patch new file mode 100644 index 0000000000..379eb9d453 --- /dev/null +++ b/mingw-w64-blender/0040-wintab-msvc_try.patch @@ -0,0 +1,22 @@ +--- blender-5.0.0/intern/ghost/intern/GHOST_Wintab.cc.orig 2025-12-03 12:47:20.433297500 +0300 ++++ blender-5.0.0/intern/ghost/intern/GHOST_Wintab.cc 2025-12-03 12:49:12.158516700 +0300 +@@ -161,6 +161,7 @@ + LPTOP_LEVEL_EXCEPTION_FILTER current_filter = SetUnhandledExceptionFilter(nullptr); + SetUnhandledExceptionFilter(current_filter); + ++#ifdef _MSC_VER + /* __except and __finally cannot be used together, as such a second nested __try block is needed. + */ + __try +@@ -180,6 +181,11 @@ + */ + SetUnhandledExceptionFilter(current_filter); + } ++#else ++ try { ++ return GHOST_Wintab::loadWintabUnsafe(hwnd); ++ } catch (...) {} ++#endif + + return nullptr; + } diff --git a/mingw-w64-blender/PKGBUILD b/mingw-w64-blender/PKGBUILD index 339597cdae..51c2f3b1b7 100644 --- a/mingw-w64-blender/PKGBUILD +++ b/mingw-w64-blender/PKGBUILD @@ -11,7 +11,7 @@ _realname=blender pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=4.5.3 +pkgver=5.0.0 pkgrel=1 pkgdesc="A fully integrated 3D graphics creation suite (mingw-w64)" arch=('any') @@ -110,19 +110,19 @@ source=(https://download.blender.org/source/${_realname}-${pkgver}.tar.xz 0029-display-driver-build.patch 0035-Enable-SSE2NEON-on-Windows-ARM.patch 0039-no-WRL-on-mingw-w64.patch - 0050-fix-vulkan-import-lib-lookup.patch - https://github.com/blender/blender/commit/f5f30131131025a24be93eced7d04f9d96cf5cbf.patch) -sha256sums=('f92af47f3761eb68bc70b74d7dddcb72fcb3038b76d847c6441e5b90b6f19275' + 0040-wintab-msvc_try.patch + 0050-fix-vulkan-import-lib-lookup.patch) +sha256sums=('120b45227b1dba2ecec116c6f924f3e7efabebac762e030552fdf70baff1b5b4' 'e6e5460c67ed2101004c64a8ca1cfcf2828880ea98c97f8f9f220b96e143fc25' '233b56fc38fe0aac714b0cfacdc8250dd64c1984d1a6785b9898a2d2c8a015ed' - 'f7081e3d7c9ae40481db8fecae2fd111898305c9a5ef05b31c6131ef8642849c' - '2d898e81118771405fc6ae1a7f7fd75c58398c6b7a195b9cd0be0f01ba281ff3' + 'c25b13c23312c444dc82291a2dcbe524726e8240a22a07b67da390e7b554fbf5' + '030a7e2a43060780cccf2f89181f20d7b67f1c922e1bcf911668942892567868' 'f82e9be14a1f683c3a4d6d198d7bb552e83637098dfd2a88341461347daec919' '2794fd231f35627681273d793895b9d66fb6546b7b5003fd6ee85d86e87b90ae' 'af467653b9a4d3dfee8abf07e8bf23b9759ec205709dabd8735005bd263ce3c7' '6b86a93dfcace5a1dfb0bdc8de6b0a6318af206a738947d039bce2607ae07f7a' - '0ec9942a62feeeca43a3cd78ac0473165bc4d43bb28cbe46faf0f574a05bf366' - '76ef7c97a373b07b89bd16d183965dd8fae4ecfcd160d3d8b62f08f58c0a81d0' + 'dfbfe0ee07fe2a88641966cc067740d5b66628134d547f742c561868ebb9c36b' + '11c0f8e70144413c009d4b0b221ec95ee3ae9250e361a93d8f87402da48b776b' '9e2541912f106171be109aaf11c5406d9ddd62b6d930628aaa0982ceb8216a66' '84fdb7b1c4f408aff199172cbb09460ac60443156bc78fc3eaf3ba90e6fb500e' 'e9e26a1c9b540fbdd7f63e83c0bbdf71c08a0e68f7ceb57fcb322113a97c9a62' @@ -133,14 +133,14 @@ sha256sums=('f92af47f3761eb68bc70b74d7dddcb72fcb3038b76d847c6441e5b90b6f19275' 'ae1daa500f50c74ffa906979ea1d41cda28b36f95d1ac0aab8e714c4a55642cb' 'f2e166b76a9cfb2b753072cf0a45a241c84ff3f539e8c3c43d96c2679a144c81' '28c121996d4d652910ef8661723ee5a54e52913361c5fc1e3b5f0aaa82fe5543' - '99fb88ff39e10273725e71aad62d12c480adc5f5c4a2c3a6181b4094d9327bae' + '52565687b98a94efbbdb3763519f2b2db274ec6a84b47958b53f4f37b31c7dbc' '3d9903bbc99a533723e84dcb465fab9ba7b0cc3fd7cec664633cbc860de9c4d6' 'caa7b9dd66086fe0274ce8ae55d3084e5ded2e68189c9857582c4da7b211ca33' '260d52ff166635145dd3b3e51ba291eba1edc01274f3385cfe89c02ea1489761' '3cc151106b16adf40a9d1a751519365eeaf2ebd4bacb359272cc04d5f55c61be' - 'd4a02b177c08c37551087e391237bf15ed534ec405edfe961783b8bb4cf99c6a' - '1a5e091054edee6507e148bd697b1426a4d3234cdb6b704151e67e36b884131f' - 'c5137eea29301cf1fbc0e62ac159c8c63d4e5bb9536461c3c76ff749e7be39f6') + '07388ad06360d98c74780a83a9def9684a6bf9962c314c4987af5fd5fa7cf9a4' + '2bfa87b66973ee3aaad68ddc87541faccee0c3e2dba28b4e291cf38a4555ed4d' + '1a5e091054edee6507e148bd697b1426a4d3234cdb6b704151e67e36b884131f') #options=(debug) apply_patch_with_msg() { @@ -182,8 +182,8 @@ prepare() { 0029-display-driver-build.patch \ 0035-Enable-SSE2NEON-on-Windows-ARM.patch \ 0039-no-WRL-on-mingw-w64.patch \ - 0050-fix-vulkan-import-lib-lookup.patch \ - f5f30131131025a24be93eced7d04f9d96cf5cbf.patch + 0040-wintab-msvc_try.patch \ + 0050-fix-vulkan-import-lib-lookup.patch if check_option "debug" "y"; then apply_patch_with_msg \