extra/opencv to 3.3.1-3

extra/opencv/PKGBUILD

@@ -9,15 +9,15 @@
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 pkgver=3.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Source Computer Vision Library"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('BSD')
 url="http://opencv.org/"
-depends=('openexr' 'xine-lib' 'libdc1394' 'gtkglext' 'protobuf')
+depends=('openexr' 'xine-lib' 'libdc1394' 'gtkglext' 'protobuf' 'cblas' 'lapack')
 depends_armv7h=('intel-tbb')
 depends_aarch64=('intel-tbb')
-makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen' 'hdf5')
+makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen' 'hdf5' 'lapacke')
 optdepends=('opencv-samples'
             'hdf5: support for HDF5 format'
             'opencl-icd-loader: For coding with OpenCL'
@@ -46,26 +46,23 @@ _cmakeopts=('-D WITH_OPENCL=ON'
             #'-D INSTALL_CREATE_DISTRIB=ON'
             )
 
-# SSE only available from Pentium 3 onwards (i686 is way older)
-[[ "$CARCH" = 'i686' ]] && _cmakeopts+=('-D CPU_BASELINE_DISABLE=SSE2')
-[[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D CPU_BASELINE_DISABLE=SSE3 -D CPU_BASELINE_REQUIRE=SSE2')
-
 build() {
   mkdir -p build
 
   cd build
+  # cmake's FindLAPACK doesn't add cblas to LAPACK_LIBRARIES, so we need to specify them manually
   cmake ${_cmakeopts[@]} \
     -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/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" \
     ../$pkgname-$pkgver
-
-  make
 }
 
 package_opencv() {
   options=('staticlibs')
 
   cd build
-
   make DESTDIR="$pkgdir" install
 
   # install license file