From patchwork Thu May 30 18:23:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 64998 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 ACD9927BBEA; Thu, 30 May 2024 19:24:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 07A1127BBE2 for ; Thu, 30 May 2024 19:24:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sCkRN-0006Q0-8O; Thu, 30 May 2024 14:23:53 -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 1sCkRL-0006Pl-NT for guix-patches@gnu.org; Thu, 30 May 2024 14:23:51 -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 1sCkRL-0008Gu-F5 for guix-patches@gnu.org; Thu, 30 May 2024 14:23:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sCkRW-0001Va-02 for guix-patches@gnu.org; Thu, 30 May 2024 14:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71280] [PATCH 1/4] gnu: kimageformats: Build with current OpenEXR. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 May 2024 18:24:01 +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.17170934415784 (code B ref 71280); Thu, 30 May 2024 18:24:01 +0000 Received: (at 71280) by debbugs.gnu.org; 30 May 2024 18:24:01 +0000 Received: from localhost ([127.0.0.1]:50662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCkRU-0001VE-FG for submit@debbugs.gnu.org; Thu, 30 May 2024 14:24:00 -0400 Received: from mout02.posteo.de ([185.67.36.66]:59653) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCkRR-0001Uu-KH for 71280@debbugs.gnu.org; Thu, 30 May 2024 14:23:58 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id B5672240104 for <71280@debbugs.gnu.org>; Thu, 30 May 2024 20:23:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1717093420; bh=sVKg7GtQnCOxdk9W0yz2pLf2NLSMExsauz/vzNIL2Tg=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=mCpfHielM5FQjoKbSDtvqO+IZr3nHXotAukZHfgSvnL2WTwipl2yPC2KmrCvNDB8a zETChXBNmYzXHvTcf85oEFtfY7aljJaJkIsRvt6oUDTdTEV8Jb2zsgQUiB8JbPBl7e KYzY7JdhYtVG7xJ0iWCSHAmotrnCNvz+Y3C+WP7so9+M0ag2/A+KE5CYcH6WmwyH5a 9KKlIAgirXVyaItOsKfGD6MJ7JJD11NgN+Ggp6mTYKgJKCHcgmrTLdA6zcG5O3idm3 o/VkElKwrsXiM+aEjgsfCnnJ0/HoYuYn1k9A2LxK/AvH9UiiosOK2Zrqs1MFMYLB1O iH8TTjb7GfJ9w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4VqvlH6z7xz6tvy; Thu, 30 May 2024 20:23:39 +0200 (CEST) From: Vinicius Monego Date: Thu, 30 May 2024 18:23:00 +0000 Message-Id: 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/kde-frameworks.scm (kimageformats)[inputs]: Replace openexr-2 by openexr. Add imath, zlib. [arguments]: Unset "-DCMAKE_CXX_FLAGS". Change-Id: I49bb6f4e6c75a44dbb92752ad2f2fe600f2a6414 --- gnu/packages/kde-frameworks.scm | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 08329820fa..e8f3b2f5f2 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Maxim Cournoyer +;;; Copyright © 2024 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -1938,9 +1939,11 @@ (define-public kimageformats (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list karchive ; for Krita and OpenRaster images - openexr-2 ; for OpenEXR high dynamic-range images - qtbase-5)) + (list imath ; companion for OpenEXR + karchive ; for Krita and OpenRaster images + openexr ; for OpenEXR high dynamic-range images + qtbase-5 + zlib)) (arguments (list #:phases @@ -1955,18 +1958,9 @@ (define-public kimageformats (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (setenv "HOME" - (getcwd)) - ;; FIXME: I guess kde's qt no this fail. - ;; see https://invent.kde.org/frameworks/kimageformats/-/jobs/1046283 - (invoke "ctest" "-E" "kimageformats-read-psd"))))) - ;; FIXME: 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. - #:configure-flags #~(list (string-append "-DCMAKE_CXX_FLAGS=-I" - (assoc-ref %build-inputs - "ilmbase") - "/include/OpenEXR")))) + (setenv "HOME" (getcwd)) + ;; Test fails with unsupported image format 'birthday.tif'. + (invoke "ctest" "-E" "kimageformats-read-psd"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Plugins to allow QImage to support extra file formats") (description "This framework provides additional image format plugins for From patchwork Thu May 30 18:23:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 64999 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 0C1B327BBEA; Thu, 30 May 2024 19:25:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 78D6827BBE2 for ; Thu, 30 May 2024 19:25:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sCkSM-0006ZI-Hi; Thu, 30 May 2024 14:24:54 -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 1sCkSK-0006YL-Hq for guix-patches@gnu.org; Thu, 30 May 2024 14:24:52 -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-0008L5-9L 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 1sCkSU-0001YU-RO for guix-patches@gnu.org; Thu, 30 May 2024 14:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71280] [PATCH 2/4] gnu: hugin: Update to 2023.0.0. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 May 2024 18:25:02 +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.17170934455829 (code B ref 71280); Thu, 30 May 2024 18:25:02 +0000 Received: (at 71280) by debbugs.gnu.org; 30 May 2024 18:24:05 +0000 Received: from localhost ([127.0.0.1]:50668 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCkRY-0001Vx-VQ for submit@debbugs.gnu.org; Thu, 30 May 2024 14:24:05 -0400 Received: from mout02.posteo.de ([185.67.36.66]:34433) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCkRV-0001V1-1r for 71280@debbugs.gnu.org; Thu, 30 May 2024 14:24:01 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id D2734240103 for <71280@debbugs.gnu.org>; Thu, 30 May 2024 20:23:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1717093424; bh=yGw3bzJfeldhaemKG/VTmxy6KwnAnGp5FMlg3hNU58w=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=Plx3Bskw2Pjh5dhNY8ZSW2WWqfIGCgzQFAzXwvNhQmbEPfHrPf3uewQNqh1/Ev1SN V2AsqcDQXCnkOwYhQhm18XuM7vze5dSDJWCkLI7a7+mCx4Qml2OfUbW6vRWasx6df5 BIaLntuF0M54ZBWB+yEtx4iqtj2LKoHDJ6U96UAu9c+r7jmDNW609RS3uL0ABHzzok NDicSb8uZE6/JNuurMauOoLYtCRb5sDU4PdA9mvGoNzts/y2dzQ6XfjBRc8Z+gFuZG rqbNdm16mr74+fNUQqCkK3uWFr3h0ZQLtNQcYur3J/8znRYKyqbrb8Rd0pBtqsfVMF 0dWzQZ6fLAsVA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4VqvlN0H8Wz6tw3; Thu, 30 May 2024 20:23:43 +0200 (CEST) From: Vinicius Monego Date: Thu, 30 May 2024 18:23:01 +0000 Message-Id: <0bdf4b58530239a5da20a2104c49df9f2ed21de4.1717093218.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 2023.0.0. [inputs]: Add imath. Replace openexr-2 by openexr. [arguments]<#:configure-flags>: Unset "-DCMAKE_CXX_FLAGS". Change-Id: I63d1927677a4b5f8983600ee065bafe4d3ca4149 --- gnu/packages/photo.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 5d6675b7e2..536c4e706e 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -750,7 +750,7 @@ (define-public entangle (define-public hugin (package (name "hugin") - (version "2021.0.0") + (version "2023.0.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/hugin/hugin/hugin-" @@ -758,7 +758,7 @@ (define-public hugin "/hugin-" version ".tar.bz2")) (sha256 (base32 - "1ngadsv22ii05kmvpzdivhwlks4pnv9ijz7j9srl8y54gy5flyh4")))) + "0av367k70f7ww6nwnm9lbg9p9ibjjhq25g9rqr20azh1qv69z8q4")))) (build-system cmake-build-system) (native-inputs (list gettext-minimal pkg-config)) @@ -770,6 +770,7 @@ (define-public hugin flann freeglut glew + imath lcms libjpeg-turbo libpano13 @@ -778,7 +779,7 @@ (define-public hugin libxi libxmu mesa - openexr-2 + openexr sqlite vigra wxwidgets @@ -787,12 +788,6 @@ (define-public hugin `(#: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 From patchwork Thu May 30 18:23:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 65001 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 65DAE27BBE2; Thu, 30 May 2024 19:25:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A 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 C80C427BBE9 for ; Thu, 30 May 2024 19:25:24 +0100 (BST) 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 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.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") From patchwork Thu May 30 18:23:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 65000 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 9413327BBE9; Thu, 30 May 2024 19:25:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 0812F27BBE2 for ; Thu, 30 May 2024 19:25:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sCkSN-0006Zz-P7; 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-0006Ym-JC for guix-patches@gnu.org; Thu, 30 May 2024 14:24:53 -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 1sCkSL-0008LG-B7 for guix-patches@gnu.org; Thu, 30 May 2024 14:24:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sCkSV-0001Yn-SD for guix-patches@gnu.org; Thu, 30 May 2024 14:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71280] [PATCH 4/4] gnu: vips: Build with current OpenEXR. 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.17170934555867 (code B ref 71280); Thu, 30 May 2024 18:25:03 +0000 Received: (at 71280) by debbugs.gnu.org; 30 May 2024 18:24:15 +0000 Received: from localhost ([127.0.0.1]:50679 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCkRj-0001WY-4m for submit@debbugs.gnu.org; Thu, 30 May 2024 14:24:15 -0400 Received: from mout02.posteo.de ([185.67.36.66]:48033) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCkRh-0001WA-3m for 71280@debbugs.gnu.org; Thu, 30 May 2024 14:24:13 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id DB1D5240106 for <71280@debbugs.gnu.org>; Thu, 30 May 2024 20:23:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1717093436; bh=ClfhVb4QLKu1Vp0s3h4AJiJCg03CrD7if8k5B6EA7Ac=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=hwErgadyMq2ot/yz06q209Ddc0xkdgzOY+L+GOC1+vvbfgXT7Al66p9eTH7zdw86Z CnqP8mNLL4MpG/Gc2eIGv8uqcjKLFJTij2eHMHoHAWsI3/SmFO1VXkU4FS2y4RxKrV OHJXKvYXvx/Mde9EgZWG1uEOM0Fmee/hJ2YssJJfVTlq78Di4oyYxTQJCpocWuWtMH IJYfdQyzs5a4qROuDyW2V7/XXN4dosMvaR/6NEhKIT4zSJHmRXG+plwAoiDK1fnJsC ynTbm5uKN7D+cFR1b0NvejuT0Dq6j2aak41ku7R8umFgFmmRE68p4XzY5PhF6z7zJY 9zqPEm0P1M2bw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4VqvlY46mDz6twJ; Thu, 30 May 2024 20:23:53 +0200 (CEST) From: Vinicius Monego Date: Thu, 30 May 2024 18:23:03 +0000 Message-Id: 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-processing.scm (vips)[inputs]: Add imath. Replace openexr-2 by openexr. Change-Id: I934acff558c947cacc820878813dd756ee5db6f8 --- gnu/packages/image-processing.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 7c9d12557e..5faf4b9cce 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -782,6 +782,7 @@ (define-public vips glib hdf5 imagemagick + imath lcms libexif libgsf @@ -793,7 +794,7 @@ (define-public vips libwebp matio niftilib - openexr-2 + openexr orc pango poppler))