branch master updated: gnu: opencv: Fix build with new version of jasper.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

dannym pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 2759d4c  gnu: opencv: Fix build with new version of jasper.
2759d4c is described below

commit 2759d4ca74ff4846b79c406c000b64dc2f2ed0ac
Author: Raghav Gururajan <raghavgururajan@disroot.org>
AuthorDate: Fri Aug 14 16:08:17 2020 +0200

    gnu: opencv: Fix build with new version of jasper.
    
    * gnu/packages/image-processing.scm (opencv): Fix build failure.
    [arguments]<#:phases>[fix-jasper]: New phase.
    
    Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
 gnu/packages/image-processing.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/image-processing.scm 
b/gnu/packages/image-processing.scm
index 52e0311..b93ad16 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -358,6 +358,14 @@ integrates with various databases on GUI toolkits such as 
Qt and Tk.")
                      "--strip-components=1"
                      "-C" "../opencv-contrib")))
 
+         (add-after 'unpack 'fix-jasper
+           (lambda _
+             ;; See <https://github.com/opencv/opencv/pull/17983>.
+             (substitute* "modules/imgcodecs/src/grfmt_jpeg2000.cpp"
+               (("&jas_matrix_get")
+                "jas_matrix_getref"))
+             #t))
+
          (add-after 'set-paths 'add-ilmbase-include-path
            (lambda* (#:key inputs #:allow-other-keys)
            ;; OpenEXR propagates ilmbase, but its include files do not appear