Migrating Assimp for USD Animation Support (#267)

Upgrading Assimp for USD animation Cherrypick fixes from Assimp master `git cherry-pick --no-commit 811bf2df154c46e98258452afdb6fc4f9dbc64b6 7634cf84ca90c9560a2474e51a4a5e35d45ee905 401279e2f92359bc32dc607e5bc50d243cc34a24 2493deff37e60761737234670c137f4bdc07e158` Cherrypick 58b9cb3c85dc104dce6141e39a164b5f995e4f6a fix from [pending Assimp PR](assimp/assimp#5915) ![drummer](https://github.com/user-attachments/assets/6bbedad8-ac65-4a46-9ddc-bbb700765731) --------- Signed-off-by: Gene Walters <[email protected]> Signed-off-by: AMZN-Gene <[email protected]>
o3de · Dec 9, 2024 · 10c916d · 10c916d
1 parent 11c082c
commit 10c916d
Show file tree

Hide file tree

Showing 8 changed files with 1,093 additions and 16 deletions.
diff --git a/package-system/assimp/PackageInfo.json b/package-system/assimp/PackageInfo.json
@@ -1,5 +1,5 @@
 {
-  "PackageName": "assimp-5.4.3-rev1",
+  "PackageName": "assimp-5.4.3-rev2",
   "URL": "https://github.com/assimp/assimp/blob/master/LICENSE",
   "License": "BSD-3-Clause",
   "LicenseFile": "LICENSE"

diff --git a/package-system/assimp/build_assimp_windows.cmd b/package-system/assimp/build_assimp_windows.cmd
@@ -12,7 +12,6 @@
 @rem # cmake expects fowardslashes:
 set "DOWNLOADED_PACKAGE_FOLDERS=%DOWNLOADED_PACKAGE_FOLDERS:\=/%"
 
-@rem # /w compiler option. Assimp USD is implemented using TinyUSDZ which, unfortunately, contains compiler warnings
 cmake -S temp/src -G "Visual Studio 17" ^
     -DBUILD_SHARED_LIBS=OFF ^
     -DCMAKE_BUILD_TYPE=Release ^
@@ -21,12 +20,10 @@ cmake -S temp/src -G "Visual Studio 17" ^
     -DASSIMP_BUILD_ASSIMP_TOOLS=OFF ^
     -DASSIMP_BUILD_USD_IMPORTER=ON ^
     -DASSIMP_WARNINGS_AS_ERRORS=OFF ^
-    -DCMAKE_CXX_FLAGS="/EHsc /w" ^
     temp/src/CMakeLists.txt || exit /b 1
 cmake --build temp/src --config release || exit /b 1
 cmake --build temp/src --config debug || exit /b 1
 
-@rem # /w compiler option. Assimp USD is implemented using TinyUSDZ which, unfortunately, contains compiler warnings
 cmake -S temp/src -G "Visual Studio 17" ^
     -DBUILD_SHARED_LIBS=ON ^
     -DCMAKE_BUILD_TYPE=Release ^
@@ -35,7 +32,6 @@ cmake -S temp/src -G "Visual Studio 17" ^
     -DASSIMP_BUILD_ASSIMP_TOOLS=OFF ^
     -DASSIMP_BUILD_USD_IMPORTER=ON ^
     -DASSIMP_WARNINGS_AS_ERRORS=OFF ^
-    -DCMAKE_CXX_FLAGS="/EHsc /w" ^
     temp/src/CMakeLists.txt || exit /b 1
 cmake --build temp/src --config release || exit /b 1
 cmake --build temp/src --config debug || exit /b 1

diff --git a/package-system/assimp/build_config.json b/package-system/assimp/build_config.json
@@ -2,12 +2,13 @@
     "git_url":"https://github.com/assimp/assimp",
     "git_tag": "v5.4.3",
     "package_name":"assimp",
-    "package_version":"5.4.3-rev1",
+    "package_version":"5.4.3-rev2",
     "package_url":"https://github.com/assimp/assimp",
     "package_license":"BSD-3-Clause",
     "package_license_file":"LICENSE",
     "cmake_find_source":"Findassimplib.cmake",
     "cmake_find_target":"Findassimplib.cmake",
+    "patch_file" : "usd_animations-on-top-of-v5.4.3.patch",
     "Platforms":{
         "Windows":{
             "Windows":{

diff --git a/package-system/assimp/usd_animations-on-top-of-v5.4.3.patch b/package-system/assimp/usd_animations-on-top-of-v5.4.3.patch
diff --git a/package_build_list_host_darwin.json b/package_build_list_host_darwin.json
@@ -4,7 +4,7 @@
     "comment3" : "build_from_folder is package name --> folder containing built image of package",
     "comment4" : "Note:  Build from source occurs before build_from_folder",
     "build_from_source": {
-        "assimp-5.4.3-rev1-mac":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Mac --package-root ../../package-system --clean",
+        "assimp-5.4.3-rev2-mac":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Mac --package-root ../../package-system --clean",
         "AWSNativeSDK-1.11.361-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Mac --package-root ../../package-system --clean",
         "AWSNativeSDK-1.11.361-rev1-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name iOS --package-root ../../package-system --clean",
         "Lua-5.4.4-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Mac --package-root ../../package-system/Lua/temp --clean",
@@ -55,7 +55,7 @@
         "expat-2.4.2-rev2-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/expat --platform-name iOS --package-root ../../package-system/expat/temp --clean"
     },
     "build_from_folder": {
-        "assimp-5.4.3-rev1-mac": "package-system/assimp-mac",
+        "assimp-5.4.3-rev2-mac": "package-system/assimp-mac",
         "AWSNativeSDK-1.11.361-rev1-mac": "package-system/AWSNativeSDK-mac",
         "AWSNativeSDK-1.11.361-rev1-ios": "package-system/AWSNativeSDK-ios",
         "AwsIotDeviceSdkCpp-1.15.2-rev2-mac": "package-system/AwsIotDeviceSdkCpp-mac",

diff --git a/package_build_list_host_linux-aarch64.json b/package_build_list_host_linux-aarch64.json
@@ -4,7 +4,7 @@
     "comment3" : "build_from_folder is package name --> folder containing built image of package",
     "comment4" : "Note:  Build from source occurs before build_from_folder",
     "build_from_source": {
-        "assimp-5.4.3-rev1-linux-aarch64":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Linux-aarch64 --clean",
+        "assimp-5.4.3-rev2-linux-aarch64":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Linux-aarch64 --clean",
         "astc-encoder-3.2-rev3-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Linux-aarch64 --clean",
         "AWSGameLiftServerSDK-5.1.2-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSGameLiftServerSDK --platform-name Linux-aarch64 --clean",
         "AwsIotDeviceSdkCpp-1.15.2-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Linux-aarch64 --clean",
@@ -45,7 +45,7 @@
         "zlib-1.2.11-rev5-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Linux-aarch64 --clean"
     },
     "build_from_folder": {
-        "assimp-5.4.3-rev1-linux-aarch64": "package-system/assimp/temp/assimp-linux-aarch64",
+        "assimp-5.4.3-rev2-linux-aarch64": "package-system/assimp/temp/assimp-linux-aarch64",
         "astc-encoder-3.2-rev3-linux-aarch64": "package-system/astc-encoder/temp/astc-encoder-linux-aarch64",
         "AWSGameLiftServerSDK-5.1.2-rev1-linux-aarch64": "package-system/AWSGameLiftServerSDK/temp/AWSGameLiftServerSDK-linux-aarch64",
         "AwsIotDeviceSdkCpp-1.15.2-rev1-linux-aarch64": "package-system/AwsIotDeviceSdkCpp/temp/AwsIotDeviceSdkCpp-linux-aarch64",

diff --git a/package_build_list_host_linux.json b/package_build_list_host_linux.json
@@ -4,8 +4,8 @@
     "comment3" : "build_from_folder is package name --> folder containing built image of package",
     "comment4" : "Note:  Build from source occurs before build_from_folder",
     "build_from_source": {
-        "assimp-5.4.3-rev1-linux":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Linux --package-root ../../package-system --clean",
-        "assimp-5.4.3-rev1-linux-aarch64":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Linux-aarch64 --package-root ../../package-system --clean",
+        "assimp-5.4.3-rev2-linux":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Linux --package-root ../../package-system --clean",
+        "assimp-5.4.3-rev2-linux-aarch64":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Linux-aarch64 --package-root ../../package-system --clean",
         "AWSGameLiftServerSDK-5.1.2-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSGameLiftServerSDK --platform-name Linux --clean",
         "AWSGameLiftServerSDK-5.1.2-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSGameLiftServerSDK --platform-name Linux-aarch64 --clean",
         "AWSNativeSDK-1.11.361-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux --clean",
@@ -53,8 +53,8 @@
         "vulkan-validationlayers-1.2.198-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/vulkan-validationlayers --platform-name Linux --package-root ../../package-system/vulkan-validationlayers/temp --clean"
     },
     "build_from_folder": {
-        "assimp-5.4.3-rev1-linux": "package-system/assimp-linux",
-        "assimp-5.4.3-rev1-linux-aarch64": "package-system/assimp-linux-aarch64",
+        "assimp-5.4.3-rev2-linux": "package-system/assimp-linux",
+        "assimp-5.4.3-rev2-linux-aarch64": "package-system/assimp-linux-aarch64",
         "AWSGameLiftServerSDK-5.1.2-rev1-linux": "package-system/AWSGameLiftServerSDK/temp/AWSGameLiftServerSDK-linux",
         "AWSGameLiftServerSDK-5.1.2-rev1-linux-aarch64": "package-system/AWSGameLiftServerSDK/temp/AWSGameLiftServerSDK-linux-aarch64",
         "AWSNativeSDK-1.11.361-rev1-linux": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux",

diff --git a/package_build_list_host_windows.json b/package_build_list_host_windows.json
@@ -4,7 +4,7 @@
     "comment3" : "build_from_folder is package name --> folder containing built image of package",
     "comment4" : "Note:  Build from source occurs before build_from_folder",
     "build_from_source": {
-        "assimp-5.4.3-rev1-windows":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Windows --package-root ../../package-system --clean",
+        "assimp-5.4.3-rev2-windows":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Windows --package-root ../../package-system --clean",
         "astc-encoder-3.2-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Windows --package-root ../../package-system --clean",
         "azslc-1.8.22-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Windows --package-root ../../package-system/azslc/temp --clean",
         "AWSGameLiftServerSDK-5.1.2-rev1-windows": "package-system/AWSGameLiftServerSDK/build_package_image.py --platform-name windows",
@@ -66,7 +66,7 @@
   },
   "build_from_folder": {
     "alembic-1.7.11-rev3-multiplatform": "package-system/alembic-multiplatform",
-    "assimp-5.4.3-rev1-windows": "package-system/assimp-windows",
+    "assimp-5.4.3-rev2-windows": "package-system/assimp-windows",
     "astc-encoder-3.2-rev2-windows": "package-system/astc-encoder-windows",
     "azslc-1.8.22-rev1-windows": "package-system/azslc/temp/azslc-windows",
     "AWSGameLiftServerSDK-5.1.2-rev1-windows": "package-system/AWSGameLiftServerSDK-windows",