From 8b95db4bcdd15b746a10d45e6d18fbb37fbd6835 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Mon, 8 Apr 2024 11:51:44 -0400 Subject: [PATCH] Update assimp vendor to 5.3.1 (#1182) This matches what is in Ubuntu 24.04. Signed-off-by: Chris Lalancette --- rviz_assimp_vendor/CMakeLists.txt | 3 +-- rviz_assimp_vendor/patches/.gitattributes | 4 ---- .../patches/0001-use-system-minizip.patch | 20 ------------------- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 rviz_assimp_vendor/patches/.gitattributes delete mode 100644 rviz_assimp_vendor/patches/0001-use-system-minizip.patch diff --git a/rviz_assimp_vendor/CMakeLists.txt b/rviz_assimp_vendor/CMakeLists.txt index 13854dd35..79525d6f6 100644 --- a/rviz_assimp_vendor/CMakeLists.txt +++ b/rviz_assimp_vendor/CMakeLists.txt @@ -34,14 +34,13 @@ endif() ament_vendor(assimp_vendor SATISFIED ${assimp_FOUND} VCS_URL https://github.com/assimp/assimp.git - VCS_VERSION v5.2.2 + VCS_VERSION v5.3.1 CMAKE_ARGS -DASSIMP_BUILD_ASSIMP_TOOLS:BOOL=OFF -DASSIMP_BUILD_TESTS:BOOL=OFF -DASSIMP_BUILD_SAMPLES:BOOL=OFF "${ASSIMP_CMAKE_FLAGS}" "-DCMAKE_CXX_FLAGS=${ASSIMP_CXX_FLAGS}" - PATCHES patches ) if(BUILD_TESTING) diff --git a/rviz_assimp_vendor/patches/.gitattributes b/rviz_assimp_vendor/patches/.gitattributes deleted file mode 100644 index 4948ec9e9..000000000 --- a/rviz_assimp_vendor/patches/.gitattributes +++ /dev/null @@ -1,4 +0,0 @@ -# Because the assimp repo declares eol=lf on all its .cpp files, we also -# need to declare this on the patch file so that the line endings match -# on Windows checkouts. -*.patch text eol=lf diff --git a/rviz_assimp_vendor/patches/0001-use-system-minizip.patch b/rviz_assimp_vendor/patches/0001-use-system-minizip.patch deleted file mode 100644 index f9bef850a..000000000 --- a/rviz_assimp_vendor/patches/0001-use-system-minizip.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: fix compilation with system provided minizip package - upstream vendored an a forked version of minizip that has not seen any love for 6 years... -Origin: https://github.com/assimp/assimp/issues/4334 -Forwarded: https://github.com/assimp/assimp/issues/4334 -Reviewed-by: IOhannes m zmölnig -Last-Update: 2022-01-19 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- assimp.orig/code/Common/ZipArchiveIOSystem.cpp -+++ assimp/code/Common/ZipArchiveIOSystem.cpp -@@ -196,7 +196,9 @@ - zlib_filefunc_def mapping; - - mapping.zopen_file = (open_file_func)open; -+#ifdef ZOPENDISK64 - mapping.zopendisk_file = (opendisk_file_func)opendisk; -+#endif - mapping.zread_file = (read_file_func)read; - mapping.zwrite_file = (write_file_func)write; - mapping.ztell_file = (tell_file_func)tell;