From 4aac8885a8dea3398194f5e17733b12e20e06a99 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sun, 6 Jul 2025 16:20:21 +0200 Subject: [PATCH] opencv: update to 4.12.0. (soname bump) --- common/shlibs | 104 ++++++++++++------------ srcpkgs/opencv/patches/python3.12.patch | 23 ------ srcpkgs/opencv/template | 14 ++-- 3 files changed, 57 insertions(+), 84 deletions(-) delete mode 100644 srcpkgs/opencv/patches/python3.12.patch diff --git a/common/shlibs b/common/shlibs index b48629586ce..40c368bd18c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2195,58 +2195,58 @@ libcapstone.so.5 capstone-5.0.1_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.407 libopencv-4.7.0_1 -libopencv_reg.so.407 libopencv-4.7.0_1 -libopencv_surface_matching.so.407 libopencv-4.7.0_1 -libopencv_xphoto.so.407 libopencv-4.7.0_1 -libopencv_freetype.so.407 libopencv-4.7.0_1 -libopencv_fuzzy.so.407 libopencv-4.7.0_1 -libopencv_hfs.so.407 libopencv-4.7.0_1 -libopencv_img_hash.so.407 libopencv-4.7.0_1 -libopencv_line_descriptor.so.407 libopencv-4.7.0_1 -libopencv_saliency.so.407 libopencv-4.7.0_1 -libopencv_structured_light.so.407 libopencv-4.7.0_1 -libopencv_aruco.so.407 libopencv-4.7.0_1 -libopencv_bgsegm.so.407 libopencv-4.4.7_1 -libopencv_bioinspired.so.407 libopencv-4.7.0_1 -libopencv_ccalib.so.407 libopencv-4.4.7_1 -libopencv_face.so.407 libopencv-4.7.0_1 -libopencv_tracking.so.407 libopencv-4.7.0_1 -libopencv_xfeatures2d.so.407 libopencv-4.7.0_1 -libopencv_optflow.so.407 libopencv-4.4.7_1 -libopencv_ximgproc.so.407 libopencv-4.7.0_1 -libopencv_plot.so.407 libopencv-4.7.0_1 -libopencv_text.so.407 libopencv-4.7.0_1 -libopencv_ml.so.407 libopencv-4.4.7_1 -libopencv_objdetect.so.407 libopencv-4.7.0_1 -libopencv_dnn.so.407 libopencv-4.7.0_1 -libopencv_shape.so.407 libopencv-4.7.0_1 -libopencv_stitching.so.407 libopencv-4.7.0_1 -libopencv_photo.so.407 libopencv-4.7.0_1 -libopencv_video.so.407 libopencv-4.7.0_1 -libopencv_calib3d.so.407 libopencv-4.7.0_1 -libopencv_features2d.so.407 libopencv-4.7.0_1 -libopencv_flann.so.407 libopencv-4.7.0_1 -libopencv_highgui.so.407 libopencv-4.7.0_1 -libopencv_videoio.so.407 libopencv-4.7.0_1 -libopencv_imgcodecs.so.407 libopencv-4.7.0_1 -libopencv_imgproc.so.407 libopencv-4.7.0_1 -libopencv_core.so.407 libopencv-4.7.0_1 -libopencv_superres.so.407 libopencv-4.7.0_1 -libopencv_videostab.so.407 libopencv-4.7.0_1 -libopencv_gapi.so.407 libopencv-4.7.0_1 -libopencv_xobjdetect.so.407 libopencv-4.7.0_1 -libopencv_datasets.so.407 libopencv-4.7.0_1 -libopencv_dnn_objdetect.so.407 libopencv-4.7.0_1 -libopencv_dnn_superres.so.407 libopencv-4.7.0_1 -libopencv_dpm.so.407 libopencv-4.7.0_1 -libopencv_phase_unwrapping.so.407 libopencv-4.7.0_1 -libopencv_stereo.so.407 libopencv-4.7.0_1 -libopencv_rapid.so.407 libopencv-4.7.0_1 -libopencv_intensity_transform.so.407 libopencv-4.7.0_1 -libopencv_alphamat.so.407 libopencv-4.7.0_1 -libopencv_barcode.so.407 libopencv-4.7.0_1 -libopencv_mcc.so.407 libopencv-4.7.0_1 +libopencv_quality.so.412 libopencv-4.12.0_1 +libopencv_reg.so.412 libopencv-4.12.0_1 +libopencv_surface_matching.so.412 libopencv-4.12.0_1 +libopencv_xphoto.so.412 libopencv-4.12.0_1 +libopencv_freetype.so.412 libopencv-4.12.0_1 +libopencv_fuzzy.so.412 libopencv-4.12.0_1 +libopencv_hfs.so.412 libopencv-4.12.0_1 +libopencv_img_hash.so.412 libopencv-4.12.0_1 +libopencv_line_descriptor.so.412 libopencv-4.12.0_1 +libopencv_saliency.so.412 libopencv-4.12.0_1 +libopencv_structured_light.so.412 libopencv-4.12.0_1 +libopencv_aruco.so.412 libopencv-4.12.0_1 +libopencv_bgsegm.so.412 libopencv-4.12.0_1 +libopencv_bioinspired.so.412 libopencv-4.12.0_1 +libopencv_ccalib.so.412 libopencv-4.12.0_1 +libopencv_face.so.412 libopencv-4.12.0_1 +libopencv_tracking.so.412 libopencv-4.12.0_1 +libopencv_xfeatures2d.so.412 libopencv-4.12.0_1 +libopencv_optflow.so.412 libopencv-4.12.0_1 +libopencv_ximgproc.so.412 libopencv-4.12.0_1 +libopencv_plot.so.412 libopencv-4.12.0_1 +libopencv_text.so.412 libopencv-4.12.0_1 +libopencv_ml.so.412 libopencv-4.12.0_1 +libopencv_objdetect.so.412 libopencv-4.12.0_1 +libopencv_dnn.so.412 libopencv-4.12.0_1 +libopencv_shape.so.412 libopencv-4.12.0_1 +libopencv_stitching.so.412 libopencv-4.12.0_1 +libopencv_photo.so.412 libopencv-4.12.0_1 +libopencv_video.so.412 libopencv-4.12.0_1 +libopencv_calib3d.so.412 libopencv-4.12.0_1 +libopencv_features2d.so.412 libopencv-4.12.0_1 +libopencv_flann.so.412 libopencv-4.12.0_1 +libopencv_highgui.so.412 libopencv-4.12.0_1 +libopencv_videoio.so.412 libopencv-4.12.0_1 +libopencv_imgcodecs.so.412 libopencv-4.12.0_1 +libopencv_imgproc.so.412 libopencv-4.12.0_1 +libopencv_core.so.412 libopencv-4.12.0_1 +libopencv_superres.so.412 libopencv-4.12.0_1 +libopencv_videostab.so.412 libopencv-4.12.0_1 +libopencv_gapi.so.412 libopencv-4.12.0_1 +libopencv_xobjdetect.so.412 libopencv-4.12.0_1 +libopencv_datasets.so.412 libopencv-4.12.0_1 +libopencv_dnn_objdetect.so.412 libopencv-4.12.0_1 +libopencv_dnn_superres.so.412 libopencv-4.12.0_1 +libopencv_dpm.so.412 libopencv-4.12.0_1 +libopencv_phase_unwrapping.so.412 libopencv-4.12.0_1 +libopencv_stereo.so.412 libopencv-4.12.0_1 +libopencv_rapid.so.412 libopencv-4.12.0_1 +libopencv_intensity_transform.so.412 libopencv-4.12.0_1 +libopencv_alphamat.so.412 libopencv-4.12.0_1 +libopencv_barcode.so.412 libopencv-4.12.0_1 +libopencv_mcc.so.412 libopencv-4.12.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 diff --git a/srcpkgs/opencv/patches/python3.12.patch b/srcpkgs/opencv/patches/python3.12.patch deleted file mode 100644 index 71d0d55565b..00000000000 --- a/srcpkgs/opencv/patches/python3.12.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 00ca8f455e6a5588d905e3a0b268f18ee3fda5dd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= -Date: Sun, 1 Oct 2023 16:12:25 +0100 -Subject: [PATCH] `numpy.distutils` is removed in numpy 1.26 on Python 3.12. - -so we don't use numpy.distutils to get includes dirs of python-numpy ---- - cmake/OpenCVDetectPython.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake -index 88a434185622..d4098ce8e60d 100644 ---- a/cmake/OpenCVDetectPython.cmake -+++ b/cmake/OpenCVDetectPython.cmake -@@ -216,7 +216,7 @@ if(NOT ${found}) - message(STATUS " PYTHON3_NUMPY_INCLUDE_DIRS") - else() - # Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy -- execute_process(COMMAND "${_executable}" -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))" -+ execute_process(COMMAND "${_executable}" -c "import numpy; print(numpy.get_include())" - RESULT_VARIABLE _numpy_process - OUTPUT_VARIABLE _numpy_include_dirs - OUTPUT_STRIP_TRAILING_WHITESPACE) diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template index 751a961e674..8b8587d37ea 100644 --- a/srcpkgs/opencv/template +++ b/srcpkgs/opencv/template @@ -1,7 +1,7 @@ # Template file for 'opencv' pkgname=opencv -version=4.7.0 -revision=4 +version=4.12.0 +revision=1 create_wrksrc=yes build_wrksrc=${pkgname}-${version} build_style=cmake @@ -19,13 +19,13 @@ makedepends="ffmpeg6-devel libpng-devel libjpeg-turbo-devel tiff-devel python3-numpy python3-devel" short_desc="Computer vision and machine learning software library" maintainer="Orphaned " -license="BSD-3-Clause" +license="Apache-2.0" homepage="https://opencv.org" changelog="https://github.com/opencv/opencv/wiki/ChangeLog" distfiles="https://github.com/opencv/opencv/archive/${version}.tar.gz https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz" -checksum="8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973 - 42df840cf9055e59d0e22c249cfb19f04743e1bdad113d31b1573d3934d62584" +checksum="44c106d5bb47efec04e531fd93008b3fcd1d27138985c5baf4eafac0e1ec9e9d + 4197722b4c5ed42b476d42e29beb29a52b6b25c34ec7b4d589c3ae5145fee98e" patch_args="-Np1 -d ${build_wrksrc}" # tests hang indenfinitely, even with test data included make_check=no @@ -41,10 +41,6 @@ case "$XBPS_TARGET_MACHINE" in ppc*) broken="grfmt_jpeg2000.cpp:380:48: error: lvalue required as unary '&' operand";; esac -post_install() { - vlicense LICENSE -} - libopencv_package() { short_desc+=" - library files" pkg_install() {