[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch wip-desktop updated: gnu: opencv: Fix build with new version of j
From: |
guix-commits |
Subject: |
branch wip-desktop updated: gnu: opencv: Fix build with new version of jasper. |
Date: |
Fri, 14 Aug 2020 10:09:43 -0400 |
This is an automated email from the git hooks/post-receive script.
dannym pushed a commit to branch wip-desktop
in repository guix.
The following commit(s) were added to refs/heads/wip-desktop by this push:
new d88122a gnu: opencv: Fix build with new version of jasper.
d88122a is described below
commit d88122a2f2b2afd38b055f469ea6032e1814b46e
Author: Raghav Gururajan <raghavgururajan@disroot.org>
AuthorDate: Fri Aug 14 04:24:26 2020 -0400
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 | 56 ++++++++++++++++++++++-----------------
1 file changed, 32 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/image-processing.scm
b/gnu/packages/image-processing.scm
index 829cec5..b9eb324 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -243,8 +243,8 @@ integrates with various databases on GUI toolkits such as
Qt and Tk.")
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/opencv/opencv")
- (commit version)))
+ (url "https://github.com/opencv/opencv")
+ (commit version)))
(file-name (git-file-name name version))
(sha256
(base32
@@ -268,7 +268,7 @@ integrates with various databases on GUI toolkits such as
Qt and Tk.")
`(#:configure-flags
(list "-DWITH_IPP=OFF"
"-DWITH_ITT=OFF"
- "-DWITH_CAROTENE=OFF" ; only visible on arm/aarch64
+ "-DWITH_CAROTENE=OFF" ; only visible on arm/aarch64
"-DENABLE_PRECOMPILED_HEADERS=OFF"
;; CPU-Features:
@@ -356,25 +356,33 @@ 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
- ;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to
- ;; the CPATH to satisfy the dependency on "ImathVec.h".
- (setenv "CPATH"
- (string-append (assoc-ref inputs "ilmbase")
- "/include/OpenEXR"
- ":" (or (getenv "CPATH") "")))
- #t))
- (add-before 'check 'start-xserver
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((xorg-server (assoc-ref inputs "xorg-server"))
- (disp ":1"))
- (setenv "HOME" (getcwd))
- (setenv "DISPLAY" disp)
- ;; There must be a running X server and make check doesn't start
one.
- ;; Therefore we must do it.
- (zero? (system (format #f "~a/bin/Xvfb ~a &" xorg-server
disp)))))))))
+ ;; OpenEXR propagates ilmbase, but its include files do not appear
+ ;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to
+ ;; the CPATH to satisfy the dependency on "ImathVec.h".
+ (setenv "CPATH"
+ (string-append (assoc-ref inputs "ilmbase")
+ "/include/OpenEXR"
+ ":" (or (getenv "CPATH") "")))
+ #t))
+ (add-before 'check 'start-xserver
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((xorg-server (assoc-ref inputs "xorg-server"))
+ (disp ":1"))
+ (setenv "HOME" (getcwd))
+ (setenv "DISPLAY" disp)
+ ;; There must be a running X server and make check doesn't
start one.
+ ;; Therefore we must do it.
+ (zero? (system (format #f "~a/bin/Xvfb ~a &" xorg-server
disp)))))))))
(native-inputs
`(("pkg-config" ,pkg-config)
("xorg-server" ,xorg-server-for-tests) ; For running the tests
@@ -382,8 +390,8 @@ integrates with various databases on GUI toolkits such as
Qt and Tk.")
,(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/opencv/opencv_extra")
- (commit version)))
+ (url "https://github.com/opencv/opencv_extra")
+ (commit version)))
(file-name (git-file-name "opencv_extra" version))
(sha256
(base32 "08p5xnq8n1jw8svvz0fnirfg7q8dm3p4a5dl7527s5xj0f9qn7lp"))))
@@ -391,8 +399,8 @@ integrates with various databases on GUI toolkits such as
Qt and Tk.")
,(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/opencv/opencv_contrib")
- (commit version)))
+ (url "https://github.com/opencv/opencv_contrib")
+ (commit version)))
(file-name (git-file-name "opencv_contrib" version))
(patches (search-patches "opencv-rgbd-aarch64-test-fix.patch"))
(sha256
- branch wip-desktop updated: gnu: opencv: Fix build with new version of jasper.,
guix-commits <=