From patchwork Sat Mar 29 02:11:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 40937 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F351727BBEA; Sat, 29 Mar 2025 02:13:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7868427BBE2 for ; Sat, 29 Mar 2025 02:13:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tyLh6-0003Is-W4; Fri, 28 Mar 2025 22:13:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tyLh2-0003IF-9c for guix-patches@gnu.org; Fri, 28 Mar 2025 22:13:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tyLh1-00033j-V6 for guix-patches@gnu.org; Fri, 28 Mar 2025 22:13:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=fm645hFT083e6P4/MTO5lQa0KU+2nbyGqLk4ynNdwFs=; b=qLLer23tQYTHmNmgFLf+3KGQEdvn/ooYzYHdT2onJgxNXSCF3L4ICOYGSBXqwO2Q2AhDAS0iBmW6cVVj9hCdG11acRgRIz0iYHJ3c7gj4uhywtg5bkY8sI5V3IJomybmvoW8/G/hVlKC3XEh/AZG1MCHzU24GhfFld1cXwzha1Vm3pirlm5UBy14daMCFSi9/AM0OjoRX/fLF62edmOcCWkZF0Wa5aUu66eEjNP6Jx9RfHmFOcFf5Ifw7JTVaZpOT/l6tbww6UdwYnobOdATctVm8NFYL5Gwir1Os55UtiGujSX7R2yiq1oiM55ts/QPmJbSXSn8HsOE9WQv+5yQPg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tyLh0-0008TD-QV for guix-patches@gnu.org; Fri, 28 Mar 2025 22:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77350] [PATCH 3/6] gnu: hugin: Update to 2024.0.1. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 29 Mar 2025 02:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77350 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77350@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 77350-submit@debbugs.gnu.org id=B77350.174321437032513 (code B ref 77350); Sat, 29 Mar 2025 02:13:02 +0000 Received: (at 77350) by debbugs.gnu.org; 29 Mar 2025 02:12:50 +0000 Received: from localhost ([127.0.0.1]:56107 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tyLgn-0008SB-Qk for submit@debbugs.gnu.org; Fri, 28 Mar 2025 22:12:50 -0400 Received: from mout02.posteo.de ([185.67.36.66]:38153) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tyLgk-0008RX-33 for 77350@debbugs.gnu.org; Fri, 28 Mar 2025 22:12:46 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 60E81240101 for <77350@debbugs.gnu.org>; Sat, 29 Mar 2025 03:12:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1743214359; bh=hKFgYGUl3pP9NvUlfxjlSXqIBME3Bwr+M2FuFh5AV+U=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=mdo/Hz4P/LG0IpeKmbu/rAx2waqoBDFCeCFGcPODoYNXY+IKT33A7soxHCxH8XBW5 wtJtewioc1ZsJsVZZ2I4t8UWiG//zIqRcwOQzCONVFAxOxvlzjbcwpI73Ngl8KmE91 xK3w+einrLN9SyB3sDOEHTPE0sIarXnRmLP1WXWlkiHmI+/9hWyX0+Izuvyv3nMpyj PRuZ8lM49W7JDW1noSNX2E5Jya4MfjJLti58q8XTRDUFcvX9VDjuhG65KPZd38bl6X es/omdWRxd+z6sWM89kD7v5nx5VwuPrE8D7yI/r4LsO1kUDJBlWoVN4TzM3KjHffkL ZPml6TAUH2PiA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4ZPgs22Grdz6tsb; Sat, 29 Mar 2025 03:12:38 +0100 (CET) From: Vinicius Monego Date: Sat, 29 Mar 2025 02:11:33 +0000 Message-ID: <4a437906791de72915ebabf83b9f7ab9d04fabe9.1743213683.git.monego@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 --- 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 @@ (define-public entangle (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 @@ (define-public hugin "/hugin-" version ".tar.bz2")) (sha256 (base32 - "1ngadsv22ii05kmvpzdivhwlks4pnv9ijz7j9srl8y54gy5flyh4")))) + "1r57bgq9dr2wi182vl6qm2kgaz2f6wz8sxikr14k3djfxgg0rv0k")))) (build-system cmake-build-system) (native-inputs (list gettext-minimal pkg-config)) @@ -780,35 +780,30 @@ (define-public hugin 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