[trianglemeshdistance, mujoco] Update trianglemeshdistance, update mujoco (#48719)

2026-01-18 01:11:23 +01:00 · 2025-12-09 04:51:25 +02:00
parent e308c8cab9
commit 60abd1d7d3
10 changed files with 54 additions and 65 deletions
--- a/ports/mujoco/fix_dependencies.patch
+++ b/ports/mujoco/fix_dependencies.patch
@@ -1,17 +1,17 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 83b9fdcb..4ad77a3c 100644
+index 6e06fde4..e9c97475 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -116,7 +116,7 @@ add_subdirectory(src/render)
- add_subdirectory(src/thread)
- add_subdirectory(src/ui)
+@@ -151,7 +151,7 @@ if(EMSCRIPTEN)
+ endif()
+ 
 
 -target_compile_definitions(mujoco PRIVATE _GNU_SOURCE CCD_STATIC_DEFINE MUJOCO_DLL_EXPORTS -DMC_IMPLEM_ENABLE)
 +target_compile_definitions(mujoco PRIVATE _GNU_SOURCE MUJOCO_DLL_EXPORTS -DMC_IMPLEM_ENABLE)
 if(MUJOCO_ENABLE_AVX_INTRINSICS)
   target_compile_definitions(mujoco PUBLIC mjUSEPLATFORMSIMD)
 endif()
-@@ -139,9 +139,9 @@ target_link_libraries(
+@@ -174,9 +174,9 @@ target_link_libraries(
   mujoco
   PRIVATE ccd
           lodepng
@@ -25,7 +25,7 @@ index 83b9fdcb..4ad77a3c 100644
 
 set_target_properties(
 diff --git a/cmake/MujocoDependencies.cmake b/cmake/MujocoDependencies.cmake
-index ca935cbc..ba3bb48c 100644
+index 34be423f..1106d7ed 100644
 --- a/cmake/MujocoDependencies.cmake
 +++ b/cmake/MujocoDependencies.cmake
@@ -90,7 +90,7 @@ set(BUILD_SHARED_LIBS
@@ -37,7 +37,7 @@ index ca935cbc..ba3bb48c 100644
   FetchContent_Declare(
     lodepng
     GIT_REPOSITORY https://github.com/lvandeve/lodepng.git
-@@ -110,6 +110,7 @@ if(NOT TARGET lodepng)
+@@ -114,6 +114,7 @@ if(NOT TARGET lodepng)
   endif()
 endif()
 
@@ -45,7 +45,7 @@ index ca935cbc..ba3bb48c 100644
 if(NOT TARGET marchingcubecpp)
   FetchContent_Declare(
     marchingcubecpp
-@@ -123,36 +124,61 @@ if(NOT TARGET marchingcubecpp)
+@@ -127,6 +128,23 @@ if(NOT TARGET marchingcubecpp)
     include_directories(${marchingcubecpp_SOURCE_DIR})
   endif()
 endif()
@@ -68,6 +68,8 @@ index ca935cbc..ba3bb48c 100644
 +)
 
 set(QHULL_ENABLE_TESTING OFF)
+ # Patch changes in https://github.com/qhull/qhull/pull/173.patch
+@@ -136,32 +154,40 @@ set(QHULL_PATCH_COMMAND
 
 findorfetch(
   USE_SYSTEM_PACKAGE
@@ -87,6 +89,7 @@ index ca935cbc..ba3bb48c 100644
 -  qhull
 +  Qhull
   EXCLUDE_FROM_ALL
+   PATCH_COMMAND ${QHULL_PATCH_COMMAND}
 )
 # MuJoCo includes a file from libqhull_r which is not exported by the qhull include directories.
 # Add it to the target.
@@ -112,7 +115,7 @@ index ca935cbc..ba3bb48c 100644
   PACKAGE_NAME
   tinyxml2
   LIBRARY_NAME
-@@ -165,8 +191,10 @@ findorfetch(
+@@ -174,8 +200,10 @@ findorfetch(
   tinyxml2
   EXCLUDE_FROM_ALL
 )
@@ -123,7 +126,7 @@ index ca935cbc..ba3bb48c 100644
 
 # update cmake_minimum_required version for compatibility with newer version of cmake
 if(NOT DEFINED CMAKE_POLICY_VERSION_MINIMUM)
-@@ -175,7 +203,7 @@ if(NOT DEFINED CMAKE_POLICY_VERSION_MINIMUM)
+@@ -184,7 +212,7 @@ if(NOT DEFINED CMAKE_POLICY_VERSION_MINIMUM)
 endif()
 findorfetch(
   USE_SYSTEM_PACKAGE
@@ -132,7 +135,7 @@ index ca935cbc..ba3bb48c 100644
   PACKAGE_NAME
   tinyobjloader
   LIBRARY_NAME
-@@ -193,7 +221,7 @@ if(CMAKE_POLICY_VERSION_MINIMUM_LOCALLY_DEFINED)
+@@ -202,7 +230,7 @@ if(CMAKE_POLICY_VERSION_MINIMUM_LOCALLY_DEFINED)
   unset(CMAKE_POLICY_VERSION_MINIMUM_LOCALLY_DEFINED)
 endif()
 
@@ -141,7 +144,7 @@ index ca935cbc..ba3bb48c 100644
   FetchContent_Declare(
     trianglemeshdistance
     GIT_REPOSITORY https://github.com/InteractiveComputerGraphics/TriangleMeshDistance.git
-@@ -217,6 +245,18 @@ if(NOT TARGET trianglemeshdistance)
+@@ -226,6 +254,18 @@ if(NOT TARGET trianglemeshdistance)
   endif()
 endif()
 
@@ -149,7 +152,7 @@ index ca935cbc..ba3bb48c 100644
 +  USE_SYSTEM_PACKAGE
 +  ON
 +  PACKAGE_NAME
-+  unofficial-trianglemeshdistance
+  trianglemeshdistance
 +  LIBRARY_NAME
 +  trianglemeshdistance
 +  TARGETS
@@ -159,8 +162,8 @@ index ca935cbc..ba3bb48c 100644
 +
 set(ENABLE_DOUBLE_PRECISION ON)
 set(CCD_HIDE_ALL_SYMBOLS ON)
- # update cmake_minimum_required version for compatibility with newer version of cmake
-@@ -226,7 +270,7 @@ if(NOT DEFINED CMAKE_POLICY_VERSION_MINIMUM)
+ 
+@@ -241,7 +281,7 @@ if(NOT DEFINED CMAKE_POLICY_VERSION_MINIMUM)
 endif()
 findorfetch(
   USE_SYSTEM_PACKAGE
@@ -169,7 +172,7 @@ index ca935cbc..ba3bb48c 100644
   PACKAGE_NAME
   ccd
   LIBRARY_NAME
-@@ -243,11 +287,14 @@ if(CMAKE_POLICY_VERSION_MINIMUM_LOCALLY_DEFINED)
+@@ -259,11 +299,14 @@ if(CMAKE_POLICY_VERSION_MINIMUM_LOCALLY_DEFINED)
   unset(CMAKE_POLICY_VERSION_MINIMUM)
   unset(CMAKE_POLICY_VERSION_MINIMUM_LOCALLY_DEFINED)
 endif()
@@ -184,13 +187,13 @@ index ca935cbc..ba3bb48c 100644
 if(WIN32)
   if(MSVC)
     # C4005 is the MSVC equivalent of -Wmacro-redefined.
-@@ -256,6 +303,7 @@ if(WIN32)
+@@ -272,6 +315,7 @@ if(WIN32)
     target_compile_options(ccd PRIVATE -Wno-macro-redefined)
   endif()
 endif()
 +endif()
 
- if(MUJOCO_BUILD_TESTS)
+ if(MUJOCO_BUILD_TESTS OR MUJOCO_BUILD_STUDIO OR MUJOCO_USE_FILAMENT)
   set(ABSL_PROPAGATE_CXX_STD ON)
 diff --git a/simulate/cmake/SimulateDependencies.cmake b/simulate/cmake/SimulateDependencies.cmake
 index 7885f5f9..01db1dbc 100644
@@ -215,10 +218,10 @@ index 7885f5f9..01db1dbc 100644
   target_link_options(glfw PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS})
 endif()
 diff --git a/src/user/user_mesh.cc b/src/user/user_mesh.cc
+index 8c46840b..27711d66 100644
 --- a/src/user/user_mesh.cc
 +++ b/src/user/user_mesh.cc
-@@ -33,9 +33,9 @@
- #include <vector>
+@@ -34,7 +34,7 @@
 
 #include <mujoco/mjspec.h>
 #include "user/user_api.h"
@@ -227,4 +230,3 @@ diff --git a/src/user/user_mesh.cc b/src/user/user_mesh.cc
 
 #ifdef MUJOCO_TINYOBJLOADER_IMPL
 #define TINYOBJLOADER_IMPLEMENTATION
- #endif
--- a/ports/mujoco/portfile.cmake
+++ b/ports/mujoco/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO deepmind/mujoco
    REF ${VERSION}
-    SHA512 08ae4c638df552112715d08532087430b9457db67b26f5fd8e0e0ec72d5f195694e19749acbf2553285a57a35a9f1aaa3d19194f3ef125014345d0b7a1372f9c
+    SHA512 bd9c161340764b62cdf1b6707ee1c2a515167e8aa8c9b13c61747d780df9a014b5c17c2c38858eb044e9804fb7359ed2b0c2f4199ffa1e942ffebb6bd9eb24b0
    PATCHES
        fix_dependencies.patch
        disable-werror.patch
--- a/ports/mujoco/vcpkg.json
+++ b/ports/mujoco/vcpkg.json
@@ -1,6 +1,6 @@
 {
  "name": "mujoco",
-  "version": "3.3.7",
+  "version": "3.4.0",
  "description": "Multi-Joint dynamics with Contact.",
  "homepage": "https://mujoco.org",
  "license": "Apache-2.0",
--- a/ports/trianglemeshdistance/cmake-export.patch
+++ b/ports/trianglemeshdistance/cmake-export.patch
@@ -1,36 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,31 @@
- cmake_minimum_required(VERSION 3.1)
- project(TriangleMeshDistance)
- set(CMAKE_CXX_STANDARD 11)
- 
-add_subdirectory(tests)
-+if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
-+    SET(CMAKE_INSTALL_INCLUDEDIR include CACHE
-+        PATH "Output directory for header files")
-+endif()
-+
-+add_library(trianglemeshdistance INTERFACE)
-+
-+target_include_directories(trianglemeshdistance
-+    INTERFACE
-+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/TriangleMeshDistance/include>
-+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-+)
-+
-+install(
-+    DIRECTORY TriangleMeshDistance/include/
-+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-+)
-+
-+install(
-+    TARGETS trianglemeshdistance
-+    EXPORT TriangleMeshDistanceTargets
-+)
-+
-+install(EXPORT TriangleMeshDistanceTargets
-+    FILE unofficial-trianglemeshdistance-config.cmake
-+    NAMESPACE unofficial::trianglemeshdistance::
-+    DESTINATION share/unofficial-trianglemeshdistance)
--- a/ports/trianglemeshdistance/portfile.cmake
+++ b/ports/trianglemeshdistance/portfile.cmake
@@ -1,10 +1,10 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO InteractiveComputerGraphics/TriangleMeshDistance
-    REF 2cb643de1436e1ba8e2be49b07ec5491ac604457 # 2024-08-17
-    SHA512 92a9e7c6e09c9184a3762ae7bb89ffae1ebe0ceead8fe5853cb809ec19c516ce4b3c2fcb3ecc5c2927e3578ebd548b571085527209ea0d58934440f932b554b0
+    REF 566c9486533082fe7d9a3ffae15799bc5c125528 # 2025-12-05
+    SHA512 642bac995d6c42f9a898929cbdbbbe99f19eb2c1e5c067bad9b883d788be4797075062277fd7b0b510767888b2412f7a212039e68f8fd0982f36c019f0cb43aa
    PATCHES
-        cmake-export.patch
+        remove-tests.patch
 )

 vcpkg_cmake_configure(
--- a/ports/trianglemeshdistance/remove-tests.patch
+++ b/ports/trianglemeshdistance/remove-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -1,9 +1,8 @@
+ cmake_minimum_required(VERSION 3.1)
+ project(TriangleMeshDistance)
+ set(CMAKE_CXX_STANDARD 11)
+ 
+-add_subdirectory(tests)
+ 
+ if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
+     SET(CMAKE_INSTALL_INCLUDEDIR include CACHE
+         PATH "Output directory for header files")
--- a/ports/trianglemeshdistance/vcpkg.json
+++ b/ports/trianglemeshdistance/vcpkg.json
@@ -1,6 +1,6 @@
 {
  "name": "trianglemeshdistance",
-  "version-date": "2024-08-17",
+  "version-date": "2025-12-05",
  "description": "Header only library to compute the signed distance function (SDF) to a triangle mesh.",
  "homepage": "https://github.com/InteractiveComputerGraphics/TriangleMeshDistance",
  "license": "MIT",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6641,7 +6641,7 @@
      "port-version": 0
    },
    "mujoco": {
-      "baseline": "3.3.7",
+      "baseline": "3.4.0",
      "port-version": 0
    },
    "mujs": {
@@ -9965,7 +9965,7 @@
      "port-version": 4
    },
    "trianglemeshdistance": {
-      "baseline": "2024-08-17",
+      "baseline": "2025-12-05",
      "port-version": 0
    },
    "triton": {
--- a/versions/m-/mujoco.json
+++ b/versions/m-/mujoco.json
@@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "1795561d22655499efa2647564445d448c30e394",
+      "version": "3.4.0",
+      "port-version": 0
+    },
    {
      "git-tree": "47bb038c84c8f73f905fb67bf9dc0e345fcda81e",
      "version": "3.3.7",
--- a/versions/t-/trianglemeshdistance.json
+++ b/versions/t-/trianglemeshdistance.json
@@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "8a027543ee52a1e5bc5ea0befa3944a8adf2f9b8",
+      "version-date": "2025-12-05",
+      "port-version": 0
+    },
    {
      "git-tree": "4f3f6aff20eeeb11c6e24384e64c72520efcb2b2",
      "version-date": "2024-08-17",