update 2.2.2

3 files changed, 35 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d7581581bb53..5f6910ad747f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -19,6 +19,6 @@ pkgbase = mujoco
 	source = https://github.com/deepmind/mujoco/archive/refs/tags/2.2.2.tar.gz
 	source = mujoco.patch
 	sha256sums = 7aad590d2ec6056f0235021e493db014784452538e45513c4c022de22d8270b0
-	sha256sums = 23d0cb6f8d080b5c0b5bf460db6a88ba9d5a6dfe6f661216edde48d319cfa1b1
+	sha256sums = 3654132f7685e6c1d4b0f9cddc266e5d2bfe63f440dad53606d8aac4af046642
 
 pkgname = mujoco
diff --git a/PKGBUILD b/PKGBUILD
index 7759f873eb21..4e0bc8138d3b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ makedepends=('abseil-cpp' 'gtest' 'benchmark' 'cmake' 'git')
 source=("https://github.com/deepmind/mujoco/archive/refs/tags/$pkgver.tar.gz"
     "${pkgname}.patch")
 sha256sums=('7aad590d2ec6056f0235021e493db014784452538e45513c4c022de22d8270b0'
-            '23d0cb6f8d080b5c0b5bf460db6a88ba9d5a6dfe6f661216edde48d319cfa1b1')
+            '3654132f7685e6c1d4b0f9cddc266e5d2bfe63f440dad53606d8aac4af046642')
 
 prepare() {
 	cd "${pkgname}-${pkgver}"
diff --git a/mujoco.patch b/mujoco.patch
index 6bebddbf559e..b65d6bd35afb 100644
--- a/mujoco.patch
+++ b/mujoco.patch
@@ -147,3 +147,36 @@ index 3534929..6732055 100644
    LIBRARY_NAME
    glfw
    GIT_REPO
+diff --git a/simulate/cmake/SimulateDependencies.cmake b/simulate/cmake/SimulateDependencies.cmake
+index 9fba6a2..6404d29 100644
+--- a/simulate/cmake/SimulateDependencies.cmake
++++ b/simulate/cmake/SimulateDependencies.cmake
+@@ -26,8 +26,8 @@ option(MUJOCO_SIMULATE_USE_SYSTEM_MUJOCO "Use installed MuJoCo version."
+ )
+ unset(DEFAULT_USE_SYSTEM_MUJOCO)
+ 
+-option(MUJOCO_SIMULATE_USE_SYSTEM_MUJOCO "Use installed MuJoCo version." OFF)
+-option(MUJOCO_SIMULATE_USE_SYSTEM_GLFW "Use installed GLFW version." OFF)
++option(MUJOCO_SIMULATE_USE_SYSTEM_MUJOCO "Use installed MuJoCo version." ON)
++option(MUJOCO_SIMULATE_USE_SYSTEM_GLFW "Use installed GLFW version." ON)
+ 
+ set(MUJOCO_DEP_VERSION_glfw
+     7d5a16ce714f0b5f4efa3262de22e4d948851525 # 3.3.6
+@@ -59,7 +59,7 @@ findorfetch(
+ )
+ 
+ option(MUJOCO_EXTRAS_STATIC_GLFW
+-       "Link MuJoCo sample apps and simulate libraries against GLFW statically." ON
++       "Link MuJoCo sample apps and simulate libraries against GLFW statically." OFF
+ )
+ if(MUJOCO_EXTRAS_STATIC_GLFW)
+   set(BUILD_SHARED_LIBS_OLD ${BUILD_SHARED_LIBS})
+@@ -78,7 +78,7 @@ findorfetch(
+   USE_SYSTEM_PACKAGE
+   MUJOCO_SIMULATE_USE_SYSTEM_GLFW
+   PACKAGE_NAME
+-  glfw
++  glfw3
+   LIBRARY_NAME
+   glfw
+   GIT_REPO