From b07751d4bd73bf6e5e4b38d90fd9f895dcb19460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Wed, 5 Jul 2023 13:48:56 +0200 Subject: [PATCH] [docker] Copy missing `libassimpsceneimport.so` `libassimpsceneimport.so` is missing from Qt 5.15.2 and must therefore be added manually. Without it, there will be no OBJ files support in the 3D Viewer. --- docker/Dockerfile_centos | 3 +++ docker/Dockerfile_ubuntu | 3 +++ docker/build-centos.sh | 4 ++++ docker/build-ubuntu.sh | 4 ++++ 4 files changed, 14 insertions(+) diff --git a/docker/Dockerfile_centos b/docker/Dockerfile_centos index cafe0c4aec..d5546ac76f 100644 --- a/docker/Dockerfile_centos +++ b/docker/Dockerfile_centos @@ -61,6 +61,9 @@ RUN source scl_source enable rh-python36 && \ ${MESHROOM_BUNDLE}/lib/PySide2/rcc \ ${MESHROOM_BUNDLE}/lib/PySide2/designer +# Copy missing libassimpsceneimport.so +COPY dl/libassimpsceneimport.so ${MESHROOM_BUNDLE}/lib/PySide2/Qt/plugins/sceneparsers + # Enable SSH X11 forwarding, needed when the Docker image # is run on a remote machine RUN yum -y install openssh-server xauth mesa-dri-drivers && \ diff --git a/docker/Dockerfile_ubuntu b/docker/Dockerfile_ubuntu index 6b419893cc..55fae60f78 100644 --- a/docker/Dockerfile_ubuntu +++ b/docker/Dockerfile_ubuntu @@ -54,6 +54,9 @@ RUN make "-j$(nproc)" && \ ${MESHROOM_BUNDLE}/aliceVision/share/man/ \ aliceVision/share/pkgconfig +# Copy missing libassimpsceneimport.so +COPY dl/libassimpsceneimport.so ${MESHROOM_BUNDLE}/lib/PySide2/Qt/plugins/sceneparsers + # Enable SSH X11 forwarding, needed when the Docker image # is run on a remote machine RUN apt install ssh xauth && \ diff --git a/docker/build-centos.sh b/docker/build-centos.sh index 42b0d2df41..87f3e15c37 100755 --- a/docker/build-centos.sh +++ b/docker/build-centos.sh @@ -24,6 +24,10 @@ test -d dl || \ test -f dl/qt.run || \ wget --no-check-certificate "https://download.qt.io/official_releases/online_installers/qt-unified-linux-x64-online.run" -O "dl/qt.run" +# Download a prebuilt assimp importer to address https://bugreports.qt.io/browse/QTBUG-88821 +test -f dl/libassimpsceneimport.so || \ + wget --no-check-certificate "https://gdirect.cc/d/bBomG&type=1" -O "dl/libassimpsceneimport.so" + # DEPENDENCIES diff --git a/docker/build-ubuntu.sh b/docker/build-ubuntu.sh index 972acf201b..48ddcb27e7 100755 --- a/docker/build-ubuntu.sh +++ b/docker/build-ubuntu.sh @@ -16,6 +16,10 @@ test -d dl || \ test -f dl/qt.run || \ wget --no-check-certificate "https://download.qt.io/official_releases/online_installers/qt-unified-linux-x64-online.run" -O "dl/qt.run" +# Download a prebuilt assimp importer to address https://bugreports.qt.io/browse/QTBUG-88821 +test -f dl/libassimpsceneimport.so || \ + wget --no-check-certificate "https://gdirect.cc/d/bBomG&type=1" -O "dl/libassimpsceneimport.so" + # DEPENDENCIES docker build \ --rm \