Update to v4.0.0

1 files changed, 15 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d83ef28e3480..ac48800f9595 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=opencv-cuda
-pkgver=3.4.4
+pkgver=4.0.0
 pkgrel=1
 provides=(opencv)
 conflicts=(opencv)
@@ -22,12 +22,12 @@ optdepends=('opencv-samples: samples'
             '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=('b5755384cbadf67f55838c6cfd9ae1aad0ebad2c7cfe4c1174417c80d2ed15a9'
-            '765446d994713363554978d1da447fef77a2cdf9e38742f0a98b13b92652626d')
+sha256sums=('86fd08fc02893e05e2944fa7b0daa7d02643232450f020b475e1b2f24587b99a'
+            '4fb0681414df4baedce6e3f4a01318d6f4fcde6ee14854d761fd4e397a397763')
 
 prepare() {
   msg2 "Patching sources for CUDA v10"
-  sed -i 's|dynlink_nvcuvid.h|nvidia-sdk/nvcuvid.h|' opencv-$pkgver/modules/cudacodec/src/*.hpp
+  sed -i 's|dynlink_nvcuvid.h|nvidia-sdk/nvcuvid.h|' opencv_contrib-$pkgver/modules/cud*/src/*.hpp
 
   mkdir -p build
 }
@@ -35,6 +35,7 @@ prepare() {
 build() {
   cd build
   # cmake's FindLAPACK doesn't add cblas to LAPACK_LIBRARIES, so we need to specify them manually
+  _pythonpath=`python -c "from sysconfig import get_path; print(get_path('platlib'))"`
   cmake ../opencv-$pkgver \
     -DWITH_OPENCL=ON \
     -DWITH_OPENGL=ON \
@@ -42,8 +43,10 @@ build() {
     -DOpenGL_GL_PREFERENCE=GLVND \
     -DBUILD_WITH_DEBUG_INFO=OFF \
     -DBUILD_TESTS=OFF \
-    -DENABLE_CCACHE=OFF \
     -DBUILD_PERF_TESTS=OFF \
+    -DBUILD_EXAMPLES=ON \
+    -DINSTALL_C_EXAMPLES=ON \
+    -DINSTALL_PYTHON_EXAMPLES=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DCPU_BASELINE_DISABLE=SSE3 \
@@ -54,9 +57,12 @@ build() {
     -DWITH_CUBLAS=ON \
     -DCUDA_HOST_COMPILER=/usr/bin/gcc-7 \
     -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \
+    -DOPENCV_SKIP_PYTHON_LOADER=ON \
+    -DOPENCV_PYTHON3_INSTALL_PATH=$_pythonpath \
     -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"
+    -DLAPACK_LAPACKE_H="/usr/include/lapacke.h" \
+    -DOPENCV_GENERATE_PKGCONFIG=ON
   make
 }
 
@@ -70,9 +76,9 @@ package() {
   cd "$pkgdir"/usr/share
 
   # separate samples package; also be -R friendly
-  if [[ -d OpenCV/samples ]]; then
-    mv OpenCV $pkgname # otherwise folder naming is inconsistent
-  elif [[ ! -d OpenCV ]]; then
+  if [[ -d opencv4/samples ]]; then
+    mv opencv4 $pkgname # otherwise folder naming is inconsistent
+  elif [[ ! -d opencv4 ]]; then
     warning "Directory naming issue; samples package may not be built!"
   fi
 }