opencv-3.4.2-1.parabola1: updating version

1 files changed, 41 insertions, 41 deletions

diff --git a/libre/opencv/PKGBUILD b/libre/opencv/PKGBUILD
index a3d5fb532..9f9f92fe2 100644
--- a/libre/opencv/PKGBUILD
+++ b/libre/opencv/PKGBUILD
@@ -7,16 +7,16 @@
 
 pkgbase=opencv
 pkgname=opencv
-pkgver=3.4.1
-pkgrel=3.parabola1
+pkgver=3.4.2
+pkgrel=1.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')
+arch=(i686 x86_64 armv7h)
+license=(BSD)
 url="http://opencv.org/"
-depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'cblas' 'lapack' 'libgphoto2' 'jasper')
-makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen' 'hdf5' 'lapacke' 'gtkglext')
-optdepends=('opencv-samples'
-            'gtkglext: for the HighGUI module'
+depends=(intel-tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2 jasper)
+makedepends=(cmake python-numpy python2-numpy mesa eigen hdf5 lapacke gtk3)
+optdepends=('opencv-samples: samples'
+            'gtk3: for the HighGUI module'
             'hdf5: support for HDF5 format'
             'opencl-icd-loader: For coding with OpenCL'
             'python-numpy: Python 3 interface'
@@ -24,30 +24,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=('24bda432eaace9e992322dcc3d30144cefa5314c2424d4aa02e5fe3fa9dd17bd'
-              '298c69ee006d7675e1ff9d371ba8b0d9e7e88374bb7ba0f9d0789851d352ec6e')
-sha256sums=('e5b34f29622d044e07163ed8d806bce5ff208531c1cdd5be24a9ec0255633396')
-
-_cmakeopts=('-D WITH_OPENCL=ON'
-            '-D WITH_OPENGL=ON'
-            '-D WITH_TBB=ON'
-            '-D WITH_XINE=ON'
-            '-D WITH_GSTREAMER=OFF'
-            '-D BUILD_WITH_DEBUG_INFO=OFF'
-            '-D BUILD_TESTS=OFF'
-            '-D BUILD_PERF_TESTS=OFF'
-            '-D BUILD_EXAMPLES=ON'
-            '-D INSTALL_C_EXAMPLES=ON'
-            '-D INSTALL_PYTHON_EXAMPLES=ON'
-            '-D CMAKE_INSTALL_PREFIX=/usr'
-            '-D CMAKE_INSTALL_LIBDIR=lib'
-            '-D WITH_IPP=OFF'
-            )
-
-# SSE only available from Pentium 3 onwards (i686 is way older)
-# SSE only available x86 hardware and ARM uses NEON
-[[ "$CARCH" = 'i686' ]] && _cmakeopts+=('-D CPU_BASELINE_DISABLE="SSE SSE2"')
-[[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D CPU_BASELINE_DISABLE=SSE3 -D CPU_BASELINE_REQUIRE=SSE2')
+mksha256sums=('9405c5d7d8ab1696e98631d0c92125816356ec366a73c417bdcc4d74783b42aa'
+              '45a52764ebd2558fa0b7fd8dc47379b37dd0956d912abbf7c786228374fdf60d')
+sha256sums=('6641b8631f81852e6715c3a98e89963e90847d36d941cb809c816b0debdfa1f6')
 
 mksource() {
   cd "$srcdir/opencv_contrib-$pkgver"
@@ -69,33 +48,54 @@ prepare() {
 
   # remove nonfree SIFT and SURF references
   rm -rv modules/xfeatures2d
+
+  mkdir -p ../build
 }
 
 build() {
-  mkdir -p build
-
   cd build
+
+  # SSE only available from Pentium 3 onwards (i686 is way older)
+  # SSE only available x86 hardware and ARM uses NEON
+  case "$CARCH" in
+    i686) extra='-DCPU_BASELINE_DISABLE=SSE,SSE2' ;;
+    x86_64) extra='-DCPU_BASELINE_DISABLE=SSE3 -DCPU_BASELINE_REQUIRE=SSE2' ;;
+    *) extra='' ;;
+  esac
+
   # cmake's FindLAPACK doesn't add cblas to LAPACK_LIBRARIES, so we need to specify them manually
-  cmake ${_cmakeopts[@]} \
+  cmake ../$pkgname-$pkgver \
+    -DWITH_OPENCL=ON \
+    -DWITH_OPENGL=ON \
+    -DWITH_TBB=ON \
+    -DOpenGL_GL_PREFERENCE=GLVND \
+    -DBUILD_WITH_DEBUG_INFO=OFF \
+    -DBUILD_TESTS=OFF \
+    -DBUILD_PERF_TESTS=OFF \
+    -DBUILD_EXAMPLES=ON \
+    -DINSTALL_C_EXAMPLES=ON \
+    -DINSTALL_PYTHON_EXAMPLES=ON \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    $extra \
     -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
+    -DLAPACK_LAPACKE_H="/usr/include/lapacke.h"
+#    -DWITH_IPP=OFF
   make
 }
 
 package_opencv() {
-  options=('staticlibs')
+  options=(staticlibs)
 
   cd build
   make DESTDIR="$pkgdir" install
 
   # install license file
-  install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 "$srcdir"/$pkgname-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
 
-  cd "$pkgdir/usr/share"
+  cd "$pkgdir"/usr/share
 
   # separate samples package; also be -R friendly
   if [[ -d OpenCV/samples ]]; then