[directxmath] Update for April 2025 release (#44839)

2025-04-08 11:25:15 -07:00 · 2025-04-08 11:25:15 -07:00 · 2528005975
parent c5ff0f76a2
commit 2528005975
8 changed files with 109 additions and 52 deletions
--- a/ports/directxmath/Linux-SHMath-SAL.patch
+++ b/ports/directxmath/Linux-SHMath-SAL.patch
@ -0,0 +1,21 @@
+diff --git a/SHMath/CMakeLists.txt b/SHMath/CMakeLists.txt
+index 8a21ee7..5d9ea30 100644
+--- a/SHMath/CMakeLists.txt
+++ b/SHMath/CMakeLists.txt
+@@ -217,3 +217,13 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+         target_compile_options(${PROJECT_NAME} PRIVATE $<$<VERSION_GREATER_EQUAL:${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION},10.0.22000>:/Zc:templateScope>)
+     endif()
+ endif()
+
+if(NOT WIN32)
+    file(DOWNLOAD
+        https://raw.githubusercontent.com/dotnet/runtime/v9.0.2/src/coreclr/pal/inc/rt/sal.h
+        "${CMAKE_CURRENT_BINARY_DIR}/sal/sal.h"
+        EXPECTED_HASH SHA512=8085f67bfa4ce01ae89461cadf72454a9552fde3f08b2dcc3de36b9830e29ce7a6192800f8a5cb2a66af9637be0017e85719826a4cfdade508ae97f319e0ee8e
+    )
+
+    target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/sal")
+endif()
+-- 
+2.49.0.windows.1
+
--- a/ports/directxmath/MinGW-fix.patch
+++ b/ports/directxmath/MinGW-fix.patch
@ -0,0 +1,15 @@
+diff --git a/SHMath/CMakeLists.txt b/SHMath/CMakeLists.txt
+index dc5cb6d..aa6d4a0 100644
+--- a/SHMath/CMakeLists.txt
+++ b/SHMath/CMakeLists.txt
+@@ -73,7 +73,7 @@ target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_11)
+ 
+ target_link_libraries(${PROJECT_NAME} PRIVATE DirectXMath)
+ 
+-if(MINGW)
+if(MINGW AND BUILD_DX12)
+     find_package(directx-headers CONFIG REQUIRED)
+     target_link_libraries(${PROJECT_NAME} PUBLIC Microsoft::DirectX-Headers)
+     target_compile_definitions(${PROJECT_NAME} PUBLIC USING_DIRECTX_HEADERS)
+-- 
+2.49.0.windows.1
--- a/ports/directxmath/include-path-fix.patch
+++ b/ports/directxmath/include-path-fix.patch
@ -1,43 +0,0 @@
-From 994441ebfa63fe1440bf430c99b5ba3eaba02c66 Mon Sep 17 00:00:00 2001
-From: Chuck Walbourn <chuckw@microsoft.com>
-Date: Tue, 26 Nov 2024 17:44:02 -0800
-Subject: [PATCH] CMake update to avoid directxmath subdir for include
-
---
- CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d10adc1..7041f14 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -30,7 +30,7 @@ add_library(${PROJECT_NAME} INTERFACE)
- 
- target_include_directories(${PROJECT_NAME} INTERFACE
-   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Inc>
-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/directxmath>)
-+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
- 
- target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_11)
- 
-@@ -61,7 +61,7 @@ install(EXPORT ${PROJECT_NAME}-targets
-   DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME})
- 
- install(FILES ${LIBRARY_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/directxmath)
-+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- 
- install(FILES
-     ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}-config.cmake
-@@ -71,7 +71,7 @@ install(FILES
- # Create pkg-config file
- include(build/JoinPaths.cmake)
- # from: https://github.com/jtojnar/cmake-snips#concatenating-paths-when-building-pkg-config-files
-join_paths(DIRECTXMATH_INCLUDEDIR_FOR_PKG_CONFIG "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}/directxmath")
-+join_paths(DIRECTXMATH_INCLUDEDIR_FOR_PKG_CONFIG "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
- join_paths(DIRECTXMATH_LIBDIR_FOR_PKG_CONFIG "\${prefix}"     "${CMAKE_INSTALL_LIBDIR}")
- 
- configure_file(
-- 
-2.47.0.vfs.0.3
-
--- a/ports/directxmath/portfile.cmake
+++ b/ports/directxmath/portfile.cmake
@ -1,14 +1,34 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Microsoft/DirectXMath
-    REF oct2024
-    SHA512 501a3c8b51cd6d3d4fbcc511c2c37f1d0511bd84d546d5254c2bc81238c11242b9d62c7a153ee110dc9d96a0c7d2544428d8de832c943b680b0cb09d8e3760f2
+    REF apr2025
+    SHA512 c7d3b107180b269c5c4e823fa51d96a316dc35cace3cb13f030022d9096c9465e8a770559419176692b047574fd67c96d8527abd8817998264a149eee0b88c9d
    HEAD_REF main
-    PATCHES include-path-fix.patch
+    PATCHES
+        MinGW-fix.patch
+        Linux-SHMath-SAL.patch
 )

+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        xdsp BUILD_XDSP
+        dx11 BUILD_DX11
+        dx12 BUILD_DX12
+)
+
+set(EXTRA_OPTIONS "")
+
+if(("dx11" IN_LIST FEATURES) OR ("dx12" IN_LIST FEATURES))
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+    list(APPEND EXTRA_OPTIONS -DBUILD_SHMATH=ON)
+endif()
+
 vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS}
+    MAYBE_UNUSED_VARIABLES BUILD_DX11 BUILD_DX12
 )

 vcpkg_cmake_install()
@ -18,6 +38,14 @@ file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/DirectXMath.pc" DE
 vcpkg_fixup_pkgconfig()
 vcpkg_cmake_config_fixup(CONFIG_PATH share/directxmath)

+if(("dx11" IN_LIST FEATURES) OR ("dx12" IN_LIST FEATURES))
+    vcpkg_cmake_config_fixup(CONFIG_PATH share/directxsh)
+endif()
+
+if("xdsp" IN_LIST FEATURES)
+    vcpkg_cmake_config_fixup(CONFIG_PATH share/xdsp)
+endif()
+
 if(NOT VCPKG_TARGET_IS_WINDOWS)
    vcpkg_download_distfile(
        SAL_HEADER
@ -31,7 +59,17 @@ if(NOT VCPKG_TARGET_IS_WINDOWS)
      DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 endif()

-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+if(("dx11" IN_LIST FEATURES) OR ("dx12" IN_LIST FEATURES))
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+else()
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+endif()

 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+if(("dx11" IN_LIST FEATURES) OR ("dx12" IN_LIST FEATURES))
+    file(READ "${CMAKE_CURRENT_LIST_DIR}/shmathusage" USAGE_CONTENT)
+    file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" ${USAGE_CONTENT})
+endif()
+
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
--- a/ports/directxmath/shmathusage
+++ b/ports/directxmath/shmathusage
@ -0,0 +1,3 @@
+
+    find_package(directxmath CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE Microsoft::DirectXSH)
--- a/ports/directxmath/vcpkg.json
+++ b/ports/directxmath/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "directxmath",
-  "version-date": "2024-12-02",
-  "port-version": 1,
+  "version-date": "2025-04-03",
  "description": "DirectXMath SIMD C++ math library",
  "homepage": "https://github.com/Microsoft/DirectXMath",
  "documentation": "https://docs.microsoft.com/windows/win32/dxmath/directxmath-portal",
@ -16,5 +15,24 @@
      "name": "vcpkg-cmake-config",
      "host": true
    }
-  ]
+  ],
+  "features": {
+    "dx11": {
+      "description": "C++ Spherical Harmonics Math Library for DirectX 11",
+      "supports": "windows & !xbox"
+    },
+    "dx12": {
+      "description": "C++ Spherical Harmonics Math Library for DirectX 12",
+      "supports": "(windows & !arm32) | linux",
+      "dependencies": [
+        {
+          "name": "directx-headers",
+          "platform": "windows & !xbox"
+        }
+      ]
+    },
+    "xdsp": {
+      "description": "XDSP Digital Signal Processing (DSP) for DirectXMath"
+    }
+  }
 }
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -2337,8 +2337,8 @@
      "port-version": 0
    },
    "directxmath": {
-      "baseline": "2024-12-02",
-      "port-version": 1
+      "baseline": "2025-04-03",
+      "port-version": 0
    },
    "directxmesh": {
      "baseline": "2025-03-24",
--- a/versions/d-/directxmath.json
+++ b/versions/d-/directxmath.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "b199edaeaf0b2b92a634dfeb1289879ea5eeae7f",
+      "version-date": "2025-04-03",
+      "port-version": 0
+    },
    {
      "git-tree": "c93ddde0a2ee30591dc28b758308ddb4bef60156",
      "version-date": "2024-12-02",