From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id AFKYFZXEWGYJKwAAqHPOHw:P1 (envelope-from ) for ; Thu, 30 May 2024 20:25:25 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id AFKYFZXEWGYJKwAAqHPOHw (envelope-from ) for ; Thu, 30 May 2024 20:25:25 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=VwndJjov; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1717093525; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=PWaEPAedBcJc9O+ZmCkH/z3E+HpwYthQus+Nr2jriGg=; b=shCze6LLoWfHOcfWUiBT96z4OneCLKAM4+VvlqSbeUoIPYAp2/Ol/jSxqC/sOB0NYWrUap gGwRHJJ7M+QO5zHqGz+NCnZDE19mTV6fop++ARbI1LueJF6zJd+0ySDUUpQ3f/yss4Xy4q /TkR+Q1bJrhXKPHhFq8YNVRw99wOodKvwhbfbhjByEWsvA/WwdPhzbJJ7FT9PubvYpZ6Fp I1x9MY7sZFELKxYfm623PpRBTCGYmK8JZTZB+QZlBrKkMby2mSOODnWuwQ/Gp98SVPCiaX ViijBz2vqaYUXrRuANQFm1ojoiJwYvgSGrH+Y3iWZvYuA6kgHls/qD2Xdib7Cw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=VwndJjov; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1717093525; a=rsa-sha256; cv=none; b=SS0+CCOYtdNmKUvBoqsF1XCnYnosKXBwgu/kXW3vpYdO0l56HaLmC3LXuXLCGFRmaDjOzH 9HDFB0VdXNDfaLoPOyAdG3a9o6gsiCvRdkakIZs9ZBAOqKnsNbYYQnAQfxR5iU25opAoUw dT4+aAOS+Fn8AyN5gVQpAMRwqYBwdL5uQTEgfuV35R12/mxZE2dKFrLTXQ+fgtAIq5mV1W aLew9Wh+KDicl5GRMGw1An3XviKCUkziR/xrE4VeN8B53x0wnIZTy6+aPxIec2UzHM8ipn SKTxBYrpIZflk53GgNICWfSTN2Z/sjHzXGI+p7FsDmFD7cY0rzZaRWydsXMweg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D7CFC235BF for ; Thu, 30 May 2024 20:25:24 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sCkSN-0006Zl-Ei; Thu, 30 May 2024 14:24:55 -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 1sCkSL-0006Yw-W4 for guix-patches@gnu.org; Thu, 30 May 2024 14:24:54 -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 1sCkSK-0008LC-Nu for guix-patches@gnu.org; Thu, 30 May 2024 14:24:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sCkSV-0001Yb-9f for guix-patches@gnu.org; Thu, 30 May 2024 14:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71280] [PATCH 3/4] gnu: vigra: Update to 1.11.2. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 May 2024 18:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71280 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71280@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 71280-submit@debbugs.gnu.org id=B71280.17170934515851 (code B ref 71280); Thu, 30 May 2024 18:25:03 +0000 Received: (at 71280) by debbugs.gnu.org; 30 May 2024 18:24:11 +0000 Received: from localhost ([127.0.0.1]:50673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCkRe-0001WI-Gf for submit@debbugs.gnu.org; Thu, 30 May 2024 14:24:11 -0400 Received: from mout01.posteo.de ([185.67.36.65]:50031) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCkRc-0001Vs-1r for 71280@debbugs.gnu.org; Thu, 30 May 2024 14:24:08 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id B0BA4240028 for <71280@debbugs.gnu.org>; Thu, 30 May 2024 20:23:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1717093431; bh=7/Si9I1iWZu+1eI+F9OzlgdtrNkiFMH2HNzT+ihUy/w=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=VwndJjovxgavtFoZ0nr7cbwM/xa/OHuO2s37t1ouGoE31/ZnTUSCvgl56P7vsnBsC xSKaqiLY6Fr+HOyS6GGLC1cpMCUzeanBoqUVs/o0SZK+WLC5iCHwfCh+WRz/xirSLn JtDusAq2YRhwKCHrq0KPo0vRt/u6wAfpqEby6iK/XVKAO5G+wMmd7PxKEz5TXWJYu8 usPjDz54l8NnIr/OEOWV5cWkhqFdqBEtbujNKgjS5Ej6q4TOdvxXTZBbHbm+D2+ETv xWuSqfIHEIwxfBb+UqwEHRaBqzxJfvF3804HDTpQEa/gE0MS7cs+9wv151CQMzX8kU JKACsyTcSKBug== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4VqvlS6xg1z6twJ; Thu, 30 May 2024 20:23:48 +0200 (CEST) From: Vinicius Monego Date: Thu, 30 May 2024 18:23:02 +0000 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: 3.95 X-Migadu-Queue-Id: D7CFC235BF X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: 3.95 X-TUID: zaAAanL0JIUA * gnu/packages/image.scm (vigra): Update to 1.11.2. [inputs]: Use package labels. Add imath. Replace openexr-2 by openexr. [native-inputs]: Use package labels. [arguments]<#:configure-flags>: Unset "-DCMAKE_CXX_FLAGS". Change-Id: I4dd538ca386c6486ed57cde61337118c2c32d99d --- gnu/packages/image.scm | 137 ++++++++++++++++++----------------------- 1 file changed, 59 insertions(+), 78 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index fae45363ad..0c9c1b7f10 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1331,87 +1331,68 @@ (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.11.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ukoethe/vigra") + (commit "Version-1-11-2"))) + (file-name (git-file-name name version)) + (sha256 (base32 + "12ywzz8c6p1cmmr3b849yhvmbi1kmqz2ag82qpj41hy8lis6gaf4")))) + (build-system cmake-build-system) + (inputs + (list boost + fftw + fftwwf + hdf5 + imath + libjpeg-turbo + libpng + libtiff + openexr + python-wrapper)) + (native-inputs + (list doxygen python-nose 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"))) + (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") -- 2.39.2