From 5894b1210d689ec408db21184b85b0a6a1a5ca3e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 20 Dec 2021 23:19:41 +0100 Subject: gnu: opencv: Update to 4.5.4. * gnu/packages/patches/opencv-fix-build-of-grfmt_jpeg2000.cpp.patch: Delete file. * gnu/packages/patches/opencv-rgbd-aarch64-test-fix.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove patches. * gnu/packages/image-processing.scm (opencv): Update to 4.5.4. [source]: Remove patch; keep bundled quirc. [arguments]: Build without ade; update build phase 'disable-broken-tests; remove build phase 'add-ilmbase-include-path. [native-inputs]: Update source hashes for opencv-contrib and opencv-extra. [inputs]: Use new style; add imath and openblas; replace openexr-2 with openexr. [description]: Reformat first paragraph. --- .../opencv-fix-build-of-grfmt_jpeg2000.cpp.patch | 39 --------------------- .../patches/opencv-rgbd-aarch64-test-fix.patch | 40 ---------------------- 2 files changed, 79 deletions(-) delete mode 100644 gnu/packages/patches/opencv-fix-build-of-grfmt_jpeg2000.cpp.patch delete mode 100644 gnu/packages/patches/opencv-rgbd-aarch64-test-fix.patch (limited to 'gnu/packages/patches') diff --git a/gnu/packages/patches/opencv-fix-build-of-grfmt_jpeg2000.cpp.patch b/gnu/packages/patches/opencv-fix-build-of-grfmt_jpeg2000.cpp.patch deleted file mode 100644 index 8deb60296a..0000000000 --- a/gnu/packages/patches/opencv-fix-build-of-grfmt_jpeg2000.cpp.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Tobias Geerinckx-Rice -Date: Thu, 13 Aug 2020 15:21:30 +0200 -Subject: [PATCH] gnu: opencv: Fix build with Jasper 2.0.19. - -Taken verbatim from upstream: . - -From f66fc199a20882c546fa31142e9c0f5a8b3cf983 Mon Sep 17 00:00:00 2001 -From: Florian Jung -Date: Wed, 29 Jul 2020 18:51:55 +0200 -Subject: [PATCH] Fix build of grfmt_jpeg2000.cpp - -libjasper has recently changed `jas_matrix_get` from a macro to an inline function -(389951d071 in https://github.com/jasper-software/jasper), causing the build to fail. ---- - modules/imgcodecs/src/grfmt_jpeg2000.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules/imgcodecs/src/grfmt_jpeg2000.cpp b/modules/imgcodecs/src/grfmt_jpeg2000.cpp -index fe69f80c86f..0f4d28d6f4d 100644 ---- a/modules/imgcodecs/src/grfmt_jpeg2000.cpp -+++ b/modules/imgcodecs/src/grfmt_jpeg2000.cpp -@@ -377,7 +377,7 @@ bool Jpeg2KDecoder::readComponent8u( uchar *data, void *_buffer, - - for( y = 0; y < yend - ystart; ) - { -- jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 ); -+ jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 ); - uchar* dst = data + (y - yoffset) * step - xoffset; - - if( xstep == 1 ) -@@ -443,7 +443,7 @@ bool Jpeg2KDecoder::readComponent16u( unsigned short *data, void *_buffer, - - for( y = 0; y < yend - ystart; ) - { -- jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 ); -+ jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 ); - ushort* dst = data + (y - yoffset) * step - xoffset; - - if( xstep == 1 ) diff --git a/gnu/packages/patches/opencv-rgbd-aarch64-test-fix.patch b/gnu/packages/patches/opencv-rgbd-aarch64-test-fix.patch deleted file mode 100644 index 7792f8d1bf..0000000000 --- a/gnu/packages/patches/opencv-rgbd-aarch64-test-fix.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://github.com/opencv/opencv_contrib/commit/8aaa91c3dc835690477d7777e66948dbf5a87edc.patch - -From 8aaa91c3dc835690477d7777e66948dbf5a87edc Mon Sep 17 00:00:00 2001 -From: Tomoaki Teshima -Date: Mon, 5 Nov 2018 20:32:23 +0900 -Subject: [PATCH] avoid test failing on Aarch64 * loosen the threshold in - Rgbd_Normals.compute * make the minimum tvec larger in - RGBD_Odometry_Rgbd.algorithmic - ---- - modules/rgbd/test/test_normal.cpp | 2 +- - modules/rgbd/test/test_odometry.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules/rgbd/test/test_normal.cpp b/modules/rgbd/test/test_normal.cpp -index f2233553a7..ed54f2cd98 100644 ---- a/modules/rgbd/test/test_normal.cpp -+++ b/modules/rgbd/test/test_normal.cpp -@@ -211,7 +211,7 @@ class CV_RgbdNormalsTest: public cvtest::BaseTest - std::cout << std::endl << "*** FALS" << std::endl; - errors[0][0] = 0.006f; - errors[0][1] = 0.03f; -- errors[1][0] = 0.00008f; -+ errors[1][0] = 0.0001f; - errors[1][1] = 0.02f; - break; - case 1: -diff --git a/modules/rgbd/test/test_odometry.cpp b/modules/rgbd/test/test_odometry.cpp -index 62b654a1ec..f5a2084504 100644 ---- a/modules/rgbd/test/test_odometry.cpp -+++ b/modules/rgbd/test/test_odometry.cpp -@@ -213,7 +213,7 @@ void CV_OdometryTest::generateRandomTransformation(Mat& rvec, Mat& tvec) - normalize(rvec, rvec, rng.uniform(0.007f, maxRotation)); - - randu(tvec, Scalar(-1000), Scalar(1000)); -- normalize(tvec, tvec, rng.uniform(0.007f, maxTranslation)); -+ normalize(tvec, tvec, rng.uniform(0.008f, maxTranslation)); - } - - void CV_OdometryTest::run(int) -- cgit v1.2.3