fix missing lz4 linker flag till flann gets patched

5 files changed, 5 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 35bda14ad01d..fe380826beb4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openmvg-git
 	pkgdesc = open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.
 	pkgver = 1.3.r76.gd9563130
-	pkgrel = 6
+	pkgrel = 7
 	url = http://imagine.enpc.fr/~moulonp/openMVG/
 	arch = i686
 	arch = x86_64
@@ -37,7 +37,7 @@ pkgbase = openmvg-git
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = 11aa728e50e52b10d79dd83dfaa6c1c6
-	md5sums = 91ba746a3740379d71dad4be34a9c44d
+	md5sums = f421cb25208a4f95784035d9823abe04
 
 pkgname = openmvg-git
 
diff --git a/PKGBUILD b/PKGBUILD
index ebefcaa77ab6..2ea15d2c73d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=openmvg-git
 _gitname='openMVG'
 _fragment="#branch=develop"
 pkgver=1.3.r76.gd9563130
-pkgrel=6
+pkgrel=7
 pkgdesc='open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.'
 arch=('i686' 'x86_64')
 url='http://imagine.enpc.fr/~moulonp/openMVG/'
@@ -23,7 +23,7 @@ md5sums=('SKIP'
          'SKIP'
          'SKIP'
          '11aa728e50e52b10d79dd83dfaa6c1c6'
-         '91ba746a3740379d71dad4be34a9c44d')
+         'f421cb25208a4f95784035d9823abe04')
 
 pkgver() {
   cd "${srcdir}/${_gitname}"
diff --git a/fast.patch b/fast.patch
deleted file mode 100644
index 344ba71f1b7d..000000000000
--- a/fast.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/software/VO/AlternativeVO/CMakeLists.txt b/src/software/VO/AlternativeVO/CMakeLists.txt
-index c8bdafb2..d431fca4 100644
---- a/src/software/VO/AlternativeVO/CMakeLists.txt
-+++ b/src/software/VO/AlternativeVO/CMakeLists.txt
-@@ -21,7 +21,7 @@ if ( OpenMVG_BUILD_GUI_SOFTWARES )
-       endif( WIN32 )
-     endif( APPLE )
- 
--    target_link_libraries( openMVG_main_AlternativeVO Qt5::Widgets openMVG_image openMVG_features stlplus )
-+    target_link_libraries( openMVG_main_AlternativeVO Qt5::Widgets openMVG_image openMVG_features stlplus fast )
- 
-     if ( OpenMVG_USE_OPENCV )
-       target_link_libraries( openMVG_main_AlternativeVO ${OpenCV_LIBS} )
-diff --git a/src/software/VO/CMakeLists.txt b/src/software/VO/CMakeLists.txt
-index ac5f0aea..ac715d7e 100644
---- a/src/software/VO/CMakeLists.txt
-+++ b/src/software/VO/CMakeLists.txt
-@@ -37,6 +37,7 @@ if (OpenMVG_BUILD_OPENGL_EXAMPLES)
-   target_link_libraries(openMVG_main_VO
-     ${OPENGL_gl_LIBRARY}
-     glfw
-+    fast
-     ${GLFW_LIBRARIES}
-     ${OpenMVG_LIBRARIES}
-   )
diff --git a/findflann-v0.1.patch b/findflann-v0.1.patch
index df9fb11c4c3e..bd9f2e94440f 100644
--- a/findflann-v0.1.patch
+++ b/findflann-v0.1.patch
@@ -77,7 +77,7 @@ index 41e74a1d..06e897b1 100644
 +      HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS})
 +
 +  set(FLANN_INCLUDE_DIRS ${FLANN_INCLUDE_DIR})
-+  set(FLANN_LIBRARIES  ${PC_FLANN_LIBRARIES})
++  set(FLANN_LIBRARIES  ${PC_FLANN_LIBRARIES};lz4)
 +  set(FLANN_VERSION ${PC_FLANN_VERSION})
 +
 +  include(FindPackageHandleStandardArgs)
diff --git a/flann.patch b/flann.patch
deleted file mode 100644
index 529b190ecc2a..000000000000
--- a/flann.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/openMVG/matching/CMakeLists.txt b/src/openMVG/matching/CMakeLists.txt
-index 33cc6dd8..0d0660b8 100644
---- a/src/openMVG/matching/CMakeLists.txt
-+++ b/src/openMVG/matching/CMakeLists.txt
-@@ -39,7 +39,7 @@ target_link_libraries(openMVG_matching
- if (NOT DEFINED OpenMVG_USE_INTERNAL_FLANN)
- target_link_libraries(openMVG_matching
-   PUBLIC
--    ${FLANN_LIBRARIES}
-+    ${PC_FLANN_LIBRARIES}
- )
- endif()
- set_target_properties(openMVG_matching PROPERTIES SOVERSION ${OPENMVG_VERSION_MAJOR} VERSION "${OPENMVG_VERSION_MAJOR}.${OPENMVG_VERSION_MINOR}")