extra/opencv to 3.4.2-1

extra/opencv/PKGBUILD

@@ -4,71 +4,68 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - remove intel-tbb depend for v5 and v6
-#  - depend on protobuf to skip building old, broken, bundled version
+#  - remove -DCPU_BASELINE_{ENABLE,DISABLE} flags for SSE
 
 pkgbase=opencv
-pkgname=('opencv' 'opencv-samples')
-pkgver=3.4.1
-pkgrel=3
+pkgname=(opencv opencv-samples)
+pkgver=3.4.2
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
-arch=('x86_64')
-license=('BSD')
+arch=(x86_64)
+license=(BSD)
 url="http://opencv.org/"
-depends=('openexr' 'xine-lib' 'libdc1394' 'cblas' 'lapack' 'libgphoto2' 'jasper' 'protobuf')
+depends=(openexr gst-plugins-base libdc1394 cblas lapack libgphoto2 jasper)
 depends_armv7h=('intel-tbb')
 depends_aarch64=('intel-tbb')
-makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen' 'hdf5' 'lapacke' 'gtkglext')
-optdepends=('opencv-samples'
-            'gtkglext: for the HighGUI module'
+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'
             'python2-numpy: Python 2 interface')
 source=("$pkgbase-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.zip"
         "opencv_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz")
-sha256sums=('24bda432eaace9e992322dcc3d30144cefa5314c2424d4aa02e5fe3fa9dd17bd'
-            '298c69ee006d7675e1ff9d371ba8b0d9e7e88374bb7ba0f9d0789851d352ec6e')
+sha256sums=('9405c5d7d8ab1696e98631d0c92125816356ec366a73c417bdcc4d74783b42aa'
+            '45a52764ebd2558fa0b7fd8dc47379b37dd0956d912abbf7c786228374fdf60d')
 
-_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'
-            )
+prepare() {
+  mkdir -p build
+}
 
 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[@]} \
+  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 \
     -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"
   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
@@ -81,17 +78,14 @@ package_opencv() {
 
 package_opencv-samples() {
   pkgdesc+=" (samples)"
-  depends=("opencv=$pkgver") # sample codes change with lib/API
+  depends=("opencv=$pkgver")
   unset optdepends
 
-  mkdir -p "$pkgdir/usr/share/opencv"
-  cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples"
+  mkdir -p "$pkgdir"/usr/share/opencv
+  cp -r "$srcdir"/opencv-samples "$pkgdir"/usr/share/opencv/samples
   # fix permissions
   chmod 755 "$pkgdir"/usr/share/opencv/samples/*
 
   # install license file
-  install -Dm644 "$srcdir/opencv-$pkgver/LICENSE" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 "$srcdir"/opencv-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
 }
-
-# vim:set ts=2 sw=2 et: