From 49299e0c059b75342efcdcf19fe06ee71734d77c Mon Sep 17 00:00:00 2001 From: Matthew Oliver Date: Wed, 18 Jan 2023 06:35:29 +1100 Subject: [PATCH] [opencv4] Update to 4.7.0. (#28949) * [opencv4] Update t 4.7.0. * update versions. * [rtabmap] Support opencv 4.7. * Update versions. --- ports/opencv/vcpkg.json | 2 +- ports/opencv4/0013-fix-ceres.patch | 11 ----------- ports/opencv4/0014-fix-ogre.patch | 12 ------------ .../opencv4/0017-mingw-strsafe-no-deprecate.patch | 15 --------------- ports/opencv4/portfile.cmake | 7 ++----- ports/opencv4/vcpkg.json | 3 +-- versions/baseline.json | 6 +++--- versions/o-/opencv.json | 5 +++++ versions/o-/opencv4.json | 5 +++++ 9 files changed, 17 insertions(+), 49 deletions(-) delete mode 100644 ports/opencv4/0013-fix-ceres.patch delete mode 100644 ports/opencv4/0014-fix-ogre.patch delete mode 100644 ports/opencv4/0017-mingw-strsafe-no-deprecate.patch diff --git a/ports/opencv/vcpkg.json b/ports/opencv/vcpkg.json index 9c2fe46483..f28500958e 100644 --- a/ports/opencv/vcpkg.json +++ b/ports/opencv/vcpkg.json @@ -1,6 +1,6 @@ { "name": "opencv", - "version": "4.6.0", + "version": "4.7.0", "description": "Computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", diff --git a/ports/opencv4/0013-fix-ceres.patch b/ports/opencv4/0013-fix-ceres.patch deleted file mode 100644 index c8acb16101..0000000000 --- a/ports/opencv4/0013-fix-ceres.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/modules/sfm/src/libmv_light/libmv/simple_pipeline/bundle.cc -+++ b/modules/sfm/src/libmv_light/libmv/simple_pipeline/bundle.cc -@@ -549,7 +549,7 @@ void EuclideanBundleCommonIntrinsics( - - if (bundle_constraints & BUNDLE_NO_TRANSLATION) { - #if CERES_VERSION_MAJOR >= 3 || (CERES_VERSION_MAJOR >= 2 && CERES_VERSION_MINOR >= 1) -- problem.SetParameterization(current_camera_R_t, -+ problem.SetManifold(current_camera_R_t, - constant_translation_manifold); - #else - problem.SetParameterization(current_camera_R_t, diff --git a/ports/opencv4/0014-fix-ogre.patch b/ports/opencv4/0014-fix-ogre.patch deleted file mode 100644 index 8f2da1508a..0000000000 --- a/ports/opencv4/0014-fix-ogre.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/modules/ovis/src/ovis.cpp -+++ b/modules/ovis/src/ovis.cpp -@@ -453,7 +453,8 @@ class WindowSceneImpl : public WindowScene - if(tus->getTextureName() != name) - { - RTShader::ShaderGenerator::getSingleton().invalidateMaterial( -- RTShader::ShaderGenerator::DEFAULT_SCHEME_NAME, *bgplane->getMaterial()); -+ RTShader::ShaderGenerator::DEFAULT_SCHEME_NAME, bgplane->getMaterial()->getName(), -+ RESOURCEGROUP_NAME); - - tus->setTextureName(name); - tus->setTextureAddressingMode(TAM_CLAMP); diff --git a/ports/opencv4/0017-mingw-strsafe-no-deprecate.patch b/ports/opencv4/0017-mingw-strsafe-no-deprecate.patch deleted file mode 100644 index 6e56fee24c..0000000000 --- a/ports/opencv4/0017-mingw-strsafe-no-deprecate.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/modules/videoio/src/cap_dshow.cpp -+++ b/modules/videoio/src/cap_dshow.cpp -@@ -90,8 +90,11 @@ Thanks to: - - #if defined(__clang__) // clang or MSVC clang - #pragma clang diagnostic ignored "-Wnon-virtual-dtor" --#elif defined(__GNUC__) // MinGW -+#elif defined(__GNUC__) // gcc - #pragma GCC diagnostic ignored "-Wnon-virtual-dtor" -+#endif -+ -+#ifdef __MINGW32__ - #define STRSAFE_NO_DEPRECATE - #endif - diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 9f82e1f6f0..81af447e95 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF ${OPENCV_VERSION} - SHA512 93d7807794682990b6a1d1de1851986ae3c5d1afe6605f3f8cace03ba5e3390bee2568bc0f335af34d3fc974df64cbce0ce685261ec2abd693d259b97b15bc46 + SHA512 f799e1eb4ef1eb81212319cf908d0a64d2d5179c8da86b919b06e96a6870a9f3ed33251223a841b71711349018ea6782c174179fa59958a1573e22d11cc9347d FILE_DISAMBIGUATOR 1 HEAD_REF master PATCHES @@ -23,7 +23,6 @@ vcpkg_from_github( 0011-remove-python2.patch 0012-fix-zlib.patch 0015-fix-freetype.patch - 0017-mingw-strsafe-no-deprecate.patch ) # Disallow accidental build of vendored copies file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr") @@ -164,12 +163,10 @@ if("contrib" IN_LIST FEATURES) OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO opencv/opencv_contrib REF ${OPENCV_VERSION} - SHA512 2e9cc9632774babf59cd186cd7b7edbd35a816bdda2acb51339c514a33fc6d8c3f1687eb3b0f6827304e3fcb0f9f3e81d47e8ab08239175750ac1240cc99dc5d + SHA512 f0d878180655de4255cb72cf358a5949dfcf53a386e74f9a743902ac1bae12b2e812a1fc4ecc56a6afdc6adbffec867883a3245ce0b527614cc76e3710e23230 HEAD_REF master PATCHES 0007-fix-hdf5.patch - 0013-fix-ceres.patch - 0014-fix-ogre.patch 0016-fix-freetype-contrib.patch 0018-fix-depend-tesseract.patch ) diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 982756e551..046d01bc85 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencv4", - "version": "4.6.0", - "port-version": 10, + "version": "4.7.0", "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index e9fc8f8569..421b2ee951 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5561,7 +5561,7 @@ "port-version": 0 }, "opencv": { - "baseline": "4.6.0", + "baseline": "4.7.0", "port-version": 0 }, "opencv2": { @@ -5573,8 +5573,8 @@ "port-version": 6 }, "opencv4": { - "baseline": "4.6.0", - "port-version": 10 + "baseline": "4.7.0", + "port-version": 0 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/o-/opencv.json b/versions/o-/opencv.json index 0916046027..531e5b0f41 100644 --- a/versions/o-/opencv.json +++ b/versions/o-/opencv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "562bbf3bc1027e73456d71a10020ba984eec0eb1", + "version": "4.7.0", + "port-version": 0 + }, { "git-tree": "135db832c720c800e2ac222994aa216df7575d17", "version": "4.6.0", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 1ccda2115d..e3b36b6ee5 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59d3985dfc44ac8279bb474e81f314aa29faf9b6", + "version": "4.7.0", + "port-version": 0 + }, { "git-tree": "4ddfc66a3d38c96fbe831242cdd1148d54cbca87", "version": "4.6.0",