directxmath: Update to 3.1.9

Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1436>

3 files changed, 7 insertions, 52 deletions

diff --git a/recipes/directxmath.recipe b/recipes/directxmath.recipe
index b843af34..8b6d29bf 100644
--- a/recipes/directxmath.recipe
+++ b/recipes/directxmath.recipe
@@ -1,22 +1,20 @@
 # -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
 
 class Recipe(recipe.Recipe):
-    version = '3.1.8'
+    version = '3.1.9'
     name = 'directxmath'
     licenses = [{License.MIT: ['LICENSE']}]
     stype = SourceType.TARBALL
     btype = BuildType.MESON
-    url = 'https://github.com/microsoft/DirectXMath/archive/refs/tags/dec2022.tar.gz'
-    tarball_checksum = '70a18f35343ff07084d31afa7a7978b3b59160f0533424365451c72475ff480f'
-    tarball_name = 'dec2022.tar.gz'
-    tarball_dirname = 'DirectXMath-dec2022'
+    url = 'https://github.com/microsoft/DirectXMath/archive/refs/tags/feb2024.tar.gz'
+    tarball_checksum = 'f78bb400dcbedd987f2876b2fb6fe12199d795cd6a912f965ef3a2141c78303d'
+    tarball_name = 'feb2024.tar.gz'
+    tarball_dirname = 'DirectXMath-feb2024'
 
     files_devel = []
 
     patches = [
-        # https://wrapdb.mesonbuild.com/v2/directxmath_3.1.8-1/get_patch
+        # https://wrapdb.mesonbuild.com/v2/directxmath_3.1.9-1/get_patch
         'directxmath/0001-Add-DirectXMath-wrap.patch',
-        # https://github.com/microsoft/DirectXMath/pull/172
-        'directxmath/0001-Inc-Use-two-argument-cpuid-when-using-recent-MinGW.patch',
     ]
 
diff --git a/recipes/directxmath/0001-Add-DirectXMath-wrap.patch b/recipes/directxmath/0001-Add-DirectXMath-wrap.patch
index c0f0d0ab..fb6e2b88 100644
--- a/recipes/directxmath/0001-Add-DirectXMath-wrap.patch
+++ b/recipes/directxmath/0001-Add-DirectXMath-wrap.patch
@@ -14,7 +14,7 @@ index 0000000..c7f9d46
 --- /dev/null
 +++ b/meson.build
 @@ -0,0 +1,29 @@
-+project('directxmath', 'cpp', version: '3.1.8')
++project('directxmath', 'cpp', version: '3.1.9')
 +
 +incdirs = include_directories('Inc')
 +
diff --git a/recipes/directxmath/0001-Inc-Use-two-argument-cpuid-when-using-recent-MinGW.patch b/recipes/directxmath/0001-Inc-Use-two-argument-cpuid-when-using-recent-MinGW.patch
deleted file mode 100644
index 5057c80c..00000000
--- a/recipes/directxmath/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 <nirbheek@centricular.com>
-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
-