ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 22:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: opencv: Update to 4.8.0

Browse source 
* gnu/packages/image-processing.scm (opencv): Update to 4.8.0
[arguments](configure-flags): Turn off flagbuffer support as build fails with
that.
[#:phases](disable-broken-tests): Increase tolerance for one test failure on
x86-64
[inputs]: Add eigen, opencl-headers and openmpi

Signed-off-by: Christopher Baines <mail@cbaines.net>
This commit is contained in:
Andy Tai 2023-08-19 01:18:43 -07:00 committed by Christopher Baines
parent 02e32197a8
commit 43b3500620
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gnu/packages/image-processing.scm
View file

@ -81,6 +81,7 @@ (define-module (gnu packages image-processing)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages mpi) #:use-module (gnu packages mpi)
#:use-module (gnu packages opencl)
#:use-module (gnu packages pdf) #:use-module (gnu packages pdf)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages photo) #:use-module (gnu packages photo)
@ -492,7 +493,7 @@ (define-public vtk-7
(define-public opencv (define-public opencv
(package (package
(name "opencv") (name "opencv")
(version "4.7.0") (version "4.8.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -508,6 +509,7 @@ (define-public opencv
(for-each delete-file-recursively (for-each delete-file-recursively
'("carotene" '("carotene"
"cpufeatures" "cpufeatures"
"flatbuffers"
"ffmpeg" "ffmpeg"
"include" "include"
"ippicv" "ippicv"
@ -531,7 +533,7 @@ (define-public opencv
(for-each delete-file (find-files "." "\\.jar$")))) (for-each delete-file (find-files "." "\\.jar$"))))
(sha256 (sha256
(base32 (base32
"0l45v41nns2jmn9nr9fb0yvhqzfjpxjxn75i1c02rsfy3r3lv22v")))) "14bjpb0ahhaqnim8g6vs0gyd6jgnmly1amx25a0rk1a6ii2aiywn"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -578,6 +580,12 @@ (define-public opencv
;; which we had removed, which would lead to an error: ;; which we had removed, which would lead to an error:
"-DBUILD_PROTOBUF=OFF" "-DBUILD_PROTOBUF=OFF"
;; OpenCV tries to use flatbuffers in 3rdparty which we removed
;; so for now we don't buildfor flatbuffer support
;; TODO: make OpenCV use system flatbuffers which involves
;; modifying CMake files
"-DWITH_FLATBUFFERS=OFF"
;; Rebuild protobuf files, because we have a slightly different ;; Rebuild protobuf files, because we have a slightly different
;; version than the included one. If we would not update, we ;; version than the included one. If we would not update, we
;; would get a compile error later: ;; would get a compile error later:
@ -611,6 +619,11 @@ (define-public opencv
(("\\b(Accum|DataAugmentation|Resample|Correlation|Interp)\\b" all) (("\\b(Accum|DataAugmentation|Resample|Correlation|Interp)\\b" all)
(string-append "DISABLED_" all))) (string-append "DISABLED_" all)))
;; This test fails on x86-64, loosen the bounds.
;; Expected: (max) < (0.1), actual: 0.2 vs 0.1
(substitute* "modules/photo/test/test_hdr.cpp"
(("0\\.1\\)") "0.222)"))
,@(if (target-aarch64?) ,@(if (target-aarch64?)
`(;; This test fails on aarch64, loosen the bounds. `(;; This test fails on aarch64, loosen the bounds.
;; Expected: (max) < (0.131), actual: 0.207148 vs 0.131 ;; Expected: (max) < (0.131), actual: 0.207148 vs 0.131
@ -668,7 +681,7 @@ (define-public opencv
(file-name (git-file-name "opencv_extra" version)) (file-name (git-file-name "opencv_extra" version))
(sha256 (sha256
(base32 (base32
"0bdg5kwwdimnl2zp4ry5cmfxr9xb7zk2ml59853d90llsqjis47a")))) "11y9b35j74gg4gqll4v366qmhvjkcqml45khiajd8zsk1fraf70l"))))
("opencv-contrib" ("opencv-contrib"
,(origin ,(origin
(method git-fetch) (method git-fetch)
@ -677,9 +690,11 @@ (define-public opencv
(file-name (git-file-name "opencv_contrib" version)) (file-name (git-file-name "opencv_contrib" version))
(sha256 (sha256
(base32 (base32
"0hbfn835kxh3hwmwvzgdglm2np1ri3z7nfnf60gf4x6ikp89mv4r")))))) "16crcca9r4y4rby0dqdhc06qi84hjk6qxy2sql2dhh35hfs856rr"))))))
(inputs (inputs
(list ffmpeg-4 (list eigen
ffmpeg-4
;; TODO: add gstreamer
gtk+ gtk+
gtkglext gtkglext
hdf5 hdf5
@ -692,7 +707,9 @@ (define-public opencv
libtiff libtiff
libwebp libwebp
openblas openblas
opencl-headers
openexr openexr
openmpi
openjpeg openjpeg
protobuf protobuf
python python