diff --git a/download b/download index d09607f15f013b0c8d8b573889150e125f2308ee..3412c72e90b3d55d754dfb60781feb71068d7cd8 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ 7505c44ca4eb54b4ab1e4777cb96ac05 face_landmark_model.dat -0f084dfef743cb4906e421992b42b578 opencv-clean-4.7.0.tar.gz -14454b0ca83fe0506b0a0c35a9dc7891 opencv_contrib-clean-4.7.0.tar.gz +c2225e737ce7f671b839a687f2dc7ab9 opencv-clean-4.8.0.tar.gz +8475e95a77f1b410e0d8b67a3f3c9ee9 opencv_contrib-clean-4.8.0.tar.gz diff --git a/opencv-clean.sh b/opencv-clean.sh index ffe18877d5e9e054543fd3d2b62c168bdd111745..5fa676f77da958c3f1193fc98502d4ffbb7e3edf 100644 --- a/opencv-clean.sh +++ b/opencv-clean.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=4.7.0 +VERSION=4.8.0 wget -c https://github.com/opencv/opencv/archive/${VERSION}/opencv-${VERSION}.tar.gz wget -c https://github.com/opencv/opencv_contrib/archive/${VERSION}/opencv_contrib-${VERSION}.tar.gz diff --git a/opencv.spec b/opencv.spec index 09d9e95d5e2e04f3fd47976f0a494764e8a41c82..47a388228b650e3f5bc1f3bfa0636dce587c87c6 100644 --- a/opencv.spec +++ b/opencv.spec @@ -1,11 +1,11 @@ -%define anolis_release 11 +%define anolis_release 1 %undefine __cmake_in_source_build %bcond_with tests %if %{without tests} %bcond_with extras_tests %else -%bcond_with extras_tests +%bcond_without extras_tests %endif %bcond_with linters %bcond_with ffmpeg @@ -44,7 +44,7 @@ %endif Name: opencv -Version: 4.7.0 +Version: 4.8.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]} ) @@ -146,7 +146,7 @@ BuildRequires: blas-devel BuildRequires: lapack-devel } %{?with_gdcm:BuildRequires: gdcm-devel} -%{?with_libmfx:BuildRequires: libmfx-devel} +%{?with_libmfx:BuildRequires: oneVPL-devel} %{?with_clp:BuildRequires: coin-or-Clp-devel} %{?with_va:BuildRequires: libva-devel} %{?with_java: @@ -230,13 +230,12 @@ to provide decent performance and stability. %prep %setup -q -a1 %{?with_extras_tests:-a2} -%if 1 + pushd 3rdparty shopt -s extglob -rm -r !(openvx|quirc) +rm -r !(openvx|quirc|flatbuffers) shopt -u extglob popd &>/dev/null -%endif %patch -P 0 -p1 -b .install_3rdparty_licenses %patch -P 3 -p1 -b .python_install_binary @@ -274,7 +273,7 @@ install -pm 0644 %{SOURCE4} .cache/ade/ %ifarch x86_64 %{ix86} -DCPU_BASELINE=SSE2 \ %endif - -DCMAKE_BUILD_TYPE=ReleaseWithDebInfo \ + -DCMAKE_BUILD_TYPE=Release \ %{?with_java: -DBUILD_opencv_java=ON \ -DOPENCV_JAR_INSTALL_PATH=%{_jnidir} } \ %{!?with_java: -DBUILD_opencv_java=OFF } \ @@ -305,7 +304,7 @@ install -pm 0644 %{SOURCE4} .cache/ade/ } \ -DBUILD_PROTOBUF=OFF \ -DPROTOBUF_UPDATE_FILES=ON \ -%{?with_opencl: -DOPENCL_INCLUDE_DIR=%{_includedir}/CL } \ +%{?with_opencl: -DOPENCL_INCLUDE_DIR=%{_includedir}/CL -DOPENCV_DNN_OPENCL=ON} \ %{!?with_opencl: -DWITH_OPENCL=OFF } \ -DOPENCV_EXTRA_MODULES_PATH=opencv_contrib-%{version}/modules \ -DWITH_LIBV4L=ON \ @@ -314,7 +313,7 @@ install -pm 0644 %{SOURCE4} .cache/ade/ -DOPENCV_GENERATE_PKGCONFIG=ON \ %{?with_extras_tests: -DOPENCV_TEST_DATA_PATH=opencv_extra-%{version}/testdata} \ %{?with_gdcm: -DWITH_GDCM=ON } \ - %{?with_libmfx: -DWITH_MFX=ON } \ + %{?with_libmfx: -DWITH_MFX=ON -DWITH_GAPI_ONEVPL=ON} \ %{?with_clp: -DWITH_CLP=ON } \ %{?with_va: -DWITH_VA=ON } \ %{!?with_vtk: -DWITH_VTK=OFF} \ @@ -397,7 +396,7 @@ 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_barcode.so.{%{abiver},%{version}} +#%%{_libdir}/libopencv_barcode.so.{#%%{abiver},#%%{version}} %{_libdir}/libopencv_bioinspired.so.{%{abiver},%{version}} %{_libdir}/libopencv_ccalib.so.{%{abiver},%{version}} %{?with_cuda: @@ -443,6 +442,9 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope %{_libdir}/libopencv_xphoto.so.{%{abiver},%{version}} %changelog +* Thu Jun 12 2025 Cheng Yang - 4.8.0-1 +- update tp 4.8.0 to fix CVE-2023-2618 + * Mon Feb 19 2024 zhongling.h - 4.7.0-11 - rebuild with tbb-2021.11.0