From d78c42db4d1c3b4da485708a55e90ce84b2c59b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Vital?= <mugulmotion@gmail.com>
Date: Fri, 2 Dec 2022 10:47:05 +0100
Subject: [PATCH] remove references to qtOIIO plugin in build and install
 process

---
 CMakeLists.txt                | 17 -----------------
 COPYING.md                    |  5 -----
 INSTALL.md                    |  8 --------
 docker/Dockerfile_centos      |  2 --
 docker/Dockerfile_ubuntu      |  1 -
 docker/Dockerfile_ubuntu_deps |  9 ---------
 6 files changed, 42 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2625faa6..0125abf7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,6 @@ endif()
 set(ALICEVISION_ROOT "$ENV{ALICEVISION_ROOT}" CACHE STRING "AliceVision root dir")
 set(QT_DIR "$ENV{QT_DIR}" CACHE STRING "Qt root directory")
 
-option(MR_BUILD_QTOIIO "Enable building of QtOIIO plugin" ON)
 option(MR_BUILD_QMLALEMBIC "Enable building of qmlAlembic plugin" ON)
 option(MR_BUILD_QTALICEVISION "Enable building of qtAliceVision plugin" ON)
 
@@ -43,22 +42,6 @@ include(GNUInstallDirs)
 
 # message(STATUS "QT_CMAKE_FLAGS: ${QT_CMAKE_FLAGS}")
 
-if(MR_BUILD_QTOIIO)
-set(QTOIIO_TARGET qtOIIO)
-ExternalProject_Add(${QTOIIO_TARGET}
-      GIT_REPOSITORY https://github.com/alicevision/QtOIIO
-      GIT_TAG develop
-      PREFIX ${BUILD_DIR}
-      BUILD_IN_SOURCE 0
-      BUILD_ALWAYS 0
-      SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/qtoiio
-      BINARY_DIR ${BUILD_DIR}/qtoiio_build
-      INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
-      CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} ${OIIO_CMAKE_FLAGS} -DCMAKE_PREFIX_PATH:PATH=${QT_DIR} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> <SOURCE_DIR>
-      )
-endif()
-
-
 if(MR_BUILD_QMLALEMBIC)
 set(QMLALEMBIC_TARGET qmlAlembic)
 ExternalProject_Add(${QMLALEMBIC_TARGET}
diff --git a/COPYING.md b/COPYING.md
index 41257d24..078d4863 100644
--- a/COPYING.md
+++ b/COPYING.md
@@ -24,8 +24,3 @@ Meshroom is licensed under the [MPL2 license](LICENSE-MPL2.md).
    [https://github.com/alicevision/qmlAlembic](https://github.com/alicevision/qmlAlembic)  
    Copyright (c) 2018 AliceVision contributors.  
    Distributed under the [MPL2 license](https://opensource.org/licenses/MPL-2.0).
-
-  * __QtOIIO__  
-   [https://github.com/alicevision/QtOIIO](https://github.com/alicevision/QtOIIO)  
-   Copyright (c) 2018 AliceVision contributors.  
-   Distributed under the [MPL2 license](https://opensource.org/licenses/MPL-2.0).  
diff --git a/INSTALL.md b/INSTALL.md
index a8d15e75..9b63d41b 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -48,14 +48,6 @@ Adds support for Alembic file loading in Meshroom's 3D viewport. Allows to visua
 QML2_IMPORT_PATH=/path/to/qmlAlembic/install/qml
 ```
 
-#### [QtOIIO](https://github.com/alicevision/QtOIIO)
-Use OpenImageIO as backend to load images in Qt. Allow to visualize RAW/EXR images in Meshroom.
-This plugin also provides a QML Qt3D Entity to load depthmaps files stored in EXR format.
-```
-QT_PLUGIN_PATH=/path/to/QtOIIO/install
-QML2_IMPORT_PATH=/path/to/QtOIIO/install/qml
-```
-
 #### [QtAliceVision](https://github.com/alicevision/QtAliceVision)
 Use AliceVision to load and visualize intermediate reconstruction files.
 ```
diff --git a/docker/Dockerfile_centos b/docker/Dockerfile_centos
index 3d802072..eca07e42 100644
--- a/docker/Dockerfile_centos
+++ b/docker/Dockerfile_centos
@@ -42,8 +42,6 @@ WORKDIR ${MESHROOM_BUILD}
 
 # Build Meshroom plugins
 RUN cmake "${MESHROOM_DEV}" -DALICEVISION_ROOT="${AV_INSTALL}" -DCMAKE_INSTALL_PREFIX="${MESHROOM_BUNDLE}/qtPlugins"
-RUN make "-j$(nproc)" qtOIIO
-
 RUN make "-j$(nproc)" qmlAlembic
 RUN make "-j$(nproc)" qtAliceVision
 RUN make "-j$(nproc)" && \
diff --git a/docker/Dockerfile_ubuntu b/docker/Dockerfile_ubuntu
index 3312c5df..92f55e91 100644
--- a/docker/Dockerfile_ubuntu
+++ b/docker/Dockerfile_ubuntu
@@ -42,7 +42,6 @@ WORKDIR ${MESHROOM_BUILD}
 
 # Build Meshroom plugins
 RUN cmake "${MESHROOM_DEV}" -DALICEVISION_ROOT="${AV_INSTALL}" -DCMAKE_INSTALL_PREFIX="${MESHROOM_BUNDLE}/qtPlugins"
-RUN make "-j$(nproc)" qtOIIO
 RUN make "-j$(nproc)" qmlAlembic
 RUN make "-j$(nproc)" qtAliceVision
 RUN make "-j$(nproc)" && \
diff --git a/docker/Dockerfile_ubuntu_deps b/docker/Dockerfile_ubuntu_deps
index 7c775f7c..3d4402c4 100644
--- a/docker/Dockerfile_ubuntu_deps
+++ b/docker/Dockerfile_ubuntu_deps
@@ -42,15 +42,6 @@ RUN apt-get update && \
 	libz-dev \
 	systemd \
 	ssh
-
-# Disabled as QTOIIO requires ah least 5.13 (5.12 available in Ubuntu 20.04)
-#	qtdeclarative5-dev \
-#	qt3d-assimpsceneimport-plugin \
-#	qt3d-defaultgeometryloader-plugin \
-#	qt3d-gltfsceneio-plugin \
-#	qt3d-scene2d-plugin \
-#	qt53dextras5 \
-#	qt3d5-dev 
 	
 
 RUN apt-get install -y --no-install-recommends \