Update assimp to v5.4.3

AuScope · Sep 2, 2024 · 83f17e5 · 83f17e5
1 parent 480c99f
commit 83f17e5
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/pdm.lock b/pdm.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -6,7 +6,7 @@ dependencies = [
     "numpy",
     "OWSLib==0.28.1",
     "Pillow",
-    "pyassimp @ file:///${PROJECT_ROOT}/test/assimp-5.2.5/port/PyAssimp",
+    "pyassimp @ file:///${PROJECT_ROOT}/test/assimp-5.4.3/port/PyAssimp",
     "pycollada",
     "pyproj",
     "SQLAlchemy",

diff --git a/test/build_assimp.sh b/test/build_assimp.sh
@@ -2,11 +2,10 @@
 
 # NB: Assumes we're in the 'test' dir
 
-# Install patched version of assimp, will try github released version once relevant PRs are merged
-ASSIMP_VER=5.2.5
+# Fetch assimp release
+ASSIMP_VER=5.4.3
 if [ ! -d assimp-$ASSIMP_VER ]; then
-#wget https://github.com/assimp/assimp/archive/v$ASSIMP_VER.tar.gz
-#wget https://github.com/assimp/assimp/archive/refs/tags/v$ASSIMP_VER.tar.gz
+wget https://github.com/assimp/assimp/archive/refs/tags/v$ASSIMP_VER.tar.gz
 tar xfz v$ASSIMP_VER.tar.gz
 
 # NB: Assumes 'sudo apt install cmake' 

diff --git a/test/run_test.sh b/test/run_test.sh
@@ -10,7 +10,7 @@ eval $(pdm venv activate for-test)
 pip install --upgrade pip
 pdm install --venv for-test
 
-ASSIMP_VER=5.2.5
+ASSIMP_VER=5.4.3
 # NB: assimp shared library is already built as part of 'pdm install' 
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/assimp-$ASSIMP_VER/bin
 echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"