Updating deps, adding NVCC flags

3 files changed, 22 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3308c7a34ca1..f211c3d2513a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = opencv-git
 	pkgdesc = Open Source Computer Vision Library
-	pkgver = 3.3.1.r184.gc3cced0f89
+	pkgver = 3.4.1.r410.g84b3b5b4a4
 	pkgrel = 1
 	url = https://opencv.org/
 	arch = i686
@@ -13,19 +13,23 @@ pkgbase = opencv-git
 	makedepends = mesa
 	makedepends = eigen
 	makedepends = hdf5
+	makedepends = lapacke
+	makedepends = gtkglext
 	depends = intel-tbb
 	depends = openexr
 	depends = xine-lib
 	depends = libdc1394
-	depends = gst-plugins-base-libs
-	depends = gtk3
-	depends = protobuf
+	depends = cblas
+	depends = lapack
+	depends = jasper
+	depends = libgphoto2
 	optdepends = opencv-samples
+	optdepends = gtkglext: for the HighGUI module
 	optdepends = hdf5: Support for HDF5 format
 	optdepends = opencl-icd-loader: For coding with OpenCL
 	optdepends = python-numpy: Python 3 interface
 	optdepends = python2-numpy: Python 2 interface
-	provides = opencv=3.3.1.r184.gc3cced0f89
+	provides = opencv=3.4.1.r410.g84b3b5b4a4
 	conflicts = opencv
 	source = git+https://github.com/opencv/opencv.git
 	source = git+https://github.com/opencv/opencv_contrib.git
diff --git a/.gitignore b/.gitignore
index 941a6ff1dc29..9ea1d6f9c5c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
 opencv/
+opencv_contrib/
+*.tar
+pkg/
+src/
diff --git a/PKGBUILD b/PKGBUILD
index 2192f53262d1..dd829a9e792f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,16 +12,16 @@
 
 _name=opencv
 pkgname="$_name-git"
-pkgver=3.3.1.r184.gc3cced0f89
+pkgver=3.4.1.r410.g84b3b5b4a4
 pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 url="https://opencv.org/"
 license=('BSD')
 arch=('i686' 'x86_64')
-depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gst-plugins-base-libs'
-         'gtk3' 'protobuf')
-makedepends=('git' 'cmake' 'python2-numpy' 'python-numpy' 'mesa' 'eigen' 'hdf5')
+depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'cblas' 'lapack' 'jasper' 'libgphoto2')
+makedepends=('git' 'cmake' 'python2-numpy' 'python-numpy' 'mesa' 'eigen' 'hdf5' 'lapacke' 'gtkglext')
 optdepends=('opencv-samples'
+            'gtkglext: for the HighGUI module'
             'hdf5: Support for HDF5 format'
             'opencl-icd-loader: For coding with OpenCL'
             'python-numpy: Python 3 interface'
@@ -44,10 +44,9 @@ _cmakeopts=('-DWITH_OPENCL=ON'
             '-DBUILD_EXAMPLES=ON'
             '-DINSTALL_C_EXAMPLES=ON'
             '-DINSTALL_PYTHON_EXAMPLES=ON'
-            '-DCMAKE_BUILD_TYPE=Release'
             '-DCMAKE_INSTALL_PREFIX=/usr'
-            '-DCMAKE_SKIP_RPATH=ON'
-            '-DCMAKE_INSTALL_LIBDIR=/usr/lib')
+            '-DCMAKE_INSTALL_LIBDIR=/usr/lib'
+            '-DCUDA_NVCC_FLAGS="--expt-relaxed-constexpr"')
 
 # SSE only available from Pentium 3 onwards (i686 is way older)
 [[ "$CARCH" = 'i686' ]] && _cmakeopts+=('-DCPU_BASELINE_DISABLE=SSE2')
@@ -64,6 +63,9 @@ build() {
 
     cmake "${_cmakeopts[@]}" \
           -DOPENCV_EXTRA_MODULES_PATH="$srcdir"/opencv_contrib/modules \
+          -DLAPACK_LIBRARIES="/usr/lib/liblapack.so;/usr/lib/libblas.so;/usr/lib/libcblas.so" \
+          -DLAPACK_CBLAS_H="/usr/include/cblas.h" \
+          -DLAPACK_LAPACKE_H="/usr/include/lapacke.h" \
           ../"$_name"
 
     make