Docker: upgraded alicevision version 2.4.0 in bionic/focal images

This commit is contained in:
matlabbe
2021-09-19 20:42:56 -04:00
parent 14b56813d3
commit 8f12463f71
2 changed files with 30 additions and 26 deletions
+13 -11
View File
@@ -38,7 +38,7 @@ RUN cd libpointmatcher && \
cd && \
rm -r libpointmatcher
# AliceVision
# AliceVision v2.4.0 modified (Sept 13 2021)
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
libsuitesparse-dev \
libceres-dev \
@@ -50,24 +50,26 @@ RUN cd oiio && \
git checkout Release-2.0.12 && \
mkdir build && \
cd build && \
cmake .. && \
cmake -DUSE_PYTHON=OFF -DOIIO_BUILD_TESTS=OFF -DOIIO_BUILD_TOOLS=OFF .. && \
make -j$(nproc) && \
make install && \
cd && \
rm -r oiio
RUN git clone https://github.com/alembic/alembic.git
RUN cd alembic && \
git checkout 1.7.12 && \
RUN git clone https://github.com/assimp/assimp.git
RUN cd assimp && \
git checkout 71a87b653cd4b5671104fe49e2e38cf5dd4d8675 && \
mkdir build && \
cd build && \
cmake .. && \
make -j$(nproc) && \
make install && \
cd && \
rm -r alembic
rm -r assimp
RUN git clone https://github.com/alicevision/geogram.git
RUN cd geogram && \
git checkout v1.7.1 && \
git checkout v1.7.6 && \
wget https://gist.githubusercontent.com/matlabbe/1df724465106c056ca4cc195c81d8cf0/raw/346304b279c3e9dd59e75dd31155eb1aff91785e/geogram_8b2ae61.patch && \
git apply geogram_8b2ae61.patch && \
./configure.sh && \
cd build/Linux64-gcc-dynamic-Release && \
make -j$(nproc) && \
@@ -76,12 +78,12 @@ RUN cd geogram && \
rm -r geogram
RUN git clone https://github.com/alicevision/AliceVision.git --recursive
RUN cd AliceVision && \
git checkout v2.2.0 && \
wget https://gist.githubusercontent.com/matlabbe/469bba5e7733ad6f2e3d7857b84f1f9e/raw/edaa88ed38344219af1cc919a5597f5a74445336/alice_vision_eigen.patch && \
git apply alice_vision_eigen.patch && \
git checkout 0f6115b6af6183c524aa7fcf26141337c1cf3872 && \
wget https://gist.githubusercontent.com/matlabbe/1df724465106c056ca4cc195c81d8cf0/raw/346304b279c3e9dd59e75dd31155eb1aff91785e/alicevision_0f6115b.patch && \
git apply alicevision_0f6115b.patch && \
mkdir build && \
cd build && \
cmake -DALICEVISION_USE_CUDA=OFF .. && \
cmake -DALICEVISION_USE_CUDA=OFF -DALICEVISION_USE_APRILTAG=OFF -DALICEVISION_BUILD_SOFTWARE=OFF .. && \
make -j$(nproc) && \
make install && \
cd && \