opencv: update to 4.6.0.

remove subpackage: libopencv-python - python 2, no revdeps.

common/shlibs

@@ -2097,23 +2097,6 @@ libcapstone.so.4 capstone-4.0_1
 libhavege.so.2 libhaveged-1.9.11_1
 libnih.so.1 libnih-1.0.3_1
 libnih-dbus.so.1 libnih-1.0.3_1
-libopencv_ml.so.3.4 libopencv-3.4.1_1
-libopencv_objdetect.so.3.4 libopencv-3.4.1_1
-libopencv_dnn.so.3.4 libopencv-3.4.1_1
-libopencv_shape.so.3.4 libopencv-3.4.1_1
-libopencv_stitching.so.3.4 libopencv-3.4.1_1
-libopencv_photo.so.3.4 libopencv-3.4.1_1
-libopencv_video.so.3.4 libopencv-3.4.1_1
-libopencv_calib3d.so.3.4 libopencv-3.4.1_1
-libopencv_features2d.so.3.4 libopencv-3.4.1_1
-libopencv_flann.so.3.4 libopencv-3.4.1_1
-libopencv_highgui.so.3.4 libopencv-3.4.1_1
-libopencv_videoio.so.3.4 libopencv-3.4.1_1
-libopencv_imgcodecs.so.3.4 libopencv-3.4.1_1
-libopencv_imgproc.so.3.4 libopencv-3.4.1_1
-libopencv_core.so.3.4 libopencv-3.4.1_1
-libopencv_superres.so.3.4 libopencv-3.4.1_1
-libopencv_videostab.so.3.4 libopencv-3.4.1_1
 libopencv_quality.so.4.5 libopencv4-4.5.3_1
 libopencv_reg.so.4.5 libopencv4-4.5.3_1
 libopencv_surface_matching.so.4.5 libopencv4-4.5.3_1
@@ -2166,6 +2149,58 @@ libopencv_intensity_transform.so.4.5 libopencv4-4.5.3_1
 libopencv_alphamat.so.4.5 libopencv4-4.5.3_1
 libopencv_barcode.so.4.5 libopencv4-4.5.3_1
 libopencv_mcc.so.4.5 libopencv4-4.5.3_1
+libopencv_quality.so.406 libopencv-4.6.0_1
+libopencv_reg.so.406 libopencv-4.6.0_1
+libopencv_surface_matching.so.406 libopencv-4.6.0_1
+libopencv_xphoto.so.406 libopencv-4.6.0_1
+libopencv_freetype.so.406 libopencv-4.6.0_1
+libopencv_fuzzy.so.406 libopencv-4.6.0_1
+libopencv_hfs.so.406 libopencv-4.6.0_1
+libopencv_img_hash.so.406 libopencv-4.6.0_1
+libopencv_line_descriptor.so.406 libopencv-4.6.0_1
+libopencv_saliency.so.406 libopencv-4.6.0_1
+libopencv_structured_light.so.406 libopencv-4.6.0_1
+libopencv_aruco.so.406 libopencv-4.6.0_1
+libopencv_bgsegm.so.406 libopencv-4.6.0_1
+libopencv_bioinspired.so.406 libopencv-4.6.0_1
+libopencv_ccalib.so.406 libopencv-4.6.0_1
+libopencv_face.so.406 libopencv-4.6.0_1
+libopencv_tracking.so.406 libopencv-4.6.0_1
+libopencv_xfeatures2d.so.406 libopencv-4.6.0_1
+libopencv_optflow.so.406 libopencv-4.6.0_1
+libopencv_ximgproc.so.406 libopencv-4.6.0_1
+libopencv_plot.so.406 libopencv-4.6.0_1
+libopencv_text.so.406 libopencv-4.6.0_1
+libopencv_ml.so.406 libopencv-4.6.0_1
+libopencv_objdetect.so.406 libopencv-4.6.0_1
+libopencv_dnn.so.406 libopencv-4.6.0_1
+libopencv_shape.so.406 libopencv-4.6.0_1
+libopencv_stitching.so.406 libopencv-4.6.0_1
+libopencv_photo.so.406 libopencv-4.6.0_1
+libopencv_video.so.406 libopencv-4.6.0_1
+libopencv_calib3d.so.406 libopencv-4.6.0_1
+libopencv_features2d.so.406 libopencv-4.6.0_1
+libopencv_flann.so.406 libopencv-4.6.0_1
+libopencv_highgui.so.406 libopencv-4.6.0_1
+libopencv_videoio.so.406 libopencv-4.6.0_1
+libopencv_imgcodecs.so.406 libopencv-4.6.0_1
+libopencv_imgproc.so.406 libopencv-4.6.0_1
+libopencv_core.so.406 libopencv-4.6.0_1
+libopencv_superres.so.406 libopencv-4.6.0_1
+libopencv_videostab.so.406 libopencv-4.6.0_1
+libopencv_gapi.so.406 libopencv-4.6.0_1
+libopencv_xobjdetect.so.406 libopencv-4.6.0_1
+libopencv_datasets.so.406 libopencv-4.6.0_1
+libopencv_dnn_objdetect.so.406 libopencv-4.6.0_1
+libopencv_dnn_superres.so.406 libopencv-4.6.0_1
+libopencv_dpm.so.406 libopencv-4.6.0_1
+libopencv_phase_unwrapping.so.406 libopencv-4.6.0_1
+libopencv_stereo.so.406 libopencv-4.6.0_1
+libopencv_rapid.so.406 libopencv-4.6.0_1
+libopencv_intensity_transform.so.406 libopencv-4.6.0_1
+libopencv_alphamat.so.406 libopencv-4.6.0_1
+libopencv_barcode.so.406 libopencv-4.6.0_1
+libopencv_mcc.so.406 libopencv-4.6.0_1
 libuniconf.so.4.6 wvstreams-4.6.1_20
 libwvbase.so.4.6 wvstreams-4.6.1_20
 libwvutils.so.4.6 wvstreams-4.6.1_20

srcpkgs/libopencv-python

@@ -1 +0,0 @@
-opencv

srcpkgs/opencv/template

@@ -1,40 +1,43 @@
 # Template file for 'opencv'
 pkgname=opencv
-version=3.4.15
+version=4.6.0
 revision=1
+create_wrksrc=yes
+build_wrksrc=${pkgname}-${version}
 build_style=cmake
 configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
  -DWITH_OPENCL=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
  -DOPENCV_PYTHON3_INSTALL_PATH=/${py3_sitelib}
- -DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}"
+ -DOPENCV_GENERATE_PKGCONFIG=YES -DWITH_EIGEN=ON
-hostmakedepends="pkg-config eigen python-numpy python3-numpy"
+ -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-${version}/modules
+ -DBUILD_opencv_wechat_qrcode=OFF -DBUILD_opencv_rgbd=OFF
+ -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF"
+hostmakedepends="pkg-config eigen python3-numpy"
 makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
  jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
  libgphoto2-devel gst-plugins-base1-devel openblas-devel
- python-numpy python3-numpy python-devel python3-devel"
+ python3-numpy python3-devel"
 short_desc="Computer vision and machine learning software library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://opencv.org"
-distfiles="https://github.com/opencv/${pkgname}/archive/${version}.tar.gz"
+changelog="https://github.com/opencv/opencv/wiki/ChangeLog"
-checksum=b1e8470b18e9e793bf70b4ae051bbc9bf81fa45f8cbfee1e6c88858c90be8ff7
+distfiles="https://github.com/opencv/opencv/archive/${version}.tar.gz
+ https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz"
+checksum="1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277
+ 1777d5fd2b59029cf537e5fd6f8aa68d707075822f90bde683fcde086f85f7a7"
+patch_args="-Np1 -d ${build_wrksrc}"
+# tests hang indenfinitely, even with test data included
+make_check=no
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-if [ -z "$XBPS_CHECK_PKGS" ]; then
-	# opencv by default builds tests that only seem to be used in make check
-	configure_args+=" -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF"
-fi
-
 if [ "$CROSS_BUILD" ]; then
 	# Tell opencv where to find python and numpy
-	_npincdir="numpy/core/include"
+	configure_args+=" -DPYTHON3_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py3_inc}
-	configure_args+=" -DPYTHON2_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py2_inc}
+	 -DPYTHON3_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/core/include"
-	 -DPYTHON2_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py2_sitelib}/${_npincdir}
-	 -DPYTHON3_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py3_inc}
-	 -DPYTHON3_NUMPY_INCLUDE_DIRS=${XBPS_CROSS_BASE}/${py3_sitelib}/${_npincdir}"
 fi
 
 case "$XBPS_TARGET_MACHINE" in
@@ -58,17 +61,10 @@ libopencv-devel_package() {
 	depends="libopencv>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/cmake
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/*.so
-		vmove usr/share/OpenCV
+		vmove usr/share/opencv4
-	}
-}
-
-libopencv-python_package() {
-	short_desc+=" - Python2 bindings"
-	depends="python-numpy"
-	pkg_install() {
-		vmove usr/lib/python2.7
 	}
 }
 
@@ -76,6 +72,6 @@ libopencv-python3_package() {
 	short_desc+=" - Python3 bindings"
 	depends="python3-numpy"
 	pkg_install() {
-		vmove usr/lib/python3*
+		vmove ${py3_sitelib}
 	}
 }

srcpkgs/removed-packages/template

@@ -246,6 +246,7 @@ replaces="
  libmagick6<=6.9.12.12_2
  libmpd-devel<=11.8.17_3
  libmpd<=11.8.17_3
+ libopencv-python<=3.4.15_1
  libpng12<=1.2.59_1
  libpyside-python3<=5.15.0_2
  libqmatrixclient-devel<=0.5.3.2_1