From 5432c8fef91d2366752622d374ee9059fff2815a Mon Sep 17 00:00:00 2001 From: Seungha Yang Date: Mon, 1 Apr 2024 22:52:10 +0900 Subject: [PATCH] subprojects: directxmath: Update to 3.1.9 Part-of: --- subprojects/directxmath.wrap | 19 ++++---- ...gument-cpuid-when-using-recent-MinGW.patch | 43 ------------------- 2 files changed, 9 insertions(+), 53 deletions(-) delete mode 100644 subprojects/packagefiles/DirectXMath-dec2022/0001-Inc-Use-two-argument-cpuid-when-using-recent-MinGW.patch diff --git a/subprojects/directxmath.wrap b/subprojects/directxmath.wrap index 7d01190d01..e26fbe4247 100644 --- a/subprojects/directxmath.wrap +++ b/subprojects/directxmath.wrap @@ -1,14 +1,13 @@ [wrap-file] -directory = DirectXMath-dec2022 -source_url = https://github.com/microsoft/DirectXMath/archive/refs/tags/dec2022.tar.gz -source_filename = dec2022.tar.gz -source_hash = 70a18f35343ff07084d31afa7a7978b3b59160f0533424365451c72475ff480f -patch_filename = directxmath_3.1.8-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/directxmath_3.1.8-1/get_patch -patch_hash = 854f9c065319885f3de5b381cc77454913377a84c8ae6756795fe3eaa99b81f7 -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/directxmath_3.1.8-1/dec2022.tar.gz -wrapdb_version = 3.1.8-1 -diff_files = DirectXMath-dec2022/0001-Inc-Use-two-argument-cpuid-when-using-recent-MinGW.patch +directory = DirectXMath-feb2024 +source_url = https://github.com/microsoft/DirectXMath/archive/refs/tags/feb2024.tar.gz +source_filename = feb2024.tar.gz +source_hash = f78bb400dcbedd987f2876b2fb6fe12199d795cd6a912f965ef3a2141c78303d +patch_filename = directxmath_3.1.9-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/directxmath_3.1.9-1/get_patch +patch_hash = d2475b7de8deb6c801139b96ad91904b9062c9ea6432d62c1cb490a3d449ad12 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/directxmath_3.1.9-1/feb2024.tar.gz +wrapdb_version = 3.1.9-1 [provide] directxmath = directxmath_dep diff --git a/subprojects/packagefiles/DirectXMath-dec2022/0001-Inc-Use-two-argument-cpuid-when-using-recent-MinGW.patch b/subprojects/packagefiles/DirectXMath-dec2022/0001-Inc-Use-two-argument-cpuid-when-using-recent-MinGW.patch deleted file mode 100644 index 5057c80ccc..0000000000 --- a/subprojects/packagefiles/DirectXMath-dec2022/0001-Inc-Use-two-argument-cpuid-when-using-recent-MinGW.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 77c86dfd0d5866c5d98980b2ec6b7ed9b0fd3b14 Mon Sep 17 00:00:00 2001 -From: Nirbheek Chauhan -Date: Mon, 20 Nov 2023 13:36:04 +0530 -Subject: [PATCH] Inc: Use two-argument cpuid when using recent MinGW - -Since 2021, when building with MinGW if `intrin.h` is included -(directly or indirectly), it will redefine `__cpuid` to use the -intrinsic version of it, instead of the macro defined by GCC's -`cpuid.h`. Detect this case, and use the two-argument prototype -instead. - -https://github.com/mingw-w64/mingw-w64/commit/d2374f898457b0f4ea8bd4084a94f2dafc87a99a - -Upstream PR: https://github.com/microsoft/DirectXMath/pull/172 ---- - Inc/DirectXMathMisc.inl | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Inc/DirectXMathMisc.inl b/Inc/DirectXMathMisc.inl -index 5f88da6..5c68e8d 100644 ---- a/Inc/DirectXMathMisc.inl -+++ b/Inc/DirectXMathMisc.inl -@@ -1973,7 +1973,7 @@ inline bool XMVerifyCPUSupport() noexcept - { - #if defined(_XM_SSE_INTRINSICS_) && !defined(_XM_NO_INTRINSICS_) - int CPUInfo[4] = { -1 }; --#if defined(__clang__) || defined(__GNUC__) -+#if defined(__clang__) || (defined(__GNUC__) && defined(__cpuid)) - __cpuid(0, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); - #else - __cpuid(CPUInfo, 0); -@@ -1987,7 +1987,7 @@ inline bool XMVerifyCPUSupport() noexcept - return false; - #endif - --#if defined(__clang__) || defined(__GNUC__) -+#if defined(__clang__) || (defined(__GNUC__) && defined(__cpuid)) - __cpuid(1, CPUInfo[0], CPUInfo[1], CPUInfo[2], CPUInfo[3]); - #else - __cpuid(CPUInfo, 1); --- -2.41.0 -