From d5d32392226b53bb706ea06170627ebef9c8dca1 Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Thu, 28 Dec 2017 02:41:11 -0500
Subject: opencv-3.4.0-2.parabola1: updating version

---
 libre/opencv/PKGBUILD | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'libre/opencv/PKGBUILD')

diff --git a/libre/opencv/PKGBUILD b/libre/opencv/PKGBUILD
index 221542d5f..b1de0b31e 100644
--- a/libre/opencv/PKGBUILD
+++ b/libre/opencv/PKGBUILD
@@ -7,14 +7,14 @@
 
 pkgbase=opencv
 pkgname=opencv
-pkgver=3.3.1
-pkgrel=1.parabola1
+pkgver=3.4.0
+pkgrel=2.parabola1
 pkgdesc="Free Computer Vision Library, without nonfree SIFT and SURF algorithms, nonfree Milky icons and lena images"
 arch=('i686' 'x86_64' 'armv7h')
 license=('BSD')
 url="http://opencv.org/"
-depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext')
-makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen' 'hdf5')
+depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext' 'cblas' 'lapack' 'libgphoto2')
+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'
@@ -23,9 +23,9 @@ optdepends=('opencv-samples'
 mksource=("$pkgbase-$pkgver.zip::https://github.com/opencv/opencv/archive/$pkgver.zip"
           "opencv_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz")
 source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.zip")
-mksha256sums=('e59412c7e0d398113b1e454d600fcdff54cd77100a84483ac0d82bbf52496932'
-              '6f3ce148dc6e147496f0dbec1c99e917e13bf138f5a8ccfc3765f5c2372bd331')
-sha256sums=('9bf24efc68c82d211fdaff7ed9b007b1a49353d7e092658b51285d4a1d7f3b56')
+mksha256sums=('ae8a9f468b7ee3822a62d20d356c69f2b32330a231e738ac2914f332766611b7'
+              '699ab3eee7922fbd3e8f98c68e6d16a1d453b20ef364e76172e56466dc9c16cd')
+sha256sums=('624ac197cff564c4cae1cfdcc3a6a08e3b35511e9733c2552a9abd8621685fcd')
 
 _cmakeopts=('-D WITH_OPENCL=ON'
             '-D WITH_OPENGL=ON'
@@ -40,6 +40,7 @@ _cmakeopts=('-D WITH_OPENCL=ON'
             '-D INSTALL_PYTHON_EXAMPLES=ON'
             '-D CMAKE_BUILD_TYPE=Release'
             '-D CMAKE_INSTALL_PREFIX=/usr'
+            '-D CMAKE_INSTALL_LIBDIR=lib'
             '-D CMAKE_SKIP_RPATH=ON'
             '-D WITH_IPP=OFF'
             #'-D INSTALL_CREATE_DISTRIB=ON'
@@ -47,10 +48,8 @@ _cmakeopts=('-D WITH_OPENCL=ON'
 
 # SSE only available from Pentium 3 onwards (i686 is way older)
 # SSE only available x86 hardware and ARM uses NEON
-[[ "$CARCH" = 'i686' || "$CARCH" = 'armv7h' ]] && \
-  _cmakeopts+=('-D ENABLE_SSE=OFF'
-               '-D ENABLE_SSE2=OFF'
-               '-D ENABLE_SSE3=OFF')
+[[ "$CARCH" = 'i686' ]] && _cmakeopts+=('-D CPU_BASELINE_DISABLE=SSE2')
+[[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D CPU_BASELINE_DISABLE=SSE3 -D CPU_BASELINE_REQUIRE=SSE2')
 
 mksource() {
   cd "$srcdir/opencv_contrib-$pkgver"
@@ -78,10 +77,13 @@ 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
 }
 
@@ -89,7 +91,6 @@ package_opencv() {
   options=('staticlibs')
 
   cd build
-
   make DESTDIR="$pkgdir" install
 
   # install license file
-- 
cgit v1.2.3