extra/opencv to 4.5.4-3

extra/opencv/PKGBUILD

@@ -5,17 +5,18 @@
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - remove -DCPU_BASELINE_{ENABLE,DISABLE} flags for SSE
 #  - link with libatomic on v5/v6
+#  - remove cuda package
 
 pkgbase=opencv
 pkgname=(opencv opencv-samples python-opencv)
 pkgver=4.5.4
-pkgrel=1
+pkgrel=3
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
 url='https://opencv.org/'
 depends=(tbb openexr gst-plugins-base libdc1394 cblas lapack libgphoto2 openjpeg2 ffmpeg)
-makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke qt5-base vtk glew ant java-environment)
+makedepends=(cmake python-numpy python-setuptools mesa eigen hdf5 lapacke qt5-base vtk glew ant java-environment pugixml openmpi)
 optdepends=('opencv-samples: samples'
             'vtk: for the viz module'
             'glew: for the viz module'
@@ -26,16 +27,21 @@ optdepends=('opencv-samples: samples'
 source=(https://github.com/opencv/opencv/archive/$pkgver/$pkgname-$pkgver.tar.gz
         https://github.com/opencv/opencv_contrib/archive/$pkgver/opencv_contrib-$pkgver.tar.gz
         opencv-lapack-3.10.patch
+        fix-cvv-build.patch::https://github.com/opencv/opencv_contrib/commit/2a4348e0.patch
+        vtk9.patch
         0001-link-with-libatomic.patch)
 sha256sums=('c20bb83dd790fc69df9f105477e24267706715a9d3c705ca1e7f613c7b3bad3d'
             'ad74b440b4539619dc9b587995a16b691246023d45e34097c73e259f72de9f81'
             'f83c64f2731a39910d0d4a48898dd04e4aca5c22f746b7b0ead003992ae11199'
+            'a992cbdfe40730c584df41b9d18ab6c799bf060a67cf4332e5e3301b95720369'
+            'f35a2d4ea0d6212c7798659e59eda2cb0b5bc858360f7ce9c696c77d3029668e'
             '3376bc87ac7404c6f396f1bee03b76ab0e5cb18829f535bbc97cef71d28ab168')
 
 
 prepare() {
   patch -d $pkgname-$pkgver -p1 < opencv-lapack-3.10.patch # Fix build with LAPACK 3.10
-  sed -e 's|HAVE_QT5|HAVE_QT|' -i opencv_contrib-$pkgver/modules/cvv/CMakeLists.txt # Fix build of cvv module
+  patch -d $pkgname-$pkgver -p1 < vtk9.patch # Don't require all vtk optdepends
+  patch -d opencv_contrib-$pkgver -p1 < fix-cvv-build.patch # Fix build of cvv module
   cd $pkgname-$pkgver
   if [[ $CARCH == "arm" || $CARCH == "armv6h" ]]; then
     patch -p1 -i ../0001-link-with-libatomic.patch
@@ -45,31 +51,31 @@ prepare() {
 build() {
   export JAVA_HOME="/usr/lib/jvm/default"
   # 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 -B build -S $pkgname-$pkgver \
-    -DWITH_OPENCL=ON \
-    -DWITH_OPENGL=ON \
-    -DWITH_TBB=ON \
-    -DWITH_VULKAN=ON \
-    -DWITH_QT=ON \
-    -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 \
-    -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" \
-    -DOPENCV_GENERATE_PKGCONFIG=ON \
-    -DOPENCV_ENABLE_NONFREE=ON \
-    -DOPENCV_JNI_INSTALL_PATH=lib \
-    -DOPENCV_GENERATE_SETUPVARS=OFF \
-    -DEIGEN_INCLUDE_PATH=/usr/include/eigen3
+  _opts="-DWITH_OPENCL=ON \
+         -DWITH_OPENGL=ON \
+         -DWITH_TBB=ON \
+         -DWITH_VULKAN=ON \
+         -DWITH_QT=ON \
+         -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 \
+         -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" \
+         -DOPENCV_GENERATE_PKGCONFIG=ON \
+         -DOPENCV_ENABLE_NONFREE=ON \
+         -DOPENCV_JNI_INSTALL_PATH=lib \
+         -DOPENCV_GENERATE_SETUPVARS=OFF \
+         -DEIGEN_INCLUDE_PATH=/usr/include/eigen3"
+
+  cmake -B build -S $pkgname-$pkgver $_opts
   cmake --build build
 }
 

extra/opencv/vtk9.patch

@@ -0,0 +1,36 @@
+diff --git a/cmake/OpenCVDetectVTK.cmake b/cmake/OpenCVDetectVTK.cmake
+index 312fd41fe4..aeda80d47c 100644
+--- a/cmake/OpenCVDetectVTK.cmake
++++ b/cmake/OpenCVDetectVTK.cmake
+@@ -1,8 +1,5 @@
+ if(NOT VTK_FOUND)
+-  find_package(VTK QUIET NAMES vtk VTK)
+-  if(VTK_FOUND)
+-    if(NOT (VTK_VERSION VERSION_LESS "9.0.0") AND (VTK_VERSION VERSION_LESS "10.0.0")) # VTK 9.x
+-      find_package(VTK 9 QUIET NAMES vtk COMPONENTS
++  find_package(VTK 9 QUIET NAMES vtk COMPONENTS
+               FiltersExtraction
+               FiltersSources
+               FiltersTexture
+@@ -14,21 +11,6 @@ if(NOT VTK_FOUND)
+               RenderingLOD
+               RenderingOpenGL2
+               NO_MODULE)
+-    elseif(VTK_VERSION VERSION_GREATER "5") # VTK 6.x components
+-      find_package(VTK QUIET COMPONENTS vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE)
+-      IF(VTK_FOUND)
+-        IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is exported as a var.
+-          find_package(VTK QUIET COMPONENTS vtkRendering${VTK_RENDERING_BACKEND} vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport vtkIOGeometry NO_MODULE)
+-        ELSE(VTK_RENDERING_BACKEND)
+-          find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE)
+-        ENDIF(VTK_RENDERING_BACKEND)
+-      ENDIF(VTK_FOUND)
+-    elseif(VTK_VERSION VERSION_EQUAL "5") # VTK 5.x components
+-      find_package(VTK QUIET COMPONENTS vtkCommon NO_MODULE)
+-    else()
+-      set(VTK_FOUND FALSE)
+-    endif()
+-  endif()
+ endif()
+ 
+ if(NOT VTK_FOUND)