diff --git a/download b/download index d09607f15f013b0c8d8b573889150e125f2308ee..285d417d70d8c4bde8d20141791ddaa9dae65edc 100644 --- a/download +++ b/download @@ -1,3 +1 @@ 7505c44ca4eb54b4ab1e4777cb96ac05 face_landmark_model.dat -0f084dfef743cb4906e421992b42b578 opencv-clean-4.7.0.tar.gz -14454b0ca83fe0506b0a0c35a9dc7891 opencv_contrib-clean-4.7.0.tar.gz diff --git a/opencv-clean-4.8.0.tar.gz b/opencv-clean-4.8.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..c86f90f4a5c9a8926531896d997255d8e9525569 Binary files /dev/null and b/opencv-clean-4.8.0.tar.gz differ diff --git a/opencv-clean.sh b/opencv-clean.sh index ffe18877d5e9e054543fd3d2b62c168bdd111745..82789d0efbfd2eec298af323cad904f6fefd9256 100644 --- a/opencv-clean.sh +++ b/opencv-clean.sh @@ -1,10 +1,10 @@ #!/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 -wget -c https://github.com/opencv/opencv_extra/archive/${VERSION}/opencv_extra-${VERSION}.tar.gz +#wget -c https://github.com/opencv/opencv_contrib/archive/${VERSION}/opencv_contrib-${VERSION}.tar.gz +#wget -c https://github.com/opencv/opencv_extra/archive/${VERSION}/opencv_extra-${VERSION}.tar.gz rm -rf opencv-${VERSION}/ tar xf opencv-${VERSION}.tar.gz diff --git a/opencv.spec b/opencv.spec index 09d9e95d5e2e04f3fd47976f0a494764e8a41c82..0baf6ce6f4cd80a19af85351e03002b92001520b 100644 --- a/opencv.spec +++ b/opencv.spec @@ -1,4 +1,4 @@ -%define anolis_release 11 +%define anolis_release 1 %undefine __cmake_in_source_build %bcond_with tests @@ -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]} ) @@ -443,6 +443,9 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope %{_libdir}/libopencv_xphoto.so.{%{abiver},%{version}} %changelog +* Jun Jun 18 2024 pangqing - 4.8.0-1 +- CVE-2023-2617 + * Mon Feb 19 2024 zhongling.h - 4.7.0-11 - rebuild with tbb-2021.11.0 diff --git a/opencv_contrib-clean-4.8.0.tar.gz b/opencv_contrib-clean-4.8.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..624126c3c7a5711652f54f574d6e0a7eb707ca0c Binary files /dev/null and b/opencv_contrib-clean-4.8.0.tar.gz differ