From f896e000912f99127c5b6c0b384ba6312d67d2dd Mon Sep 17 00:00:00 2001 From: Aline Gondim Santos <aline.gondimsantos@savoirfairelinux.com> Date: Thu, 28 Jul 2022 09:43:51 -0300 Subject: [PATCH] misc: bump opencv Change-Id: Ifcc608b33e2edd73070d33476c8e006ff5f8f31d --- contrib/src/opencv/SHA512SUMS | 2 +- contrib/src/opencv/rules.mak | 5 +++-- contrib/src/opencv_contrib/SHA512SUMS | 2 +- contrib/src/opencv_contrib/rules.mak | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/contrib/src/opencv/SHA512SUMS b/contrib/src/opencv/SHA512SUMS index 1635f6e72c..4446a64573 100644 --- a/contrib/src/opencv/SHA512SUMS +++ b/contrib/src/opencv/SHA512SUMS @@ -1 +1 @@ -80fa48d992ca06a2a4ab6740df6d8c21f4926165486b393969da2c5bbe2f3a0b799fb76dee5e3654e90c743e49bbd2b5b02ad59a4766896bbf4cd5b4e3251e0f opencv-4.1.1.tar.gz +93d7807794682990b6a1d1de1851986ae3c5d1afe6605f3f8cace03ba5e3390bee2568bc0f335af34d3fc974df64cbce0ce685261ec2abd693d259b97b15bc46 opencv-4.6.0.tar.gz diff --git a/contrib/src/opencv/rules.mak b/contrib/src/opencv/rules.mak index 55395f2ef1..f13cfbd82a 100644 --- a/contrib/src/opencv/rules.mak +++ b/contrib/src/opencv/rules.mak @@ -1,11 +1,12 @@ # OPENCV -OPENCV_VERSION := 4.1.1 -OPENCV_CONTRIB_VERSION := 4.1.1 +OPENCV_VERSION := 4.6.0 +OPENCV_CONTRIB_VERSION := 4.6.0 OPENCV_URL := https://github.com/opencv/opencv/archive/$(OPENCV_VERSION).tar.gz DEPS_opencv += opencv_contrib OPENCV_CMAKECONF := \ + -DWITH_FFMPEG=OFF \ -DCMAKE_BUILD_TYPE=RELEASE \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=no \ diff --git a/contrib/src/opencv_contrib/SHA512SUMS b/contrib/src/opencv_contrib/SHA512SUMS index eb45790ea0..4bc54cc0cc 100644 --- a/contrib/src/opencv_contrib/SHA512SUMS +++ b/contrib/src/opencv_contrib/SHA512SUMS @@ -1 +1 @@ -8af13f0a5f350360316662c1ce5e58c21d906a58591acfbd575a8dacde19b6f3bbd694c3c199feb35c33549cf8c37e3fb4c494b586a00ad29fe3b4aeeb2d22ab opencv_contrib-4.1.1.tar.gz +2e9cc9632774babf59cd186cd7b7edbd35a816bdda2acb51339c514a33fc6d8c3f1687eb3b0f6827304e3fcb0f9f3e81d47e8ab08239175750ac1240cc99dc5d opencv_contrib-4.6.0.tar.gz diff --git a/contrib/src/opencv_contrib/rules.mak b/contrib/src/opencv_contrib/rules.mak index 9ee88bb4a0..4d6f6ca100 100644 --- a/contrib/src/opencv_contrib/rules.mak +++ b/contrib/src/opencv_contrib/rules.mak @@ -1,5 +1,5 @@ # OPENCV_CONTRIB -OPENCV_CONTRIB_VERSION := 4.1.1 +OPENCV_CONTRIB_VERSION := 4.6.0 OPENCV_CONTRIB_URL := https://github.com/opencv/opencv_contrib/archive/$(OPENCV_CONTRIB_VERSION).tar.gz $(TARBALLS)/opencv_contrib-$(OPENCV_CONTRIB_VERSION).tar.gz: -- GitLab