summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYour Name2022-10-17 17:42:05 +0800
committerYour Name2022-10-17 17:42:05 +0800
commita6d88eb6da6ffecf81f48884bbb4effa7aefdddb (patch)
tree472673294e85a2267404201bfb6a288e7f4e43ee
parent2283ddad4601398e87aad69f423dbd8578c71b94 (diff)
downloadaur-a6d88eb6da6ffecf81f48884bbb4effa7aefdddb.tar.gz
update 2.2.2
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD8
-rw-r--r--mujoco.patch18
3 files changed, 18 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4fc0992a0811..d7581581bb53 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mujoco
pkgdesc = Multi-Joint dynamics with Contact. A general purpose physics simulator.
- pkgver = 2.2.1
- pkgrel = 2
+ pkgver = 2.2.2
+ pkgrel = 1
url = https://www.mujoco.org
arch = x86_64
license = Apache
@@ -16,9 +16,9 @@ pkgbase = mujoco
depends = tinyxml2
depends = tinyobjloader
depends = qhull
- source = https://github.com/deepmind/mujoco/archive/refs/tags/2.2.1.tar.gz
+ source = https://github.com/deepmind/mujoco/archive/refs/tags/2.2.2.tar.gz
source = mujoco.patch
- sha256sums = e7fa0821c993073b19bd8034df63661e309edcdc2d602101c3f9b28201574ded
- sha256sums = fa3ec3a529a80aa74804c23fe8b7a0d3ddebd0c86cef1597e60aaf5cb39c7317
+ sha256sums = 7aad590d2ec6056f0235021e493db014784452538e45513c4c022de22d8270b0
+ sha256sums = 23d0cb6f8d080b5c0b5bf460db6a88ba9d5a6dfe6f661216edde48d319cfa1b1
pkgname = mujoco
diff --git a/PKGBUILD b/PKGBUILD
index fcd386907e62..7759f873eb21 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mujoco
-pkgver=2.2.1
-pkgrel=2
+pkgver=2.2.2
+pkgrel=1
pkgdesc="Multi-Joint dynamics with Contact. A general purpose physics simulator."
arch=('x86_64')
url="https://www.mujoco.org"
@@ -9,8 +9,8 @@ depends=('libccd' 'libgl' 'glfw' 'tinyxml2' 'tinyobjloader' 'qhull')
makedepends=('abseil-cpp' 'gtest' 'benchmark' 'cmake' 'git')
source=("https://github.com/deepmind/mujoco/archive/refs/tags/$pkgver.tar.gz"
"${pkgname}.patch")
-sha256sums=('e7fa0821c993073b19bd8034df63661e309edcdc2d602101c3f9b28201574ded'
- 'fa3ec3a529a80aa74804c23fe8b7a0d3ddebd0c86cef1597e60aaf5cb39c7317')
+sha256sums=('7aad590d2ec6056f0235021e493db014784452538e45513c4c022de22d8270b0'
+ '23d0cb6f8d080b5c0b5bf460db6a88ba9d5a6dfe6f661216edde48d319cfa1b1')
prepare() {
cd "${pkgname}-${pkgver}"
diff --git a/mujoco.patch b/mujoco.patch
index e51e459a692f..6bebddbf559e 100644
--- a/mujoco.patch
+++ b/mujoco.patch
@@ -1,5 +1,5 @@
diff --git a/cmake/MujocoDependencies.cmake b/cmake/MujocoDependencies.cmake
-index b13a3ec..967d438 100644
+index d919b6e..68485aa 100644
--- a/cmake/MujocoDependencies.cmake
+++ b/cmake/MujocoDependencies.cmake
@@ -106,9 +106,9 @@ find_package(Git REQUIRED)
@@ -115,7 +115,7 @@ index b13a3ec..967d438 100644
# Support new IN_LIST if() operator.
set(CMAKE_POLICY_DEFAULT_CMP0057 NEW)
diff --git a/sample/cmake/SampleDependencies.cmake b/sample/cmake/SampleDependencies.cmake
-index 14cc943..588e788 100644
+index 3534929..6732055 100644
--- a/sample/cmake/SampleDependencies.cmake
+++ b/sample/cmake/SampleDependencies.cmake
@@ -26,8 +26,8 @@ option(MUJOCO_SAMPLES_USE_SYSTEM_MUJOCO "Use installed MuJoCo version."
@@ -129,16 +129,16 @@ index 14cc943..588e788 100644
set(MUJOCO_DEP_VERSION_glfw
7d5a16ce714f0b5f4efa3262de22e4d948851525 # 3.3.6
-@@ -58,7 +58,7 @@ findorfetch(
- EXCLUDE_FROM_ALL
+@@ -59,7 +59,7 @@ findorfetch(
)
--option(MUJOCO_SAMPLES_STATIC_GLFW "Link MuJoCo sample apps against GLFW statically." ON)
-+option(MUJOCO_SAMPLES_STATIC_GLFW "Link MuJoCo sample apps against GLFW statically." OFF)
- if(MUJOCO_SAMPLES_STATIC_GLFW)
+ 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})
- set(BUILD_SHARED_LIBS
-@@ -76,7 +76,7 @@ findorfetch(
+@@ -78,7 +78,7 @@ findorfetch(
USE_SYSTEM_PACKAGE
MUJOCO_SAMPLES_USE_SYSTEM_GLFW
PACKAGE_NAME