Drop submoudle.patch, fix OpenGV Eigen find

4 files changed, 46 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2f5fe07aace8..e67271be5509 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -39,11 +39,11 @@ pkgbase = alice-vision-git
 	source = alice-vision-git::git+https://github.com/alicevision/AliceVision.git#branch=develop
 	source = ute_lib::git+https://github.com/alicevision/uncertaintyTE.git
 	source = geogram::git+https://github.com/alicevision/geogram.git
-	source = submodule.patch
+	source = FindOpenGV.cmake.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = ddbe76933cea0300b577095afa7459113a2d2ef02d4f300424261165ad9dee22
+	sha256sums = 2740fc6890a62f74367df357e132dc95bcd276528d828d51d66c4689e183ceec
 
 pkgname = alice-vision-git
 
diff --git a/FindOpenGV.cmake.patch b/FindOpenGV.cmake.patch
new file mode 100644
index 000000000000..75482462543e
--- /dev/null
+++ b/FindOpenGV.cmake.patch
@@ -0,0 +1,38 @@
+--- AliceVision-2.3.1-orig/src/cmake/FindOpenGV.cmake	2020-10-14 10:22:53.000000000 +0200
++++ AliceVision-2.3.1/src/cmake/FindOpenGV.cmake	2020-12-06 21:22:22.290072442 +0100
+@@ -25,19 +25,19 @@
+ 
+ IF(OPENGV_INCLUDE_DIR)
+   MESSAGE(STATUS "OpenGV headers found in ${OPENGV_INCLUDE_DIR}")
+-  IF(NOT EIGEN_FOUND)
+-    MESSAGE(STATUS "Looking for Eigen dependency...")
+-    FIND_PACKAGE(Eigen QUIET)
+-    IF(EIGEN_FOUND)
++  IF(NOT EIGEN3_FOUND)
++    MESSAGE(STATUS "Looking for Eigen3 dependency...")
++    FIND_PACKAGE(Eigen3 QUIET)
++    IF(EIGEN3_FOUND)
+         INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIRS})
+     ELSE()
+-      MESSAGE(WARNING "Couldn't find Eigen, this is needed for compiling with openGV")
++      MESSAGE(WARNING "Couldn't find Eigen3, this is needed for compiling with openGV")
+       # this is to make the find_package_handle_standard_args  fail
+       SET(OPENGV_INCLUDE_DIR "OPENGV_INCLUDE_DIR-NOTFOUND")
+-    ENDIF(EIGEN_FOUND)
+-  ELSE(NOT EIGEN_FOUND)
+-    MESSAGE(STATUS "Eigen already found")
+-  ENDIF(NOT EIGEN_FOUND)
++    ENDIF(EIGEN3_FOUND)
++  ELSE(NOT EIGEN3_FOUND)
++    MESSAGE(STATUS "Eigen3 already found")
++  ENDIF(NOT EIGEN3_FOUND)
+ ELSE(OPENGV_INCLUDE_DIR)
+   MESSAGE(STATUS "OpenGV headers not found!")
+ ENDIF(OPENGV_INCLUDE_DIR)
+@@ -63,4 +63,4 @@
+ find_package_handle_standard_args(OpenGV  DEFAULT_MSG
+                                   OPENGV_LIBRARY OPENGV_INCLUDE_DIR)
+ 
+-MARK_AS_ADVANCED(OPENGV_INCLUDE_DIR OPENGV_LIBRARY)
+\ Brak znaku nowej linii na końcu pliku
++MARK_AS_ADVANCED(OPENGV_INCLUDE_DIR OPENGV_LIBRARY)
diff --git a/PKGBUILD b/PKGBUILD
index 235b7473a8b8..316e104313db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,18 +28,20 @@ makedepends=('ninja' 'boost' 'eigen' 'freetype2' 'gflags' 'doxygen' 'python-sphi
 source=("${pkgname}::git+https://github.com/alicevision/AliceVision.git${_fragment}"
         "ute_lib::git+https://github.com/alicevision/uncertaintyTE.git"
         "geogram::git+https://github.com/alicevision/geogram.git"
-        "submodule.patch"
+        "FindOpenGV.cmake.patch"
         )
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
-            'ddbe76933cea0300b577095afa7459113a2d2ef02d4f300424261165ad9dee22')
+            '2740fc6890a62f74367df357e132dc95bcd276528d828d51d66c4689e183ceec')
+
 
 pkgver() {
   cd "${pkgname}"
   git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+
 prepare() {
 # shellcheck disable=SC2154 # mask $srcdir missing assignment.
   cd "${srcdir}/${pkgname}"
@@ -48,9 +50,10 @@ prepare() {
 #  git config submodule.src/dependencies/nanoflann.url
 #  git config submodule.src/dependencies/osi_clp.url
   git submodule update
-  git apply "${srcdir}/submodule.patch"
 # fix doc build
   sed -i '/^ *install.*doc/s/doc/htmlDoc/' src/CMakeLists.txt
+  #patch FindOpenGV.cmake to use Eigen3 instear of Eigen
+  patch -Np1 -i "$srcdir"/FindOpenGV.cmake.patch
 }
 
 
diff --git a/submodule.patch b/submodule.patch
deleted file mode 100644
index 6eefd18e0520..000000000000
--- a/submodule.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur orig/AliceVision-2.0.0/src/CMakeLists.txt AliceVision-2.0.0/src/CMakeLists.txt
---- orig/AliceVision-2.0.0/src/CMakeLists.txt	2018-08-09 15:35:45.000000000 +0200
-+++ AliceVision-2.0.0/src/CMakeLists.txt	2018-08-31 09:30:39.637939620 +0200
-@@ -142,15 +142,6 @@
- endmacro(add_target_properties)
- 
- # ==============================================================================
--# Check that submodule have been initialized and updated
--# ==============================================================================
--if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/CoinUtils)
--  message(FATAL_ERROR
--    "\n submodule(s) are missing, please update your repository:\n"
--    "  > git submodule update -i\n")
--endif()
--
--# ==============================================================================
- # Additional cmake find modules
- # ==============================================================================
- set(CMAKE_MODULE_PATH