andreas pushed a commit to branch master in repository guix. commit 1f528df591f5389917f30f0721b8cbae73c53542 Author: Vinicius Monego <mon...@posteo.net> AuthorDate: Sat Mar 29 02:11:33 2025 +0000
gnu: hugin: Update to 2024.0.1. * gnu/packages/photo.scm (hugin): Update to 2024.0.1. [arguments]: Use G-Expressions. <#:configure-flags>: Unset "-DCMAKE_CXX_FLAGS". [inputs]: Replace openexr-2 by openexr. Change-Id: I5703ef40301b72a54865e11ef560ccc55c657b53 Signed-off-by: Andreas Enge <andr...@enge.fr> --- gnu/packages/photo.scm | 47 +++++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 5b34cd135c..c71d498a5a 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -752,7 +752,7 @@ off' shooting directly from the controlling computer.") (define-public hugin (package (name "hugin") - (version "2021.0.0") + (version "2024.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/hugin/hugin/hugin-" @@ -760,7 +760,7 @@ off' shooting directly from the controlling computer.") "/hugin-" version ".tar.bz2")) (sha256 (base32 - "1ngadsv22ii05kmvpzdivhwlks4pnv9ijz7j9srl8y54gy5flyh4")))) + "1r57bgq9dr2wi182vl6qm2kgaz2f6wz8sxikr14k3djfxgg0rv0k")))) (build-system cmake-build-system) (native-inputs (list gettext-minimal pkg-config)) @@ -780,35 +780,30 @@ off' shooting directly from the controlling computer.") libxi libxmu mesa - openexr-2 + openexr sqlite vigra wxwidgets zlib)) (arguments - `(#:tests? #f ; no check target - #:configure-flags - (list - ;; The header files of ilmbase (propagated by openexr) are not found - ;; when included by the header files of openexr, and an explicit - ;; flag needs to be set. - (string-append "-DCMAKE_CXX_FLAGS=-I" - (assoc-ref %build-inputs "ilmbase") - "/include/OpenEXR") - ;; Disable installation of the Python scripting interface. - ;; It would require the additional inputs python and swig. - ;; Installation would need to be tweaked, as it tries to install - ;; into the python directory. - "-DBUILD_HSI=OFF") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'substitute - (lambda _ - (substitute* "src/hugin1/base_wx/StitchingExecutor.cpp" - (("wxT\\(\"enblend\"\\)") - (string-append "wxT(\"" (which "enblend") "\")")) - (("wxT\\(\"enfuse\"\\)") - (string-append "wxT(\"" (which "enfuse") "\")")))))))) + (list + #:tests? #f ; no check target + #:configure-flags + #~(list + ;; Disable installation of the Python scripting interface. + ;; It would require the additional inputs python and swig. + ;; Installation would need to be tweaked, as it tries to install + ;; into the python directory. + "-DBUILD_HSI=OFF") + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'substitute + (lambda _ + (substitute* "src/hugin1/base_wx/StitchingExecutor.cpp" + (("wxT\\(\"enblend\"\\)") + (string-append "wxT(\"" (which "enblend") "\")")) + (("wxT\\(\"enfuse\"\\)") + (string-append "wxT(\"" (which "enfuse") "\")")))))))) (home-page "https://hugin.sourceforge.net/") (synopsis "Panorama photo stitcher") (description