From a3b51d7c8b2f38e2612544a2683ccc2d7c25d033 Mon Sep 17 00:00:00 2001
From: edgarriba <edgar.riba@gmail.com>
Date: Tue, 22 Dec 2015 13:29:13 +0100
Subject: [PATCH] fix install errors with hash numbers

Former-commit-id: cf3ab0fe9998249d489abb3ab3ca43b05c5403ea
---
 SuperBuild/cmake/External-CMVS.cmake   |  2 +-
 SuperBuild/cmake/External-Ecto.cmake   |  8 +++-----
 SuperBuild/cmake/External-GFlags.cmake |  6 +++---
 SuperBuild/cmake/External-OpenCV.cmake |  1 +
 configure.sh                           | 10 +++++++---
 run.py                                 |  8 ++++----
 6 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/SuperBuild/cmake/External-CMVS.cmake b/SuperBuild/cmake/External-CMVS.cmake
index 75f74147..a58beb5f 100644
--- a/SuperBuild/cmake/External-CMVS.cmake
+++ b/SuperBuild/cmake/External-CMVS.cmake
@@ -6,7 +6,7 @@ ExternalProject_Add(${_proj_name}
   TMP_DIR           ${_SB_BINARY_DIR}/tmp
   STAMP_DIR         ${_SB_BINARY_DIR}/stamp
   #--Download step--------------
-  DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}
+  DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}/${_proj_name}
   URL               https://github.com/edgarriba/CMVS-PMVS/archive/master.zip
   URL_MD5           dbb1493f49ca099b4208381bd20d1435
   #--Update/Patch step----------
diff --git a/SuperBuild/cmake/External-Ecto.cmake b/SuperBuild/cmake/External-Ecto.cmake
index 2da6e17d..41c33e1a 100644
--- a/SuperBuild/cmake/External-Ecto.cmake
+++ b/SuperBuild/cmake/External-Ecto.cmake
@@ -7,11 +7,9 @@ ExternalProject_Add(${_proj_name}
   TMP_DIR           ${_SB_BINARY_DIR}/tmp
   STAMP_DIR         ${_SB_BINARY_DIR}/stamp
   #--Download step--------------
-  DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}
-  #URL               https://github.com/plasmodic/ecto/archive/master.zip
-  #URL_MD5           0f482403dc2abeb08341b4cf45edf020
-  URL               https://github.com/edgarriba/ecto/archive/master.zip
-  URL_MD5           dede524b9c3aece70e788c5d619c6e52
+  DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}/${_proj_name}
+  URL               https://github.com/plasmodic/ecto/archive/master.zip
+  URL_MD5           8cd70c525bcda99d9eba5ac2865e42dd
   #--Update/Patch step----------
   UPDATE_COMMAND    ""
   #--Configure step-------------
diff --git a/SuperBuild/cmake/External-GFlags.cmake b/SuperBuild/cmake/External-GFlags.cmake
index 64ff1159..2c9b2679 100644
--- a/SuperBuild/cmake/External-GFlags.cmake
+++ b/SuperBuild/cmake/External-GFlags.cmake
@@ -7,8 +7,8 @@ ExternalProject_Add(${_proj_name}
   STAMP_DIR         ${_SB_BINARY_DIR}/stamp
   #--Download step--------------
   DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}
-  URL               https://github.com/gflags/gflags/archive/master.zip
-  URL_MD5           d57049ed25d3921549315f2d2ee8ee49
+  URL               https://github.com/gflags/gflags/archive/v2.1.2.zip
+  URL_MD5           5cb0a1b38740ed596edb7f86cd5b3bd8
   #--Update/Patch step----------
   UPDATE_COMMAND    ""
   #--Configure step-------------
@@ -24,4 +24,4 @@ ExternalProject_Add(${_proj_name}
   LOG_DOWNLOAD      OFF
   LOG_CONFIGURE     OFF
   LOG_BUILD         OFF
-)
\ No newline at end of file
+)
diff --git a/SuperBuild/cmake/External-OpenCV.cmake b/SuperBuild/cmake/External-OpenCV.cmake
index 92b2c10e..1ca96e61 100644
--- a/SuperBuild/cmake/External-OpenCV.cmake
+++ b/SuperBuild/cmake/External-OpenCV.cmake
@@ -27,6 +27,7 @@ ExternalProject_Add(${_proj_name}
     -DBUILD_opencv_photo=ON
     -DBUILD_opencv_legacy=ON
     -DBUILD_opencv_python=ON
+    -DWITH_FFMPEG=OFF
     -DWITH_CUDA=OFF
     -DWITH_GTK=OFF
     -DWITH_VTK=OFF
diff --git a/configure.sh b/configure.sh
index 08b9d7a6..641bf744 100644
--- a/configure.sh
+++ b/configure.sh
@@ -67,7 +67,11 @@ echo -e "\e[1;34mInstalling OpenSfM Dependencies\e[0;39m"
 sudo apt-get install python-networkx \
                      libgoogle-glog-dev \
                      libsuitesparse-dev \
-                     libboost-all-dev \
+                     libboost-filesystem1.55-dev \
+                     libboost-iostreams1.55-dev \
+                     libboost-regex1.55-dev \
+                     libboost-python1.55-dev \
+                     #libboost1.55-all-dev \
                      libboost-python-dev -y
 
 sudo pip install -U PyYAML \
@@ -82,7 +86,7 @@ fi
 
 ## Installing Ecto Requisites
 echo -e "\e[1;34mInstalling Ecto Dependencies\e[0;39m"
-sudo pip install catkin-pkg
+sudo pip install -U catkin-pkg
 sudo apt-get install python-empy \
                      python-nose \
                      python-pyside -y
@@ -115,4 +119,4 @@ cd SuperBuild
 mkdir -p build && cd build
 cmake .. && make -j ${NUM_CORES}
 
-echo -e "\e[1;34mScript finished\e[0;39m"
+echo -e "\e[1;34mScript finished\e[0;39m"
\ No newline at end of file
diff --git a/run.py b/run.py
index d3eb5a95..77777d21 100644
--- a/run.py
+++ b/run.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python
 
+from opendm import log
+from opendm import config
+from opendm import system
+
 import sys
 import ecto
 
 from scripts.odm_app import ODMApp
 
-from opendm import log
-from opendm import config
-from opendm import system
-
 def usage():
 	log.ODM_ERROR('USAGE: %s --project-path [project_path]' % sys.argv[0])
  	log.ODM_ERROR('OpenDroneMap app finished - %s' % system.now())