odm_meshing_error.patch

From b51ab05f476a55e2ea387f13391dd925b7e4c8f6 Mon Sep 17 00:00:00 2001
From: Ubuntu <ubuntu@ubuntu-yakkety.localdomain>
Date: Mon, 28 Aug 2017 19:17:50 +0000
Subject: [PATCH] Update Ecto and OpenCV and temp remove cmvs

Committer: Dakota Benjamin <dakota.benjamin@gmail.com>
---
 SuperBuild/CMakeLists.txt              |  2 +-
 SuperBuild/cmake/External-Ecto.cmake   |  5 +++--
 SuperBuild/cmake/External-OpenCV.cmake |  5 +++--
 configure.sh                           | 15 +++++++++------
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt
index 453c3fb..5c0e417 100644
--- a/SuperBuild/CMakeLists.txt
+++ b/SuperBuild/CMakeLists.txt
@@ -113,7 +113,7 @@ SETUP_EXTERNAL_PROJECT(Hexer 1.4 ON)

 set(custom_libs OpenGV
                                OpenSfM
-                               CMVS
+                               # CMVS
                                Catkin
                                Ecto
                                PDAL
diff --git a/SuperBuild/cmake/External-Ecto.cmake b/SuperBuild/cmake/External-Ecto.cmake
index e031cb8..8bd74ee 100644
--- a/SuperBuild/cmake/External-Ecto.cmake
+++ b/SuperBuild/cmake/External-Ecto.cmake
@@ -8,8 +8,9 @@ ExternalProject_Add(${_proj_name}
   STAMP_DIR         ${_SB_BINARY_DIR}/stamp
   #--Download step--------------
   DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}/${_proj_name}
-  URL               https://github.com/plasmodic/ecto/archive/c6178ed0102a66cebf503a4213c27b0f60cfca69.zip
-  URL_MD5           A5C4757B656D536D3E3CC1DC240EC158
+  URL               https://github.com/plasmodic/ecto/archive/0.6.12.zip
+  # URL               https://github.com/plasmodic/ecto/archive/c6178ed0102a66cebf503a4213c27b0f60cfca69.zip
+  # URL_MD5           A5C4757B656D536D3E3CC1DC240EC158
   #--Update/Patch step----------
   UPDATE_COMMAND    ""
   #--Configure step-------------
diff --git a/SuperBuild/cmake/External-OpenCV.cmake b/SuperBuild/cmake/External-OpenCV.cmake
index 232059c..1b12afc 100644
--- a/SuperBuild/cmake/External-OpenCV.cmake
+++ b/SuperBuild/cmake/External-OpenCV.cmake
@@ -7,13 +7,14 @@ ExternalProject_Add(${_proj_name}
   STAMP_DIR         ${_SB_BINARY_DIR}/stamp
   #--Download step--------------
   DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}
-  URL               https://github.com/Itseez/opencv/archive/2.4.11.zip
-  URL_MD5           b517e83489c709eee1d8be76b16976a7
+  URL               https://github.com/opencv/opencv/archive/2.4.13.3.zip
+  #URL_MD5           b517e83489c709eee1d8be76b16976a7
   #--Update/Patch step----------
   UPDATE_COMMAND    ""
   #--Configure step-------------
   SOURCE_DIR        ${SB_SOURCE_DIR}/${_proj_name}
   CMAKE_ARGS
+    -DENABLE_PRECOMPILED_HEADERS=OFF
     -DBUILD_opencv_core=ON
     -DBUILD_opencv_imgproc=ON
     -DBUILD_opencv_highgui=ON
diff --git a/configure.sh b/configure.sh
index 11b833f..7e2d232 100755
--- a/configure.sh
+++ b/configure.sh
@@ -6,12 +6,20 @@ install() {
     export PYTHONPATH=$RUNPATH/SuperBuild/install/lib/python2.7/dist-packages:$RUNPATH/SuperBuild/src/opensfm:$PYTHONPATH
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RUNPATH/SuperBuild/install/lib

+    os_version= echo $(lsb_release -sr)
+
     ## Before installing
     echo "Updating the system"
     sudo apt-get update

+    if [["$os_version" == *1[46].04* ]]; then
     sudo add-apt-repository -y ppa:ubuntugis/ppa
-    sudo apt-get update
+    echo "Getting CMake 3.1 for MVS-Texturing"
+    sudo apt-get install -y software-properties-common python-software-properties
+    sudo add-apt-repository -y ppa:george-edison55/cmake-3.x
+    sudo apt-get update -y
+    sudo apt-get install -y --only-upgrade cmake
+    fi

     echo "Installing Required Requisites"
     sudo apt-get install -y -qq build-essential \
@@ -24,11 +32,6 @@ install() {
                          pkg-config \
                          libjsoncpp-dev

-    echo "Getting CMake 3.1 for MVS-Texturing"
-    sudo apt-get install -y software-properties-common python-software-properties
-    sudo add-apt-repository -y ppa:george-edison55/cmake-3.x
-    sudo apt-get update -y
-    sudo apt-get install -y --only-upgrade cmake

     echo "Installing OpenCV Dependencies"
     sudo apt-get install -y -qq libgtk2.0-dev \
--
2.9.3