From patchwork Sat Mar 29 02:11:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 40938 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 679EE27BBE9; Sat, 29 Mar 2025 02:13:33 +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=unavailable 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 6434927BBE2 for ; Sat, 29 Mar 2025 02:13:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tyLh4-0003If-4c; Fri, 28 Mar 2025 22:13:06 -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 1tyLh1-0003I7-Kr for guix-patches@gnu.org; Fri, 28 Mar 2025 22:13:03 -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-00033c-2x 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=1a6S/OcIBSnXxZzRTvX8Us5vTOib9E/PNi5w2E08Ql0=; b=LKCTOVXRY8fOLABcEkCSsQqD0tbXVY+KygZoJ11fl5U70COSsRLyG4oi2kQnVLDThY3/3BvlT41uA0eLp+RbpK/bdu31N0XiM5ms1cB8vo9PTmE5OKcajKluhYiyE3eqDC4KDCgjPIIRZBR801L6KtYFWxnZ+kRWV4raYNwF/pLnQxy4H0OBhyVq6iG9lKR5ob4909VZg6s0/llpMqtw6U38sRCOs7bURYWRTQW9soUVCfjFBV8H5w67X40ceNDN4tCXvVo/C41ei+gV4m2yCz5MeF/HQY59632QLEVzcUp7EmeVM9FaIAlG5jDm0cn0dZ+CuXH84oIhMT26FL01Rg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tyLgz-0008Sy-Rd for guix-patches@gnu.org; Fri, 28 Mar 2025 22:13:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77350] [PATCH 1/6] gnu: vigra: Update to 1.12.2. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 29 Mar 2025 02:13:01 +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.174321436432478 (code B ref 77350); Sat, 29 Mar 2025 02:13:01 +0000 Received: (at 77350) by debbugs.gnu.org; 29 Mar 2025 02:12:44 +0000 Received: from localhost ([127.0.0.1]:56097 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tyLge-0008RY-S0 for submit@debbugs.gnu.org; Fri, 28 Mar 2025 22:12:44 -0400 Received: from mout01.posteo.de ([185.67.36.65]:58459) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tyLgc-0008R7-8B for 77350@debbugs.gnu.org; Fri, 28 Mar 2025 22:12:39 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 9B77C240027 for <77350@debbugs.gnu.org>; Sat, 29 Mar 2025 03:12:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1743214350; bh=wPn8g1CbV/QiNi3KJwVgkv43366zqWaR1Wgy/+ttt00=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=EHGqvtww1/N6OwWCL79PPtwXbsg5tqMSJZ5TZqldO2V+mk3BIwaSGL9gNfS5N3gCr UEMACgeUu5A/gWfHWwlWJx2eIHWGkJQmPYUOLudNusJe2DkjJ2UtReCCszb1RON0su jHct2L5w7OtCli+8FbhXvCRJK0RxY0FB9lD9Uh7Z3Nf50KdkK1te2PdynzWraiOGG1 84sef7AlrFNM527D72u9L7Eq8FgrEgmHiBWKxd6CztMrmwLdZ19GUp9S2j/6vT+teK gsklfOvxC8k+0theXAtHzFYBDwA5mPT5M5CSc7Lp8TpA3baDMQgmiKX4aPwem/iMef Ih4U30gGrh4Tw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4ZPgrs3ryvz6tsb; Sat, 29 Mar 2025 03:12:29 +0100 (CET) From: Vinicius Monego Date: Sat, 29 Mar 2025 02:11:31 +0000 Message-ID: <581466cd0aeec09d1fb499c826232b875245e94f.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/image.scm (vigra): Update to 1.12.2. [arguments]<#:phases>: Delete the 'disable-broken-tests phase. <#:configure-flags>: Don't pass "-DCMAKE_CXX_FLAGS", "-DCMAKE_C_FLAGS", "-Wno-dev". [inputs]: Remove package labels. Replace openexr-2 by openexr. Remove ilmbase. Change-Id: Ie953a45f6b5e9da5985e307d4acf25a955e73539 --- gnu/packages/image.scm | 124 +++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 79 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 89e7ef83e6..41c1a55f4a 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2020, 2023 Maxim Cournoyer ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Zhu Zihao -;;; Copyright © 2020, 2021, 2022, 2023, 2024 Vinicius Monego +;;; Copyright © 2020-2025 Vinicius Monego ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021 Nicolò Balzarotti ;;; Copyright © 2021 Alexandr Vityazev @@ -1365,87 +1365,53 @@ (define-public freeimage (home-page "https://freeimage.sourceforge.io/"))) (define-public vigra - (let ((commit "9b514fa00a136f5fd81bb57ee9f6293c333ffc1f") - (revision "0")) - (package - (name "vigra") - (version (git-version "1.11.1" revision commit)) - (source - (origin - ;; The last release is 1.11.1, from 2017. It's becoming more and more - ;; difficult to build this old release, and the upstream developers - ;; suggest on their home page to build from the Git repo, saying "It is - ;; generally safe to use the 'master' branch of the development snapshot, - ;; as we avoid uploading untested or incompatible changes to this branch." - (method git-fetch) - (uri (git-reference - (url "https://github.com/ukoethe/vigra") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 (base32 - "1vzlypviala109imwxkp46lqhhxszf79ypfb8wxg6z7g02j7mm73")))) - (build-system cmake-build-system) - (inputs - `(("boost" ,boost) - ("fftw" ,fftw) - ("fftwf" ,fftwf) - ("hdf5" ,hdf5) - ("ilmbase" ,ilmbase) ; propagated by openexr, but needed explicitly - ; to create a configure-flag - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("openexr" ,openexr-2) - ("python" ,python-wrapper) - ;("python-numpy" ,python-numpy) - ("zlib" ,zlib))) - (native-inputs - `(("doxygen" ,doxygen) - ("python-nose" ,python-nose) - ("sphinx" ,python-sphinx))) - (arguments - `(#:test-target "check" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'disable-broken-tests - (lambda _ - ;; See https://github.com/ukoethe/vigra/issues/432 - (substitute* "test/fourier/CMakeLists.txt" - (("VIGRA_ADD_TEST.*") "")) - ;; This test fails with Numpy 1.15: - ;; . - (substitute* "vigranumpy/test/CMakeLists.txt" - (("test1\\.py") "")) - #t))) - #:configure-flags - (list "-Wno-dev" ; suppress developer mode with lots of warnings - (string-append "-DVIGRANUMPY_INSTALL_DIR=" - (assoc-ref %outputs "out") - "/lib/python" - ,(version-major+minor (package-version python)) - "/site-packages") - ;; Vigranumpy isn't compatible with numpy >= 1.20. - "-DWITH_VIGRANUMPY=0" - ;; OpenEXR is not enabled by default. - "-DWITH_OPENEXR=1" - ;; Fix rounding error on 32-bit machines - "-DCMAKE_C_FLAGS=-ffloat-store" - ;; The header files of ilmbase 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" - " -ffloat-store")))) - (synopsis "Computer vision library") - (description - "VIGRA stands for Vision with Generic Algorithms. It is an image + (package + (name "vigra") + (version "1.12.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ukoethe/vigra") + (commit "Version-1-12-1"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pshpdylji9yz6n3h6rc6njgjih4cas8cf8jpd1c185j2kaf6qb6")))) + (build-system cmake-build-system) + (arguments + `(#:test-target "check" + #:configure-flags + (list (string-append "-DVIGRANUMPY_INSTALL_DIR=" + (assoc-ref %outputs "out") + "/lib/python" + ,(version-major+minor (package-version python)) + "/site-packages") + ;; Vigranumpy isn't compatible with numpy >= 1.20. + "-DWITH_VIGRANUMPY=0" + ;; OpenEXR is not enabled by default. + "-DWITH_OPENEXR=1"))) + (native-inputs (list doxygen + python-nose + python-sphinx)) + (inputs (list boost + fftw + fftwf + hdf5 + libjpeg-turbo + libpng + libtiff + openexr + python-wrapper + zlib)) + (synopsis "Computer vision library") + (description + "VIGRA stands for Vision with Generic Algorithms. It is an image processing and analysis library that puts its main emphasis on customizable algorithms and data structures. It is particularly strong for multi-dimensional image processing.") - (license license:expat) - (home-page "https://ukoethe.github.io/vigra/") - (properties '((max-silent-time . 7200)))))) ;2 hours, to avoid timing out + (license license:expat) + (home-page "https://ukoethe.github.io/vigra/") + (properties '((max-silent-time . 7200))))) ;2 hours, to avoid timing out (define-public vigra-c (let* ((commit "66ff4fa5a7d4a77415caa676a45c2c6ea16562e7")