From: Tae-Young Chung Date: Mon, 17 Jan 2022 07:17:24 +0000 (+0900) Subject: Bump to 4.5.3 X-Git-Tag: submit/tizen/20220120.021815^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F99%2F269499%2F1;p=platform%2Fupstream%2Fopencv.git Bump to 4.5.3 [Version] 4.5.3 [Issue type] Upgrade Change-Id: I4601ab0339a18cfcc38ded09d7e032a05036c5bc Signed-off-by: Tae-Young Chung --- diff --git a/packaging/opencv-contrib-4.5.0.tar.gz b/packaging/opencv-contrib-4.5.0.tar.gz deleted file mode 100644 index 0da7abd039..0000000000 Binary files a/packaging/opencv-contrib-4.5.0.tar.gz and /dev/null differ diff --git a/packaging/opencv-contrib-4.5.3.tar.gz b/packaging/opencv-contrib-4.5.3.tar.gz new file mode 100644 index 0000000000..b09d2e6ccd Binary files /dev/null and b/packaging/opencv-contrib-4.5.3.tar.gz differ diff --git a/packaging/opencv.spec b/packaging/opencv.spec index 300b029e0d..1c922935ea 100644 --- a/packaging/opencv.spec +++ b/packaging/opencv.spec @@ -1,11 +1,11 @@ Name: opencv Summary: OpenCV library -Version: 4.5.0 -Release: 2 +Version: 4.5.3 +Release: 0 Group: Development/Libraries License: Apache-2.0 and BSD-3-Clause Source0: %{name}-%{version}.tar.gz -Source100: opencv-contrib-4.5.0.tar.gz +Source100: opencv-contrib-%{version}.tar.gz # In cmake/OpenCVDetectPython.cmake, python packages are installed # in lib/ regardless of i586, armv7l, x86_64, aarch64 # So, this patch installs the python packages in: @@ -139,7 +139,7 @@ cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_opencv_optflow=OFF \ -DBUILD_opencv_ovis=OFF \ -DBUILD_opencv_phase_unwrapping=OFF \ - -DBUILD_opencv_plot=OFF \ + -DBUILD_opencv_plot=ON \ -DBUILD_opencv_quality=OFF \ -DBUILD_opencv_reg=OFF \ -DBUILD_opencv_rgbd=OFF \ @@ -159,6 +159,12 @@ cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_opencv_ximgproc=OFF \ -DBUILD_opencv_xobjdetect=OFF \ -DBUILD_opencv_xphoto=OFF \ + -DBUILD_opencv_wechat_qrcode=OFF \ + -DBUILD_opencv_barcode=OFF \ + -DBUILD_opencv_intensity_transform=OFF \ + -DBUILD_opencv_mcc=OFF \ + -DBUILD_opencv_rapid=OFF \ + -DOPENCV_FORCE_3RDPARTY_BUILD=OFF \ -DBUILD_ZLIB=OFF \ -DBUILD_TIFF=OFF \ -DBUILD_JASPER=OFF \ @@ -167,6 +173,7 @@ cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_WEBP=OFF \ -DBUILD_OPENEXR=OFF \ -DBUILD_TBB=OFF \ + -DBUILD_OPENJPEG=OFF \ -DBUILD_SHARED_LIBS=ON \ -DBUILD_opencv_apps=OFF \ -DBUILD_opencv_js=OFF \ @@ -200,6 +207,7 @@ cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_INTELPERC=OFF \ -DWITH_IPP=OFF \ -DWITH_JASPER=OFF \ + -DWITH_OPENJPEG=OFF \ -DWITH_WEBP=OFF \ -DWITH_MSMF=OFF \ -DWITH_NVCUVID=OFF \ @@ -230,6 +238,7 @@ cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_LAPACK=OFF \ -DWITH_OPENVX=OFF \ -DWITH_PROTOBUF=ON \ + -DWITH_ADE=OFF \ -DINSTALL_C_EXAMPLES=OFF \ -DINSTALL_PYTHON_EXAMPLES=OFF \ -DINSTALL_TESTS=OFF \ @@ -311,6 +320,7 @@ fi %if "%{?profile}" != "tv" %files -n python3-opencv %{python3_sitearch}/cv2/*.py +%{python3_sitearch}/cv2/*/*.py %{python3_sitearch}/cv2/*/*.so %endif