opencv4: rebuild for Python 3.10, update to 4.5.3.

This commit is contained in:
Andrew J. Hesford 2021-09-24 23:16:13 -04:00
parent 64df29c43a
commit e1e2b00629
2 changed files with 57 additions and 55 deletions

View File

@ -2085,56 +2085,58 @@ libopencv_imgproc.so.3.4 libopencv-3.4.1_1
libopencv_core.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_superres.so.3.4 libopencv-3.4.1_1
libopencv_videostab.so.3.4 libopencv-3.4.1_1 libopencv_videostab.so.3.4 libopencv-3.4.1_1
libopencv_quality.so.4.3 libopencv4-4.3.0_1 libopencv_quality.so.4.5 libopencv4-4.5.3_1
libopencv_reg.so.4.3 libopencv4-4.3.0_1 libopencv_reg.so.4.5 libopencv4-4.5.3_1
libopencv_surface_matching.so.4.3 libopencv4-4.3.0_1 libopencv_surface_matching.so.4.5 libopencv4-4.5.3_1
libopencv_xphoto.so.4.3 libopencv4-4.3.0_1 libopencv_xphoto.so.4.5 libopencv4-4.5.3_1
libopencv_freetype.so.4.3 libopencv4-4.3.0_1 libopencv_freetype.so.4.5 libopencv4-4.5.3_1
libopencv_fuzzy.so.4.3 libopencv4-4.3.0_1 libopencv_fuzzy.so.4.5 libopencv4-4.5.3_1
libopencv_hfs.so.4.3 libopencv4-4.3.0_1 libopencv_hfs.so.4.5 libopencv4-4.5.3_1
libopencv_img_hash.so.4.3 libopencv4-4.3.0_1 libopencv_img_hash.so.4.5 libopencv4-4.5.3_1
libopencv_line_descriptor.so.4.3 libopencv4-4.3.0_1 libopencv_line_descriptor.so.4.5 libopencv4-4.5.3_1
libopencv_saliency.so.4.3 libopencv4-4.3.0_1 libopencv_saliency.so.4.5 libopencv4-4.5.3_1
libopencv_structured_light.so.4.3 libopencv4-4.3.0_1 libopencv_structured_light.so.4.5 libopencv4-4.5.3_1
libopencv_aruco.so.4.3 libopencv4-4.3.0_1 libopencv_aruco.so.4.5 libopencv4-4.5.3_1
libopencv_bgsegm.so.4.3 libopencv4-4.3.0_1 libopencv_bgsegm.so.4.5 libopencv4-4.5.3_1
libopencv_bioinspired.so.4.3 libopencv4-4.3.0_1 libopencv_bioinspired.so.4.5 libopencv4-4.5.3_1
libopencv_ccalib.so.4.3 libopencv4-4.3.0_1 libopencv_ccalib.so.4.5 libopencv4-4.5.3_1
libopencv_face.so.4.3 libopencv4-4.3.0_1 libopencv_face.so.4.5 libopencv4-4.5.3_1
libopencv_tracking.so.4.3 libopencv4-4.3.0_1 libopencv_tracking.so.4.5 libopencv4-4.5.3_1
libopencv_xfeatures2d.so.4.3 libopencv4-4.3.0_1 libopencv_xfeatures2d.so.4.5 libopencv4-4.5.3_1
libopencv_optflow.so.4.3 libopencv4-4.3.0_1 libopencv_optflow.so.4.5 libopencv4-4.5.3_1
libopencv_ximgproc.so.4.3 libopencv4-4.3.0_1 libopencv_ximgproc.so.4.5 libopencv4-4.5.3_1
libopencv_plot.so.4.3 libopencv4-4.3.0_1 libopencv_plot.so.4.5 libopencv4-4.5.3_1
libopencv_text.so.4.3 libopencv4-4.3.0_1 libopencv_text.so.4.5 libopencv4-4.5.3_1
libopencv_ml.so.4.3 libopencv4-4.3.0_1 libopencv_ml.so.4.5 libopencv4-4.5.3_1
libopencv_objdetect.so.4.3 libopencv4-4.3.0_1 libopencv_objdetect.so.4.5 libopencv4-4.5.3_1
libopencv_dnn.so.4.3 libopencv4-4.3.0_1 libopencv_dnn.so.4.5 libopencv4-4.5.3_1
libopencv_shape.so.4.3 libopencv4-4.3.0_1 libopencv_shape.so.4.5 libopencv4-4.5.3_1
libopencv_stitching.so.4.3 libopencv4-4.3.0_1 libopencv_stitching.so.4.5 libopencv4-4.5.3_1
libopencv_photo.so.4.3 libopencv4-4.3.0_1 libopencv_photo.so.4.5 libopencv4-4.5.3_1
libopencv_video.so.4.3 libopencv4-4.3.0_1 libopencv_video.so.4.5 libopencv4-4.5.3_1
libopencv_calib3d.so.4.3 libopencv4-4.3.0_1 libopencv_calib3d.so.4.5 libopencv4-4.5.3_1
libopencv_features2d.so.4.3 libopencv4-4.3.0_1 libopencv_features2d.so.4.5 libopencv4-4.5.3_1
libopencv_flann.so.4.3 libopencv4-4.3.0_1 libopencv_flann.so.4.5 libopencv4-4.5.3_1
libopencv_highgui.so.4.3 libopencv4-4.3.0_1 libopencv_highgui.so.4.5 libopencv4-4.5.3_1
libopencv_videoio.so.4.3 libopencv4-4.3.0_1 libopencv_videoio.so.4.5 libopencv4-4.5.3_1
libopencv_imgcodecs.so.4.3 libopencv4-4.3.0_1 libopencv_imgcodecs.so.4.5 libopencv4-4.5.3_1
libopencv_imgproc.so.4.3 libopencv4-4.3.0_1 libopencv_imgproc.so.4.5 libopencv4-4.5.3_1
libopencv_core.so.4.3 libopencv4-4.3.0_1 libopencv_core.so.4.5 libopencv4-4.5.3_1
libopencv_superres.so.4.3 libopencv4-4.3.0_1 libopencv_superres.so.4.5 libopencv4-4.5.3_1
libopencv_videostab.so.4.3 libopencv4-4.3.0_1 libopencv_videostab.so.4.5 libopencv4-4.5.3_1
libopencv_gapi.so.4.3 libopencv4-4.3.0_1 libopencv_gapi.so.4.5 libopencv4-4.5.3_1
libopencv_xobjdetect.so.4.3 libopencv4-4.3.0_1 libopencv_xobjdetect.so.4.5 libopencv4-4.5.3_1
libopencv_datasets.so.4.3 libopencv4-4.3.0_1 libopencv_datasets.so.4.5 libopencv4-4.5.3_1
libopencv_dnn_objdetect.so.4.3 libopencv4-4.3.0_1 libopencv_dnn_objdetect.so.4.5 libopencv4-4.5.3_1
libopencv_dnn_superres.so.4.3 libopencv4-4.3.0_1 libopencv_dnn_superres.so.4.5 libopencv4-4.5.3_1
libopencv_dpm.so.4.3 libopencv4-4.3.0_1 libopencv_dpm.so.4.5 libopencv4-4.5.3_1
libopencv_phase_unwrapping.so.4.3 libopencv4-4.3.0_1 libopencv_phase_unwrapping.so.4.5 libopencv4-4.5.3_1
libopencv_stereo.so.4.3 libopencv4-4.3.0_1 libopencv_stereo.so.4.5 libopencv4-4.5.3_1
libopencv_rapid.so.4.3 libopencv4-4.3.0_1 libopencv_rapid.so.4.5 libopencv4-4.5.3_1
libopencv_intensity_transform.so.4.3 libopencv4-4.3.0_1 libopencv_intensity_transform.so.4.5 libopencv4-4.5.3_1
libopencv_alphamat.so.4.3 libopencv4-4.3.0_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
libuniconf.so.4.6 wvstreams-4.6.1_20 libuniconf.so.4.6 wvstreams-4.6.1_20
libwvbase.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 libwvutils.so.4.6 wvstreams-4.6.1_20

View File

@ -1,7 +1,7 @@
# Template file for 'opencv4' # Template file for 'opencv4'
pkgname=opencv4 pkgname=opencv4
version=4.3.0 version=4.5.3
revision=4 revision=1
wrksrc=opencv-${version} wrksrc=opencv-${version}
build_style=cmake build_style=cmake
configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=ON
@ -10,7 +10,7 @@ configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -DWITH_OPENCL=
-DOPENCV_PYTHON3_INSTALL_PATH=/${py3_sitelib} -DOPENCV_PYTHON3_INSTALL_PATH=/${py3_sitelib}
-DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib} -DOPENCV_PYTHON_INSTALL_PATH=/${py2_sitelib}
-DOPENCV_EXTRA_MODULES_PATH=${XBPS_BUILDDIR}/opencv_contrib-${version}/modules -DOPENCV_EXTRA_MODULES_PATH=${XBPS_BUILDDIR}/opencv_contrib-${version}/modules
-DBUILD_opencv_rgbd=OFF" -DBUILD_opencv_wechat_qrcode=OFF -DBUILD_opencv_rgbd=OFF"
hostmakedepends="pkg-config eigen python-numpy python3-numpy" hostmakedepends="pkg-config eigen python-numpy python3-numpy"
makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
@ -22,8 +22,8 @@ license="BSD-3-Clause"
homepage="https://opencv.org" homepage="https://opencv.org"
distfiles="https://github.com/opencv/opencv/archive/${version}.tar.gz distfiles="https://github.com/opencv/opencv/archive/${version}.tar.gz
https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz" https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz"
checksum="68bc40cbf47fdb8ee73dfaf0d9c6494cd095cf6294d99de445ab64cf853d278a checksum="77f616ae4bea416674d8c373984b20c8bd55e7db887fd38c6df73463a0647bab
acb8e89c9e7d1174e63e40532125b60d248b00e517255a98a419d415228c6a55" 73da052fd10e73aaba2560eaff10cc5177e2dcc58b27f8aedf7c649e24c233bc"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel" makedepends+=" libatomic-devel"