opencv-git: Upgrading to 4.0.0 with related PKGBUILD changes

2 files changed, 29 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 583e22bb1f1d..7686923acd3b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = opencv-git
 	pkgdesc = Open Source Computer Vision Library
-	pkgver = 3.4.3.r121.gc331a214d0
+	pkgver = 4.0.0.r81.g197285d12a
 	pkgrel = 1
 	url = https://opencv.org/
 	arch = i686
@@ -9,12 +9,14 @@ pkgbase = opencv-git
 	makedepends = git
 	makedepends = cmake
 	makedepends = python-numpy
-	makedepends = python2-numpy
+	makedepends = python-setuptools
 	makedepends = mesa
 	makedepends = eigen
 	makedepends = hdf5
 	makedepends = lapacke
 	makedepends = gtk3
+	makedepends = vtk
+	makedepends = glew
 	depends = intel-tbb
 	depends = openexr
 	depends = gst-plugins-base
@@ -23,19 +25,18 @@ pkgbase = opencv-git
 	depends = lapack
 	depends = libgphoto2
 	depends = jasper
+	depends = ffmpeg
 	optdepends = opencv-samples: samples
 	optdepends = gtk3: for the HighGUI module
 	optdepends = hdf5: Support for HDF5 format
 	optdepends = opencl-icd-loader: For coding with OpenCL
 	optdepends = python-numpy: Python 3 interface
-	optdepends = python2-numpy: Python 2 interface
-	provides = opencv=3.4.3.r121.gc331a214d0
+	provides = opencv=4.0.0.r81.g197285d12a
 	conflicts = opencv
-	source = git+https://github.com/opencv/opencv.git#branch=3.4
-	source = git+https://github.com/opencv/opencv_contrib.git#branch=3.4
+	source = git+https://github.com/opencv/opencv.git
+	source = git+https://github.com/opencv/opencv_contrib.git
 	sha512sums = SKIP
 	sha512sums = SKIP
 
 pkgname = opencv-git
-	options = staticlibs
 
diff --git a/PKGBUILD b/PKGBUILD
index fb414ff7eee8..4cc722e58892 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,24 +12,23 @@
 
 _name=opencv
 pkgname="$_name-git"
-pkgver=3.4.3.r121.gc331a214d0
+pkgver=4.0.0.r81.g197285d12a
 pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 url="https://opencv.org/"
 license=('BSD')
 arch=('i686' 'x86_64')
-depends=('intel-tbb' 'openexr' 'gst-plugins-base' 'libdc1394' 'cblas' 'lapack' 'libgphoto2' 'jasper')
-makedepends=('git' 'cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen' 'hdf5' 'lapacke' 'gtk3')
+depends=('intel-tbb' 'openexr' 'gst-plugins-base' 'libdc1394' 'cblas' 'lapack' 'libgphoto2' 'jasper' 'ffmpeg')
+makedepends=('git' 'cmake' 'python-numpy' 'python-setuptools' 'mesa' 'eigen' 'hdf5' 'lapacke' 'gtk3' 'vtk' 'glew')
 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')
+            'python-numpy: Python 3 interface')
 conflicts=('opencv')
 provides=("$_name=$pkgver")
-source=('git+https://github.com/opencv/opencv.git#branch=3.4'
-        'git+https://github.com/opencv/opencv_contrib.git#branch=3.4')
+source=('git+https://github.com/opencv/opencv.git'
+        'git+https://github.com/opencv/opencv_contrib.git')
 sha512sums=('SKIP'
             'SKIP')
 
@@ -45,7 +44,8 @@ _cmakeopts=('-DWITH_OPENCL=ON'
             '-DINSTALL_PYTHON_EXAMPLES=ON'
             '-DCMAKE_INSTALL_PREFIX=/usr'
             '-DCMAKE_INSTALL_LIBDIR=lib'
-            '-DCUDA_NVCC_FLAGS="--expt-relaxed-constexpr"')
+            '-DCUDA_NVCC_FLAGS="--expt-relaxed-constexpr"'
+            '-DOPENCV_SKIP_PYTHON_LOADER=ON')
 
 # SSE only available from Pentium 3 onwards (i686 is way older)
 [[ "$CARCH" = 'i686' ]] && _cmakeopts+=('-DCPU_BASELINE_DISABLE=SSE2')
@@ -56,23 +56,28 @@ pkgver() {
     git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
 }
 
+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
+    _pythonpath=`python -c "from sysconfig import get_path; print(get_path('platlib'))"`
 
     cmake "${_cmakeopts[@]}" \
           -DOPENCV_EXTRA_MODULES_PATH="$srcdir"/opencv_contrib/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" \
+          -DOPENCV_PYTHON3_INSTALL_PATH=$_pythonpath \
+          -DOPENCV_GENERATE_PKGCONFIG=ON \
           ../"$_name"
 
     make
 }
 
 package() {
-    options=('staticlibs')
-
     cd build
     make DESTDIR="$pkgdir" install
 
@@ -81,5 +86,9 @@ package() {
 
     cd "$pkgdir"/usr/share
 
-    mv OpenCV opencv  # NOTE: Make the name casing consistent with what extra/opencv provides
+    # install missing headers https://github.com/opencv/opencv/issues/13201
+    for _module in imgcodecs videoio photo; do
+      cp -r "$srcdir"/"$_name"/modules/"$_module"/include/opencv2/"$_module"/legacy \
+        "$pkgdir"/usr/include/opencv4/opencv2/"$_module"
+    done
 }