From 1fe5d02cfaebb5e1d965996e6526b3516d30403f Mon Sep 17 00:00:00 2001 From: tomcruiseqi <10762123+tomcruiseqi@user.noreply.gitee.com> Date: Mon, 2 Mar 2026 10:43:50 +0800 Subject: [PATCH] Update to 4.9.0 to be compatible with protobuf 25 and openexr 3.4.4 --- download | 4 ++-- opencv.spec | 37 ++++++++++++++----------------------- 2 files changed, 16 insertions(+), 25 deletions(-) diff --git a/download b/download index 3412c72..8002f29 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ 7505c44ca4eb54b4ab1e4777cb96ac05 face_landmark_model.dat -c2225e737ce7f671b839a687f2dc7ab9 opencv-clean-4.8.0.tar.gz -8475e95a77f1b410e0d8b67a3f3c9ee9 opencv_contrib-clean-4.8.0.tar.gz +05422dfb2351b3bbc9e77dd89bc5cdd8 opencv-clean-4.9.0.tar.gz +6819cf4f4d9f849109a84ab18a2fe6fb opencv_contrib-clean-4.9.0.tar.gz diff --git a/opencv.spec b/opencv.spec index 3faaf35..f03148a 100644 --- a/opencv.spec +++ b/opencv.spec @@ -1,5 +1,8 @@ %define anolis_release 1 %undefine __cmake_in_source_build +%global _cmake_cxx_standard 17 +%global python3_pkgversion 3 +%global __python3 /usr/bin/python3 Excludearch: loongarch64 @@ -46,7 +49,7 @@ Excludearch: loongarch64 %endif Name: opencv -Version: 4.8.0 +Version: 4.9.0 %global javaver %(foo=%{version}; echo ${foo//./}) %global majorver %(foo=%{version}; a=(${foo//./ }); echo ${a[0]} ) %global minorver %(foo=%{version}; a=(${foo//./ }); echo ${a[1]} ) @@ -259,6 +262,8 @@ install -pm 0644 %{SOURCE4} .cache/ade/ %build %cmake \ + -DCMAKE_CXX_STANDARD=%{_cmake_cxx_standard} \ + -DCMAKE_CXX_STANDARD_REQUIRED=ON \ -DCV_TRACE=OFF \ -DWITH_IPP=OFF \ -DWITH_ITT=OFF \ @@ -298,7 +303,8 @@ install -pm 0644 %{SOURCE4} .cache/ade/ -DINSTALL_C_EXAMPLES=ON \ -DINSTALL_PYTHON_EXAMPLES=ON \ -DPYTHON3_EXECUTABLE=%{__python3} \ - -DPYTHON3_PACKAGES_PATH=%{python3_sitearch} \ + -DPYTHON3_INCLUDE_DIR=%{_includedir}/python3.11 \ + -DPYTHON3_NUMPY_INCLUDE_DIRS=%{python3_sitearch}/numpy/core/include \ -DOPENCV_GENERATE_SETUPVARS=OFF \ %{!?with_linters: \ -DENABLE_PYLINT=OFF \ @@ -353,21 +359,8 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope %files core %license LICENSE %{_datadir}/licenses/opencv4/ -%{_libdir}/libopencv_calib3d.so.{%{abiver},%{version}} -%{_libdir}/libopencv_core.so.{%{abiver},%{version}} -%{_libdir}/libopencv_dnn.so.{%{abiver},%{version}} -%{_libdir}/libopencv_features2d.so.{%{abiver},%{version}} -%{_libdir}/libopencv_flann.so.{%{abiver},%{version}} -%{_libdir}/libopencv_gapi.so.{%{abiver},%{version}} -%{_libdir}/libopencv_highgui.so.{%{abiver},%{version}} -%{_libdir}/libopencv_imgcodecs.so.{%{abiver},%{version}} -%{_libdir}/libopencv_imgproc.so.{%{abiver},%{version}} -%{_libdir}/libopencv_ml.so.{%{abiver},%{version}} -%{_libdir}/libopencv_objdetect.so.{%{abiver},%{version}} -%{_libdir}/libopencv_photo.so.{%{abiver},%{version}} -%{_libdir}/libopencv_stitching.so.{%{abiver},%{version}} -%{_libdir}/libopencv_video.so.{%{abiver},%{version}} -%{_libdir}/libopencv_videoio.so.{%{abiver},%{version}} +%{_libdir}/libopencv_*.so.%{abiver} +%{_libdir}/libopencv_*.so.%{version} %files devel %dir %{_includedir}/opencv4 @@ -383,7 +376,7 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope %{_datadir}/opencv4/samples %files -n python3-opencv -%{python3_sitearch}/cv2 +%{python3_sitelib}/cv2 %{python3_sitearch}/opencv-*.egg-info %if %{with java} @@ -398,13 +391,8 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope %{_libdir}/libopencv_alphamat.so.{%{abiver},%{version}} %{_libdir}/libopencv_aruco.so.{%{abiver},%{version}} %{_libdir}/libopencv_bgsegm.so.{%{abiver},%{version}} -%{_libdir}/libopencv_sfm.so.{%{abiver},%{version}} -%{_libdir}/libopencv_xfeatures2d.so.{%{abiver},%{version}} %{_libdir}/libopencv_bioinspired.so.{%{abiver},%{version}} %{_libdir}/libopencv_ccalib.so.{%{abiver},%{version}} -%{_libdir}/opencv4/3rdparty/libcorrespondence.a -%{_libdir}/opencv4/3rdparty/libmultiview.a -%{_libdir}/opencv4/3rdparty/libnumeric.a %{?with_cuda: %{_libdir}/libopencv_cuda*.so.{%{abiver},%{version}} @@ -449,6 +437,9 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope %{_libdir}/libopencv_xphoto.so.{%{abiver},%{version}} %changelog +* Mon Mar 02 2026 tomcruiseqi - 4.9.0-1 +- Update to 4.9.0 to be compatible with protobuf 25 and openexr 3.4.4 + * Thu Sep 04 2025 wenxin - 4.8.0-1 - update to 4.8.0 to fix CVE-2023-2618 -- Gitee