opencv4: remove package.

no longer needed, merged into opencv template

common/shlibs

@@ -2097,58 +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_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
-libopencv_xphoto.so.4.5 libopencv4-4.5.3_1
-libopencv_freetype.so.4.5 libopencv4-4.5.3_1
-libopencv_fuzzy.so.4.5 libopencv4-4.5.3_1
-libopencv_hfs.so.4.5 libopencv4-4.5.3_1
-libopencv_img_hash.so.4.5 libopencv4-4.5.3_1
-libopencv_line_descriptor.so.4.5 libopencv4-4.5.3_1
-libopencv_saliency.so.4.5 libopencv4-4.5.3_1
-libopencv_structured_light.so.4.5 libopencv4-4.5.3_1
-libopencv_aruco.so.4.5 libopencv4-4.5.3_1
-libopencv_bgsegm.so.4.5 libopencv4-4.5.3_1
-libopencv_bioinspired.so.4.5 libopencv4-4.5.3_1
-libopencv_ccalib.so.4.5 libopencv4-4.5.3_1
-libopencv_face.so.4.5 libopencv4-4.5.3_1
-libopencv_tracking.so.4.5 libopencv4-4.5.3_1
-libopencv_xfeatures2d.so.4.5 libopencv4-4.5.3_1
-libopencv_optflow.so.4.5 libopencv4-4.5.3_1
-libopencv_ximgproc.so.4.5 libopencv4-4.5.3_1
-libopencv_plot.so.4.5 libopencv4-4.5.3_1
-libopencv_text.so.4.5 libopencv4-4.5.3_1
-libopencv_ml.so.4.5 libopencv4-4.5.3_1
-libopencv_objdetect.so.4.5 libopencv4-4.5.3_1
-libopencv_dnn.so.4.5 libopencv4-4.5.3_1
-libopencv_shape.so.4.5 libopencv4-4.5.3_1
-libopencv_stitching.so.4.5 libopencv4-4.5.3_1
-libopencv_photo.so.4.5 libopencv4-4.5.3_1
-libopencv_video.so.4.5 libopencv4-4.5.3_1
-libopencv_calib3d.so.4.5 libopencv4-4.5.3_1
-libopencv_features2d.so.4.5 libopencv4-4.5.3_1
-libopencv_flann.so.4.5 libopencv4-4.5.3_1
-libopencv_highgui.so.4.5 libopencv4-4.5.3_1
-libopencv_videoio.so.4.5 libopencv4-4.5.3_1
-libopencv_imgcodecs.so.4.5 libopencv4-4.5.3_1
-libopencv_imgproc.so.4.5 libopencv4-4.5.3_1
-libopencv_core.so.4.5 libopencv4-4.5.3_1
-libopencv_superres.so.4.5 libopencv4-4.5.3_1
-libopencv_videostab.so.4.5 libopencv4-4.5.3_1
-libopencv_gapi.so.4.5 libopencv4-4.5.3_1
-libopencv_xobjdetect.so.4.5 libopencv4-4.5.3_1
-libopencv_datasets.so.4.5 libopencv4-4.5.3_1
-libopencv_dnn_objdetect.so.4.5 libopencv4-4.5.3_1
-libopencv_dnn_superres.so.4.5 libopencv4-4.5.3_1
-libopencv_dpm.so.4.5 libopencv4-4.5.3_1
-libopencv_phase_unwrapping.so.4.5 libopencv4-4.5.3_1
-libopencv_stereo.so.4.5 libopencv4-4.5.3_1
-libopencv_rapid.so.4.5 libopencv4-4.5.3_1
-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

srcpkgs/libopencv4

@@ -1 +1 @@
-opencv4
+opencv

srcpkgs/libopencv4-devel

@@ -1 +1 @@
-opencv4
+opencv

srcpkgs/libopencv4-python

@@ -1 +0,0 @@
-opencv4

srcpkgs/libopencv4-python3

@@ -1 +1 @@
-opencv4
+opencv

srcpkgs/opencv/template

@@ -75,3 +75,27 @@ libopencv-python3_package() {
 		vmove ${py3_sitelib}
 	}
 }
+
+opencv4_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}
+
+libopencv4_package() {
+	depends="lib${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - library files (transitional dummy package)"
+	build_style=meta
+}
+
+libopencv4-devel_package() {
+	depends="lib${sourcepkg}-devel>=${version}_${revision}"
+	short_desc+=" - development files (transitional dummy package)"
+	build_style=meta
+}
+
+libopencv4-python3_package() {
+	depends="lib${sourcepkg}-python3>=${version}_${revision}"
+	short_desc+=" - Python3 bindings (transitional dummy package)"
+	build_style=meta
+}

srcpkgs/opencv4

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

srcpkgs/opencv4/patches/undef-altivec-macros-cpp.patch

@@ -1,16 +0,0 @@
-This is necessary because otherwise conflicts are introduced in C++ code that
-includes this. The header itself does not rely on the macros. The issue is not
-visible on little endian because they undef the macros somewhere else.
-
---- a/3rdparty/include/opencl/1.2/CL/cl_platform.h
-+++ b/3rdparty/include/opencl/1.2/CL/cl_platform.h
-@@ -332,6 +332,9 @@ typedef unsigned int cl_GLenum;
- /* Define basic vector types */
- #if defined( __VEC__ )
-    #include <altivec.h>   /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
-+   #undef vector
-+   #undef pixel
-+   #undef bool
-    typedef __vector unsigned char     __cl_uchar16;
-    typedef __vector signed char       __cl_char16;
-    typedef __vector unsigned short    __cl_ushort8;

srcpkgs/opencv4/template

@@ -1,89 +0,0 @@
-# Template file for 'opencv4'
-pkgname=opencv4
-version=4.5.3
-revision=2
-wrksrc=opencv-${version}
-build_style=cmake
-configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
- -DOPENCV_GENERATE_PKGCONFIG=YES
- -DWITH_EIGEN=ON -DENABLE_CXX11=ON -DOPENCV_SKIP_PYTHON_LOADER=ON
- -DOPENCV_PYTHON3_INSTALL_PATH=/${py3_sitelib}
- -DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}
- -DOPENCV_EXTRA_MODULES_PATH=${XBPS_BUILDDIR}/opencv_contrib-${version}/modules
- -DBUILD_opencv_wechat_qrcode=OFF -DBUILD_opencv_rgbd=OFF"
-hostmakedepends="pkg-config eigen python-numpy 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"
-short_desc="Computer vision and machine learning software library, version 4.x"
-maintainer="Hazel Levine <me@qtp2t.club>"
-license="BSD-3-Clause"
-homepage="https://opencv.org"
-distfiles="https://github.com/opencv/opencv/archive/${version}.tar.gz
-	https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz"
-checksum="77f616ae4bea416674d8c373984b20c8bd55e7db887fd38c6df73463a0647bab
- 73da052fd10e73aaba2560eaff10cc5177e2dcc58b27f8aedf7c649e24c233bc"
-
-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+=" -DPYTHON2_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py2_inc}
-	 -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
-	ppc64*) ;;
-	ppc*) broken="grfmt_jpeg2000.cpp:380:48: error: lvalue required as unary '&' operand";;
-esac
-
-post_install() {
-	vlicense LICENSE
-}
-
-libopencv4_package() {
-	short_desc+=" - library files"
-	pkg_install() {
-		vmove usr/lib/*.so.*
-	}
-}
-
-libopencv4-devel_package() {
-	short_desc+=" - development files"
-	depends="libopencv4>=${version}_${revision}"
-	conflicts="libopencv-devel>=0"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.so
-		vmove usr/share/opencv4
-	}
-}
-
-libopencv4-python_package() {
-	short_desc+=" - Python2 bindings"
-	depends="python-numpy"
-	pkg_install() {
-		vmove ${py2_sitelib}
-	}
-}
-
-libopencv4-python3_package() {
-	short_desc+=" - Python3 bindings"
-	depends="python3-numpy"
-	pkg_install() {
-		vmove ${py3_sitelib}
-	}
-}

srcpkgs/removed-packages/template

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