From 358074a565fed5eec069bb8010699a3aa29db616 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Fri, 22 Mar 2024 12:12:22 -0700 Subject: [PATCH] [manylinux] Update dependency versions to the latest: assimp, octomap, tinyxml2 --- docker/dev/v6.14/Dockerfile.manylinux_2_28_aarch64-min | 6 +++--- docker/dev/v6.14/Dockerfile.manylinux_2_28_ppc64le-min | 6 +++--- docker/dev/v6.14/Dockerfile.manylinux_2_28_s390x-min | 6 +++--- docker/dev/v6.14/Dockerfile.manylinux_2_28_x86_64 | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docker/dev/v6.14/Dockerfile.manylinux_2_28_aarch64-min b/docker/dev/v6.14/Dockerfile.manylinux_2_28_aarch64-min index bc1209377eecb..eee9d4398d82d 100644 --- a/docker/dev/v6.14/Dockerfile.manylinux_2_28_aarch64-min +++ b/docker/dev/v6.14/Dockerfile.manylinux_2_28_aarch64-min @@ -21,7 +21,7 @@ RUN git clone https://github.com/fmtlib/fmt.git -b 10.2.1 \ && rm -rf fmt # assimp -RUN git clone https://github.com/assimp/assimp.git -b 'v5.2.5' \ +RUN git clone https://github.com/assimp/assimp.git -b 'v5.3.1' \ && mkdir -p assimp/build \ && cmake assimp -B assimp/build -DCMAKE_BUILD_TYPE=Release -DASSIMP_BUILD_TESTS=OFF -DASSIMP_WARNINGS_AS_ERRORS=OFF \ && cmake --build assimp/build --target install -j${NUM_CORES} \ @@ -35,7 +35,7 @@ RUN git clone https://gitlab.com/libeigen/eigen.git -b '3.4.0' \ && rm -rf eigen # octomap -RUN git clone https://github.com/OctoMap/octomap.git -b 'v1.9.6' \ +RUN git clone https://github.com/OctoMap/octomap.git -b 'v1.10.0' \ && mkdir -p octomap/build \ && cmake octomap -B octomap/build -DCMAKE_BUILD_TYPE=Release -DBUILD_OCTOVIS_SUBPROJECT=OFF -DBUILD_OCTOVIS_SUBPROJECT=OFF -DBUILD_DYNAMICETD3D_SUBPROJECT=OFF -DBUILD_TESTING=OFF \ && cmake --build octomap/build --target install -j${NUM_CORES} \ @@ -77,7 +77,7 @@ RUN git clone https://github.com/jslee02/tinyxml.git \ && rm -rf tinyxml # tinyxml2 -RUN git clone https://github.com/leethomason/tinyxml2.git -b '9.0.0' \ +RUN git clone https://github.com/leethomason/tinyxml2.git -b '10.0.0' \ && mkdir -p tinyxml2/build \ && cmake tinyxml2 -B tinyxml2/build -DCMAKE_BUILD_TYPE=Release -Dtinyxml2_BUILD_TESTING=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ && cmake --build tinyxml2/build --target install -j${NUM_CORES} \ diff --git a/docker/dev/v6.14/Dockerfile.manylinux_2_28_ppc64le-min b/docker/dev/v6.14/Dockerfile.manylinux_2_28_ppc64le-min index d3895c6bcecae..42ac8c8ea2464 100644 --- a/docker/dev/v6.14/Dockerfile.manylinux_2_28_ppc64le-min +++ b/docker/dev/v6.14/Dockerfile.manylinux_2_28_ppc64le-min @@ -18,7 +18,7 @@ RUN git clone https://github.com/fmtlib/fmt.git -b 10.2.1 \ && rm -rf fmt # assimp -RUN git clone https://github.com/assimp/assimp.git -b 'v5.2.5' \ +RUN git clone https://github.com/assimp/assimp.git -b 'v5.3.1' \ && mkdir -p assimp/build \ && cmake assimp -B assimp/build -DCMAKE_BUILD_TYPE=Release -DASSIMP_BUILD_TESTS=OFF -DASSIMP_WARNINGS_AS_ERRORS=OFF \ && cmake --build assimp/build --target install -j${NUM_CORES} \ @@ -32,7 +32,7 @@ RUN git clone https://gitlab.com/libeigen/eigen.git -b '3.4.0' \ && rm -rf eigen # octomap -RUN git clone https://github.com/OctoMap/octomap.git -b 'v1.9.6' \ +RUN git clone https://github.com/OctoMap/octomap.git -b 'v1.10.0' \ && mkdir -p octomap/build \ && cmake octomap -B octomap/build -DCMAKE_BUILD_TYPE=Release -DBUILD_OCTOVIS_SUBPROJECT=OFF -DBUILD_OCTOVIS_SUBPROJECT=OFF -DBUILD_DYNAMICETD3D_SUBPROJECT=OFF -DBUILD_TESTING=OFF \ && cmake --build octomap/build --target install -j${NUM_CORES} \ @@ -67,7 +67,7 @@ RUN git clone https://github.com/jslee02/tinyxml.git \ && rm -rf tinyxml # tinyxml2 -RUN git clone https://github.com/leethomason/tinyxml2.git -b '9.0.0' \ +RUN git clone https://github.com/leethomason/tinyxml2.git -b '10.0.0' \ && mkdir -p tinyxml2/build \ && cmake tinyxml2 -B tinyxml2/build -DCMAKE_BUILD_TYPE=Release -Dtinyxml2_BUILD_TESTING=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ && cmake --build tinyxml2/build --target install -j${NUM_CORES} \ diff --git a/docker/dev/v6.14/Dockerfile.manylinux_2_28_s390x-min b/docker/dev/v6.14/Dockerfile.manylinux_2_28_s390x-min index 3aedddf94bcbf..5a9891d6c378e 100644 --- a/docker/dev/v6.14/Dockerfile.manylinux_2_28_s390x-min +++ b/docker/dev/v6.14/Dockerfile.manylinux_2_28_s390x-min @@ -18,7 +18,7 @@ RUN git clone https://github.com/fmtlib/fmt.git -b 10.2.1 \ && rm -rf fmt # assimp -RUN git clone https://github.com/assimp/assimp.git -b 'v5.2.5' \ +RUN git clone https://github.com/assimp/assimp.git -b 'v5.3.1' \ && mkdir -p assimp/build \ && cmake assimp -B assimp/build -DCMAKE_BUILD_TYPE=Release -DASSIMP_BUILD_TESTS=OFF -DASSIMP_WARNINGS_AS_ERRORS=OFF \ && cmake --build assimp/build --target install -j${NUM_CORES} \ @@ -32,7 +32,7 @@ RUN git clone https://gitlab.com/libeigen/eigen.git -b '3.4.0' \ && rm -rf eigen # octomap -RUN git clone https://github.com/OctoMap/octomap.git -b 'v1.9.6' \ +RUN git clone https://github.com/OctoMap/octomap.git -b 'v1.10.0' \ && mkdir -p octomap/build \ && cmake octomap -B octomap/build -DCMAKE_BUILD_TYPE=Release -DBUILD_OCTOVIS_SUBPROJECT=OFF -DBUILD_OCTOVIS_SUBPROJECT=OFF -DBUILD_DYNAMICETD3D_SUBPROJECT=OFF -DBUILD_TESTING=OFF \ && cmake --build octomap/build --target install -j${NUM_CORES} \ @@ -67,7 +67,7 @@ RUN git clone https://github.com/jslee02/tinyxml.git \ && rm -rf tinyxml # tinyxml2 -RUN git clone https://github.com/leethomason/tinyxml2.git -b '9.0.0' \ +RUN git clone https://github.com/leethomason/tinyxml2.git -b '10.0.0' \ && mkdir -p tinyxml2/build \ && cmake tinyxml2 -B tinyxml2/build -DCMAKE_BUILD_TYPE=Release -Dtinyxml2_BUILD_TESTING=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ && cmake --build tinyxml2/build --target install -j${NUM_CORES} \ diff --git a/docker/dev/v6.14/Dockerfile.manylinux_2_28_x86_64 b/docker/dev/v6.14/Dockerfile.manylinux_2_28_x86_64 index 697c53b21ca29..97884a7150a75 100644 --- a/docker/dev/v6.14/Dockerfile.manylinux_2_28_x86_64 +++ b/docker/dev/v6.14/Dockerfile.manylinux_2_28_x86_64 @@ -22,7 +22,7 @@ RUN git clone https://github.com/fmtlib/fmt.git -b 10.2.1 \ && rm -rf fmt # assimp -RUN git clone https://github.com/assimp/assimp.git -b 'v5.2.5' \ +RUN git clone https://github.com/assimp/assimp.git -b 'v5.3.1' \ && mkdir -p assimp/build \ && cmake assimp -B assimp/build -DCMAKE_BUILD_TYPE=Release -DASSIMP_BUILD_TESTS=OFF -DASSIMP_WARNINGS_AS_ERRORS=OFF \ && cmake --build assimp/build --target install -j${NUM_CORES} \ @@ -36,7 +36,7 @@ RUN git clone https://gitlab.com/libeigen/eigen.git -b '3.4.0' \ && rm -rf eigen # octomap -RUN git clone https://github.com/OctoMap/octomap.git -b 'v1.9.6' \ +RUN git clone https://github.com/OctoMap/octomap.git -b 'v1.10.0' \ && mkdir -p octomap/build \ && cmake octomap -B octomap/build -DCMAKE_BUILD_TYPE=Release -DBUILD_OCTOVIS_SUBPROJECT=OFF -DBUILD_OCTOVIS_SUBPROJECT=OFF -DBUILD_DYNAMICETD3D_SUBPROJECT=OFF -DBUILD_TESTING=OFF \ && cmake --build octomap/build --target install -j${NUM_CORES} \ @@ -71,7 +71,7 @@ RUN git clone https://github.com/jslee02/tinyxml.git \ && rm -rf tinyxml # tinyxml2 -RUN git clone https://github.com/leethomason/tinyxml2.git -b '9.0.0' \ +RUN git clone https://github.com/leethomason/tinyxml2.git -b '10.0.0' \ && mkdir -p tinyxml2/build \ && cmake tinyxml2 -B tinyxml2/build -DCMAKE_BUILD_TYPE=Release -Dtinyxml2_BUILD_TESTING=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ && cmake --build tinyxml2/build --target install -j${NUM_CORES} \