summary refs log tree commit diff
path: root/gnu/packages/image-processing.scm
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2019-01-14 11:32:02 +0200
committerEfraim Flashner <efraim@flashner.co.il>2019-01-14 15:07:42 +0200
commit8e21fa0bd347117ae907827272f95cf4647a0af7 (patch)
tree150a25575c94f2d1c74ddee9e39ec57a9f5bffc3 /gnu/packages/image-processing.scm
parentfdeb2def6a65887113ce77af1be1fef4d156caa7 (diff)
downloadguix-8e21fa0bd347117ae907827272f95cf4647a0af7.tar.gz
gnu: opencv: Loosen test suite failures.
* gnu/packages/image-processing.scm (opencv)[native-inputs]: Add patch
to opencv-contrib.
[arguments]: Update 'unpack-submodule-sources phase.
* gnu/packages/patches/opencv-rgbd-aarch64-test-fix.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
Diffstat (limited to 'gnu/packages/image-processing.scm')
-rw-r--r--gnu/packages/image-processing.scm9
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 792259c087..68bcfed996 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -322,9 +322,13 @@ integrates with various databases on GUI toolkits such as Qt and Tk.")
              (let ((unpack (lambda (source target)
                              (with-directory-excursion target
                                (apply invoke "unzip"
-                                      (list (assoc-ref inputs source)))))))
+                                      (list (assoc-ref inputs source))))))
+                   (untar (lambda (source target)
+                            (with-directory-excursion target
+                              (apply invoke "tar" "xvf"
+                                     (list (assoc-ref inputs source)))))))
                (unpack "opencv-extra" "../opencv-extra")
-               (unpack "opencv-contrib" "../opencv-contrib"))))
+               (untar "opencv-contrib" "../opencv-contrib"))))
 
          (add-after 'set-paths 'add-ilmbase-include-path
            (lambda* (#:key inputs #:allow-other-keys)
@@ -363,6 +367,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.")
            (uri (string-append "https://codeload.github.com/"
                                "opencv/opencv_contrib/zip/" version))
            (file-name (string-append "opencv-contrib-" version ".zip"))
+           (patches (search-patches "opencv-rgbd-aarch64-test-fix.patch"))
            (sha256
            (base32 "0j0ci6ia1qwklp9hq07ypl0vkngj1wrgh6n98n657m5d0pyp4m0g"))))))
     (inputs `(("libjpeg" ,libjpeg)