guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: Revert "gnu: opencv: Fix build with new version of jasper."


From: guix-commits
Subject: 01/02: Revert "gnu: opencv: Fix build with new version of jasper."
Date: Fri, 14 Aug 2020 12:08:04 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit 58410eb4025881d28a4c3aa1f92018b94b7f3032
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Fri Aug 14 17:51:20 2020 +0200

    Revert "gnu: opencv: Fix build with new version of jasper."
    
    This reverts commit 2759d4ca74ff4846b79c406c000b64dc2f2ed0ac.  The
    substitution, it does nothing!  (We already applied an upstream patch).
---
 gnu/packages/image-processing.scm | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/gnu/packages/image-processing.scm 
b/gnu/packages/image-processing.scm
index b93ad16..52e0311 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -358,14 +358,6 @@ 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]