From patchwork Wed Apr 3 01:30:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62662 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 29FFB27BBE9; Wed, 3 Apr 2024 02:33:02 +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 F36B427BBEB for ; Wed, 3 Apr 2024 02:32:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrpTt-0008IH-7y; Tue, 02 Apr 2024 21:32:01 -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 1rrpTr-0008Gt-7E for guix-patches@gnu.org; Tue, 02 Apr 2024 21:31:59 -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 1rrpTq-00017H-Ux for guix-patches@gnu.org; Tue, 02 Apr 2024 21:31:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrpTu-0002Cp-RX for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH v3 1/9] gnu: openimageio: Update to 2.5.10.1. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 01:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70035 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70035@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 70035-submit@debbugs.gnu.org id=B70035.17121078868178 (code B ref 70035); Wed, 03 Apr 2024 01:32:02 +0000 Received: (at 70035) by debbugs.gnu.org; 3 Apr 2024 01:31:26 +0000 Received: from localhost ([127.0.0.1]:56602 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTI-00027W-2O for submit@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:25 -0400 Received: from mout02.posteo.de ([185.67.36.66]:57207) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTE-00026S-Qy for 70035@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:22 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 0D860240101 for <70035@debbugs.gnu.org>; Wed, 3 Apr 2024 03:31:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1712107871; bh=waucwvzCutP6p8rtBZk8CeayBw08rgIxeTDLUajrC6Q=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=Ix7XyXpWoJzgSMzA5AFdHssFNWFUM87ky00IwGzrd9KEd1nzDqCOsQRyd7xZQATjm aOXXLld8azC9aBmpg/ZFVTwnfPTHrjEfIU3fKS/qSVzzVg3AtUmacbeV5EWJmLtqVl Int3DKTRfdZfHpvsCnRekC8rpC+Rva+nz5fC5wPXJQxgHPaJSY+8Th43W9Q1D1HMcm rEYCLNJ65ogAYUPtQXH8kJvPTGmcPtIPpOk+dGNXLUZkk2MI3g11y0U2/zpaKkiWha 5Fl8qSdlS1G9PfUK6FMeO4vQIIq6hLX0Z9pFTM3L0q2rZG1qCbfXdcLPYQy1GjSWtr W1KdnA1dxpxRA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V8RzL0kh9z6tsf; Wed, 3 Apr 2024 03:31:09 +0200 (CEST) From: Vinicius Monego Date: Wed, 3 Apr 2024 01:30:21 +0000 Message-Id: <9c220bc0c340b0c3bd9f3e979ade8663a729b7db.1712107465.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/graphics.scm (openimageio): Update to 2.5.10.1. [source]: Adjust tag prefix. [arguments]: Use G-Expressions. <#:configure-flags>: Pass "-DOIIO_BUILD_TESTS=false". [inputs]: Replace openexr-2 with openexr, fmt-8 with fmt. Use package labels. Change-Id: I7016f89c5b7c78cbc1ffeac23e5c0cefe2a8f43b --- gnu/packages/cpp.scm | 2 +- gnu/packages/graphics.scm | 42 +++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index acbe3e4836..2c04920166 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2020 Roel Janssen ;;; Copyright © 2020, 2021, 2023, 2024 Ricardo Wurmus ;;; Copyright © 2020 Brice Waegeneire -;;; Copyright © 2020, 2021, 2022 Vinicius Monego +;;; Copyright © 2020, 2021, 2022, 2024 Vinicius Monego ;;; Copyright © 2020, 2022 Marius Bakke ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Alexandros Theodotou diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index ad08141c96..23b6af066a 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1313,40 +1313,38 @@ (define-public openexr-2 (define-public openimageio (package (name "openimageio") - (version "2.2.21.0") + (version "2.5.10.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/OpenImageIO/oiio") - (commit (string-append "Release-" version)))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0aicxbshzv1g9d8d08vsj1a9klaycxaifvvp565qjv70wyma2vkr")))) + "06x3lqj9qjh5m0zbr5g2g9ii6jk340pgzrhr4fb353y1y2pkx5sw")))) (build-system cmake-build-system) - ;; FIXME: To run all tests successfully, test image sets from multiple - ;; third party sources have to be present. For details see - ;; (arguments - `(#:tests? #f - #:configure-flags (list "-DUSE_EXTERNAL_PUGIXML=1"))) + (list #:tests? #f ; half the tests require online data or use redirection + #:configure-flags #~(list "-DUSE_EXTERNAL_PUGIXML=1" + "-DOIIO_BUILD_TESTS=false"))) (native-inputs (list pkg-config)) (inputs - `(("boost" ,boost) - ("fmt" ,fmt-8) - ("libheif" ,libheif) - ("libpng" ,libpng) - ("libjpeg" ,libjpeg-turbo) - ("libtiff" ,libtiff) - ("giflib" ,giflib) - ("openexr" ,openexr-2) - ("ilmbase" ,ilmbase) - ("pugixml" ,pugixml) - ("python" ,python-wrapper) - ("pybind11" ,pybind11) - ("robin-map" ,robin-map) - ("zlib" ,zlib))) + (list boost + fmt + libheif + libpng + libjpeg-turbo + libtiff + giflib + openexr + imath + pugixml + python-wrapper + pybind11 + robin-map + zlib)) (synopsis "C++ library for reading and writing images") (description "OpenImageIO is a library for reading and writing images, and a bunch of From patchwork Wed Apr 3 01:30:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62660 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 27DD527BBE2; Wed, 3 Apr 2024 02:32:48 +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 E6C7F27BBEA for ; Wed, 3 Apr 2024 02:32:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrpTs-0008I0-VA; Tue, 02 Apr 2024 21:32:00 -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 1rrpTr-0008H4-HF for guix-patches@gnu.org; Tue, 02 Apr 2024 21:31:59 -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 1rrpTr-0001A7-8j for guix-patches@gnu.org; Tue, 02 Apr 2024 21:31:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrpTv-0002Cw-9p for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH v3 2/9] gnu: openshadinglanguage: Update to 1.13.8.0. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 01:32:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70035 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70035@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 70035-submit@debbugs.gnu.org id=B70035.17121078888194 (code B ref 70035); Wed, 03 Apr 2024 01:32:03 +0000 Received: (at 70035) by debbugs.gnu.org; 3 Apr 2024 01:31:28 +0000 Received: from localhost ([127.0.0.1]:56606 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTL-000286-WD for submit@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:28 -0400 Received: from mout01.posteo.de ([185.67.36.65]:39505) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTJ-00026x-Rh for 70035@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:26 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 339C2240027 for <70035@debbugs.gnu.org>; Wed, 3 Apr 2024 03:31:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1712107875; bh=+1sEQvSjzaA/5c05QCgDYaAz4JpiY+2q840oLROocX0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=aXgOdw5uEPAcUXvGdKyYeqxVV3FlcxRvKeCp4ulmC3zjlVl+MettqlNfalr+Vvf/j 6K401tHyfNWwcnxQFQmaXzKfcUEASbQWkY4Zvb6x72/GV0E3Lg6cmN5Lhv3o7dNviO SCHZSrJvykhfhM4CnM/x1sK+Zmd5mU2hoQcnEXJOarsw+dnU716ugiEbWubAs/u7qS 7P35eFJCO2Uw2ywKOTFi8NW/8D6k0Nq3F9rndi8woC+6u+DcQrYZFnPlPfL9ZsJivf sGP70R4oe6O9+pvPgv0We1zD1KBA/7LYQMxqN/eYKSo4FjBnTyCdOJoWEMUqMcwWnE Ag++2ixWoRVQw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V8RzQ1sbZz6tsf; Wed, 3 Apr 2024 03:31:14 +0200 (CEST) From: Vinicius Monego Date: Wed, 3 Apr 2024 01:30:22 +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/graphics.scm (openshadinglanguage): Update to 1.13.8.0. [source]: Add patch. [arguments]: Use G-Expressions. In #:configure-flags, pass the "-DLLVM_BC_GENERATOR" option. Delete the add-ilmbase-include-path phase. Add new tests to skip. [native-inputs]: Use Clang 13 and LLVM 13. [inputs]: Use OpenEXR 3 and Qt 6. Change-Id: Ib3e7ed39c3eb170e3d24ccc74243ebff490e07ab --- gnu/packages/graphics.scm | 64 ++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 23b6af066a..b593f03690 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -707,7 +707,7 @@ (define-public mikktspace (define-public openshadinglanguage (package (name "openshadinglanguage") - (version "1.11.16.0") + (version "1.13.8.0") (source (origin (method git-fetch) @@ -716,52 +716,46 @@ (define-public openshadinglanguage (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0x0lc163vl2b57l75bf5zxlr6vm2y1f1izlxdnrw3vsapv3r9k9g")))) + (base32 "1ji4bw8z4ylsh0jvir3d40p6xyhr63g588gh3bag7bzsr3flsb02")))) (build-system cmake-build-system) (arguments - `(#:configure-flags (list "-DUSE_PARTIO=OFF") ; TODO: not packaged - #:phases - (modify-phases %standard-phases - (add-after 'set-paths 'add-ilmbase-include-path - (lambda* (#:key inputs #:allow-other-keys) - ;; OpenEXR 2 propagates ilmbase, but its include files do not - ;; appear in the C_INCLUDE_PATH. - (let ((headers (string-append - (assoc-ref inputs "ilmbase") - "/include/OpenEXR"))) - (setenv "C_INCLUDE_PATH" - (string-append headers ":" - (or (getenv "C_INCLUDE_PATH") ""))) - (setenv "CPLUS_INCLUDE_PATH" - (string-append headers ":" - (or (getenv "CPLUS_INCLUDE_PATH") "")))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "ctest" "--exclude-regex" - (string-join - (list - "osl-imageio" ; OIIO not compiled with freetype - "osl-imageio.opt" ; OIIO not compiled with freetype - "texture-udim" ; file does not exist - "texture-udim.opt" ; file does not exist - "example-deformer" ; could not find OSLConfig - "python-oslquery") ; no module oslquery - "|")))))))) + (list #:configure-flags + #~(list "-DUSE_PARTIO=OFF" ; TODO: not packaged + (string-append "-DLLVM_BC_GENERATOR=" + #$(this-package-native-input "clang") + "/bin/clang++")) + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke + "ctest" "--exclude-regex" + (string-join + (list + "osl-imageio" ; file does not exist + "osl-imageio.opt" ; file does not exist + "osl-imageio.opt.rs_bitcode" ; file does not exist + "texture-udim" ; file does not exist + "texture-udim.opt" ; file does not exist + "texture-udim.opt.rs_bitcode" ; file does not exist + "example-deformer" ; could not find OSLConfig + "python-oslquery") ; no module oslquery + "|")))))))) (native-inputs (list bison - clang-9 + clang flex - llvm-9 + llvm pybind11 python-wrapper)) (inputs (list boost imath - openexr-2 + openexr openimageio pugixml - qtbase-5 + qtbase zlib)) (home-page "https://github.com/AcademySoftwareFoundation/OpenShadingLanguage") (synopsis "Shading language for production GI renderers") From patchwork Wed Apr 3 01:30:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62661 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 4776B27BBEC; Wed, 3 Apr 2024 02:33:00 +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=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 C15A027BBE2 for ; Wed, 3 Apr 2024 02:32:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrpTt-0008I5-3q; Tue, 02 Apr 2024 21:32:01 -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 1rrpTr-0008HO-Ve for guix-patches@gnu.org; Tue, 02 Apr 2024 21:31:59 -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 1rrpTr-0001Al-My for guix-patches@gnu.org; Tue, 02 Apr 2024 21:31:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrpTv-0002D5-Nv for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH v3 3/9] gnu: Add partio. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 01:32:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70035 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70035@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 70035-submit@debbugs.gnu.org id=B70035.17121078908209 (code B ref 70035); Wed, 03 Apr 2024 01:32:03 +0000 Received: (at 70035) by debbugs.gnu.org; 3 Apr 2024 01:31:30 +0000 Received: from localhost ([127.0.0.1]:56610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTO-00028L-Ee for submit@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:30 -0400 Received: from mout01.posteo.de ([185.67.36.65]:40801) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTM-00027M-GU for 70035@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:29 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id CB2EA240027 for <70035@debbugs.gnu.org>; Wed, 3 Apr 2024 03:31:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1712107878; bh=Qaco2cWzxJ7UjDU+bHXEu3mPd73OIWCOW8HYhr6qdZs=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=GOlkB4cGARMzFBpKenbe3ClnQsqj74a5umQChFr2ofGoPMez0K2r5gGE7JmPCBd46 lPFLNTD1XpgawYO2LJA/K4SBnW3cRCpJ4A9sUxtAMmKMlH9P/8gSBqlJgJzxstWAcO xxsOHosKZ9LxANhrBamEVwr1oBm6Lq+5vmrRCKc6y+z+kDIVQBMqff6dVjqiIVclDi 3waHTNzaRJRM1ftegmYJFcuyWfkSp9d5H4eaP6eZflGtFEarO9mrIDtW9eSSGWnH1L M0Y9O28ZPF+4/bUcJzAjtDS8KD+FqceHDrKXkgv9jMQzivP4ArU+QF6+r+wTpxem4a xjAKu5IupzYHg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V8RzT6q9Jz6tsf; Wed, 3 Apr 2024 03:31:17 +0200 (CEST) From: Vinicius Monego Date: Wed, 3 Apr 2024 01:30:23 +0000 Message-Id: <5218dbb3b4618f28e841477142c0beab934d445e.1712107465.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/graphics.scm (partio): New variable. Change-Id: I680eebd45a3d38853a5907ee444f1ca4d54f2a44 --- gnu/packages/graphics.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index b593f03690..360a1c89f1 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1518,6 +1518,38 @@ (define-public openmw-openscenegraph #~(modify-phases #$phases (delete 'copy-plugins))))))))) +(define-public partio + (package + (name "partio") + (version "1.17.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wdas/partio") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1m0hrhzy3wlh5qi4rjkxrlcvgc1q41nqr2rwl6j07arr3z4mnpy1")))) + (build-system cmake-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'set-LDFLAGS + (lambda _ + (setenv "LDFLAGS" + (string-append + "-Wl,-rpath=" #$output "/lib"))))))) + (native-inputs (list python-wrapper swig)) + (inputs (list freeglut libglvnd zlib)) + (home-page "https://partio.us/") + (synopsis "Library for particle IO and manipulation") + (description + "Partio is a C++ library for reading, writing and manipulating a variety +of standard particle formats (GEO, BGEO, PTC, PDB, PDA). It has a Python API +and a collection of simple command-line tools.") + (license license:bsd-3))) + (define-public povray (package (name "povray") From patchwork Wed Apr 3 01:30:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62654 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 F238227BBE9; Wed, 3 Apr 2024 02:32:34 +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 E2C5627BBEB for ; Wed, 3 Apr 2024 02:32:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrpTu-0008JS-Go; Tue, 02 Apr 2024 21:32:02 -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 1rrpTs-0008Hd-DT for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:00 -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 1rrpTs-0001Bp-4V for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrpTw-0002DC-4x for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH v3 4/9] gnu: Add pystring. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 01:32:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70035 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70035@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 70035-submit@debbugs.gnu.org id=B70035.17121078958266 (code B ref 70035); Wed, 03 Apr 2024 01:32:04 +0000 Received: (at 70035) by debbugs.gnu.org; 3 Apr 2024 01:31:35 +0000 Received: from localhost ([127.0.0.1]:56614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTS-00029F-S9 for submit@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:35 -0400 Received: from mout02.posteo.de ([185.67.36.66]:53347) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTQ-000284-42 for 70035@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:33 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 72038240101 for <70035@debbugs.gnu.org>; Wed, 3 Apr 2024 03:31:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1712107882; bh=mFfLlijsRIHSQau664UOfXE0rg1puY0eGfl5Vd5UdLk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=h/zpL6LwJ7RiMqMq7H/EJS0168cdohPJW8VnsWcgmR4Bx3/uq9vIZt/5m0FWehHu1 X6DvIGS5YZJyBtjG2rZDwSQrT7Q9ZAbSgsgRjroFLjCk20ZNopVvxuzm1Sj29ViFvh KT9uZdLThC0rMfBuc53LcAGK6ioTZdiM5kHn4lXfUX1qhooxRoFyVnWi9+0KrFSJbz F6SS02hehpVQJmhiULRfi9MeUQJZU4l+TqPS5EDaO3JqiY4+vIWChUJ4xmL72PeThg LORoeLo7i92vZjsAk7b7YxbaDdgFLTI1DZOyZjvB38N1YtT3BcrxXhhw4NWARauSVI IELZDT8Fhmj1w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V8RzY4rK6z6tx5; Wed, 3 Apr 2024 03:31:21 +0200 (CEST) From: Vinicius Monego Date: Wed, 3 Apr 2024 01:30:24 +0000 Message-Id: <2d5c8882ce6a7e3913872b68b0f2cd3503283467.1712107465.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/cpp.scm (pystring): New variable. Change-Id: Ifff1ae3d3ed8ec880a2dd098d6d81de28d7bdda6 --- gnu/packages/cpp.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 2c04920166..7c3c35e048 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -477,6 +477,44 @@ (define-public rct (license (list license:expat ; cJSON license:bsd-4))))) ; everything else (LICENSE.txt) +(define-public pystring + (package + (name "pystring") + (version "1.1.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/imageworks/pystring") + (commit (string-append "v" version)))) + (sha256 + (base32 "0h12x24skrlx4fv0k5vl8wnar8gi6bq091yp93awkwsbnm8qwkzd")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + ;; The install phase doesn't install the header + (add-after 'install 'install-header + (lambda _ + (mkdir-p (string-append #$output "/include")) + (copy-file + (string-append #$(package-source this-package) + "/pystring.h") + (string-append #$output + "/include/pystring.h"))))))) + (native-inputs (list pkg-config)) + (home-page "https://github.com/imageworks/pystring") + (synopsis "C++ functions matching the Python string methods") + (description + "Pystring is a collection of C++ functions which match the interface and +behavior of Python's string class methods using std::string. Implemented in +C++, it does not require or make use of a python interpreter. It provides +convenience and familiarity for common string operations not included in the +standard C++ library. It's also useful in environments where both C++ and +Python are used.") + (license license:bsd-3))) + (define-public dashel (package (name "dashel") From patchwork Wed Apr 3 01:30:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62658 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 88FA927BBEA; Wed, 3 Apr 2024 02:32:45 +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 0B9C327BBE9 for ; Wed, 3 Apr 2024 02:32:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrpTu-0008JY-ND; Tue, 02 Apr 2024 21:32:02 -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 1rrpTs-0008Hy-Uy for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:00 -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 1rrpTs-0001EY-JJ for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrpTw-0002DM-JU for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH v3 5/9] gnu: Add minizip-ng. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 01:32:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70035 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70035@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 70035-submit@debbugs.gnu.org id=B70035.17121078978283 (code B ref 70035); Wed, 03 Apr 2024 01:32:04 +0000 Received: (at 70035) by debbugs.gnu.org; 3 Apr 2024 01:31:37 +0000 Received: from localhost ([127.0.0.1]:56618 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTV-00029V-FA for submit@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:37 -0400 Received: from mout02.posteo.de ([185.67.36.66]:59605) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTT-00028K-IU for 70035@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:36 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id E0452240101 for <70035@debbugs.gnu.org>; Wed, 3 Apr 2024 03:31:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1712107885; bh=MNX8xU7Cn+QIe6lPVpF+s348fJweNiCBJrM7ZCBeo+o=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=qk6BvU5ptqlUazQqokpZh/mozob2KPH9x077dpJNx5+XOkicBho/TvCPKyz01x+jh svmSdQDlGfwUv89BqUYUGXPMGF0xAK6XZuQs6YwhY84kB57Zo+6nUCNpf3GAaoZzpW XYh7Mo3Z3XGmTEgcH/G9cUPbgd/GQmgYcvNTXrDkQZ7wkTp9Q8Gdnh3WdxpVXkLDnT Yrk+3qOsMTEanuaFWNnEyiooB8RkSMJpGPjLcC0+aUJ0sHCRhfkGDFd2dhvWhxr8Sq BSUfOIVbs6gPvfs2d20gG9wauiM3D50mGLC2C7brlolzJwZFdCA3Z0vaJv5LtmoIna JNgUUoLQYbgDA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V8Rzd1TGgz6tx5; Wed, 3 Apr 2024 03:31:24 +0200 (CEST) From: Vinicius Monego Date: Wed, 3 Apr 2024 01:30:25 +0000 Message-Id: <1440e71bf6b321e2a3a5fe20ec73e9fb85ccb4bd.1712107465.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/compression.scm (minizip-ng): New variable. Change-Id: I429dc542c1610383962c9971c2bef5a94c1f8bc6 --- gnu/packages/compression.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 5de17b6b51..02a20e5c62 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2022 Greg Hogan ;;; Copyright © 2022 Zhu Zihao ;;; Copyright © 2021 Foo Chuan Wei +;;; Copyright © 2024 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -769,6 +770,32 @@ (define-public sfarklib with the sfArk algorithm.") (license license:gpl3+))) +(define-public minizip-ng + (package + (name "minizip-ng") + (version "4.0.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zlib-ng/minizip-ng") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lgx4s4aykxn8x3b4m4c4isasd2608bbyfm4lxc2spcc4xqwhzkz")))) + (build-system cmake-build-system) + (arguments + (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON" + "-DMZ_BUILD_TESTS=ON" + "-DMZ_BUILD_UNIT_TESTS=ON"))) + (native-inputs (list googletest pkg-config)) + (inputs (list openssl zlib `(,zstd "lib"))) + (home-page "https://github.com/zlib-ng/minizip-ng") + (synopsis "Zip manipulation library") + (description "@code{minizip-ng} is a zip manipulation library written in +C, forked from the zip manipulation library found in the zlib distribution.") + (license license:bsd-3))) + (define-public sfarkxtc (let ((commit "13cd6f93725a90d91ec5ea75babf1dbd694ac463") (revision "1")) From patchwork Wed Apr 3 01:30:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62656 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 20D0A27BBEC; Wed, 3 Apr 2024 02:32:37 +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=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 0D93B27BBEA for ; Wed, 3 Apr 2024 02:32:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrpTu-0008JM-Cb; Tue, 02 Apr 2024 21:32:02 -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 1rrpTt-0008IR-B7 for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:01 -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 1rrpTt-0001Eh-21 for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrpTx-0002DT-1c for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH v3 6/9] gnu: opencolorio: Update to 2.3.2. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 01:32:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70035 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70035@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 70035-submit@debbugs.gnu.org id=B70035.17121079048342 (code B ref 70035); Wed, 03 Apr 2024 01:32:05 +0000 Received: (at 70035) by debbugs.gnu.org; 3 Apr 2024 01:31:44 +0000 Received: from localhost ([127.0.0.1]:56622 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTZ-0002AG-TP for submit@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:44 -0400 Received: from mout02.posteo.de ([185.67.36.66]:47073) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTX-00029A-1y for 70035@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:40 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 5F2BF240101 for <70035@debbugs.gnu.org>; Wed, 3 Apr 2024 03:31:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1712107889; bh=UFSTPn5igTVD/XbWZXrZPSrfInsKpPLM8dvtZJurF10=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=XLZcRX0w0JxVLJi4g9xDwuNfhJ7akODSN8Rfvg/kBBKJgBPI3rplXSjx7mrIHfbbG yMYG8TF4dUGj/9DC8HgW5Za6hNtzF0zVsSk7lhdq/PnohvnlYj7WDD1FLIeMmlmMqM Fbd5T4gqC6XhHwXaArcF931zeFKrYtrb4uJHveZ2mPh3Kcx35R9619zu9891srR6Xq jaWjgTzFUSyTS6EvKM9wU8UcjfZvKDMZ3IBxJqWtdXbCLdbpJ2LVjfN6Qo1oz7x+Ma l0CNnsmpZ7G3Pq1m9YHYLSj026DI4Z12UW9KiZuppUIttHGtFxkYiAoa/T0kzYBrMU 1hWNS43wiKiHg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V8Rzh4TzTz6tx5; Wed, 3 Apr 2024 03:31:28 +0200 (CEST) From: Vinicius Monego Date: Wed, 3 Apr 2024 01:30:26 +0000 Message-Id: <0a5f01027eb7e51ab11ef4ff2314474d4b0898cb.1712107465.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-processing.scm (opencolorio): Update to 2.3.2. [source]: Remove snippet. [arguments]<#:configure-flags>: Unset "-DCMAKE-CXX_FLAGS", "DOCIO_BUILD_STATIC", "-DUSE_EXTERNAL_TINXML", "-DUSE_EXTERNAL_LCMS". Add "-DCIO_BUILD_GPU_TESTS=false". <#:phases>: Delete the patch-test-suite phase. [native-inputs]: Remove git, pkg-config. Add openimageio, pybind11-2.10, python-wrapper. [inputs]: Remove openexr-2, tinyxml. Add expat, freeglut, glew, imath, libglvnd, minizip-ng, openexr, pystring, yaml-cpp, zlib. [license]: Simplify. * gnu/packages/patches/opencolorio-fix-build-with-gcc11.patch: Delete patch. * gnu/local.mk (dist_patch_DATA): Unregister it. Change-Id: Iafd87762df81d0f5c23089251b4241a57d414dc4 --- gnu/local.mk | 1 - gnu/packages/image-processing.scm | 63 ++++++------------- .../opencolorio-fix-build-with-gcc11.patch | 37 ----------- 3 files changed, 20 insertions(+), 81 deletions(-) delete mode 100644 gnu/packages/patches/opencolorio-fix-build-with-gcc11.patch diff --git a/gnu/local.mk b/gnu/local.mk index f2b480bded..3a78b71d66 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1765,7 +1765,6 @@ dist_patch_DATA = \ %D%/packages/patches/openboardview-use-system-imgui.patch \ %D%/packages/patches/openboardview-use-system-mpc.patch \ %D%/packages/patches/openbox-python3.patch \ - %D%/packages/patches/opencolorio-fix-build-with-gcc11.patch \ %D%/packages/patches/openjdk-currency-time-bomb.patch \ %D%/packages/patches/openjdk-currency-time-bomb2.patch \ %D%/packages/patches/openjdk-9-pointer-comparison.patch \ diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 9d16109b05..8afe50a57a 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -260,57 +260,36 @@ (define-public mia (define-public opencolorio (package (name "opencolorio") - (version "1.1.1") + (version "2.3.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/AcademySoftwareFoundation/OpenColorIO") (commit (string-append "v" version)))) - (patches (search-patches "opencolorio-fix-build-with-gcc11.patch")) (sha256 - (base32 "12srvxca51czpfjl0gabpidj9n84mw78ivxy5w75qhq2mmc798sb")) - (file-name (git-file-name name version)) - (modules '((guix build utils))) - (snippet - `(begin - ;; Remove bundled tarballs, patches, and .jars(!). XXX: Upstream - ;; claims to have fixed USE_EXTERNAL_YAML, but it still fails with: - ;; https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/517 - ;; When removing it, also remove it from the licence field comment. - (for-each delete-file-recursively - (filter - (lambda (full-name) - (let ((file (basename full-name))) - (not (or (string-prefix? "yaml-cpp-0.3" file) - (string=? "unittest.h" file))))) - (find-files "ext" ".*"))) - - #t)))) + (base32 "1h33s2pfy28nj836kx6xx3iks7v38g3kx7c4f6zn1dpskl0zf809")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - `(#:configure-flags - (list (string-append "-DCMAKE_CXX_FLAGS=" - "-Wno-error=deprecated-declarations " - "-Wno-error=unused-function") - "-DOCIO_BUILD_STATIC=OFF" - ;; "-DUSE_EXTERNAL_YAML=ON" - "-DUSE_EXTERNAL_TINYXML=ON" - "-DUSE_EXTERNAL_LCMS=ON") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-test-suite - (lambda _ - (substitute* "src/core_tests/CMakeLists.txt" - (("/bin/sh") (which "bash"))) - #t))))) + ;; XXX: GPU tests are failing. + (list #:configure-flags #~(list "-DOCIO_BUILD_GPU_TESTS=false"))) (native-inputs - (list git pkg-config)) + ;; XXX: OCIO has unit tests for openshadinglanguage, but they fail. + ;; Add openshadinglanguage to native-inputs to build them. + (list openimageio pybind11-2.10 python-wrapper)) (inputs - ;; XXX Adding freeglut, glew, ilmbase, mesa, and openimageio for - ;; ocioconvert fails: error: conflicting declaration ?typedef void - ;; (* PFNGLGETFRAGMENTMATERIALFVSGIXPROC)(GLenum, GLenum, GLfloat*) - (list lcms openexr-2 tinyxml)) + (list expat + freeglut + glew + imath + lcms + libglvnd + minizip-ng + openexr + pystring + yaml-cpp + zlib)) (home-page "https://opencolorio.org") (synopsis "Color management for visual effects and animation") (description @@ -323,9 +302,7 @@ (define-public opencolorio OCIO is compatible with the @acronym{ACES, Academy Color Encoding Specification} and is @acronym{LUT, look-up table}-format agnostic, supporting many popular formats.") - (license (list license:expat ; docs/ociotheme/static, ext/yaml-cpp-* - license:zlib ; src/core/md5 - license:bsd-3)))) ; the rest + (license (list license:bsd-3)))) (define-public vtk (package diff --git a/gnu/packages/patches/opencolorio-fix-build-with-gcc11.patch b/gnu/packages/patches/opencolorio-fix-build-with-gcc11.patch deleted file mode 100644 index 06507db206..0000000000 --- a/gnu/packages/patches/opencolorio-fix-build-with-gcc11.patch +++ /dev/null @@ -1,37 +0,0 @@ -Fix build failure with GCC 11: - ------- -[...] -/tmp/guix-build-opencolorio-1.1.1.drv-0/source/src/core/ImageDesc.cpp:60:51: error: ‘this’ pointer is null [-Werror=nonnull] - 60 | os << "width=" << packedImg->getWidth() << ", "; - | ^ -/tmp/guix-build-opencolorio-1.1.1.drv-0/source/src/core/ImageDesc.cpp:274:10: note: in a call to non-static member function ‘long int OpenColorIO::v1::PackedImageDesc::getWidth() const’ - 274 | long PackedImageDesc::getWidth() const - | ^~~~~~~~~~~~~~~ -/tmp/guix-build-opencolorio-1.1.1.drv-0/source/src/core/ImageDesc.cpp:61:53: error: ‘this’ pointer is null [-Werror=nonnull] - 61 | os << "height=" << packedImg->getHeight() << ", "; - | ^ -/tmp/guix-build-opencolorio-1.1.1.drv-0/source/src/core/ImageDesc.cpp:279:10: note: in a call to non-static member function ‘long int OpenColorIO::v1::PackedImageDesc::getHeight() const’ - 279 | long PackedImageDesc::getHeight() const - | ^~~~~~~~~~~~~~~ -cc1plus: all warnings being treated as errors -[...] ------- - -Patch copied from Gentoo: - -https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e726d850502018b6760da78dbd4a419603016b8 - -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 1eb691b6..cff9bd83 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -23,8 +23,6 @@ if(WIN32) - if("${CMAKE_BUILD_TYPE}" STREQUAL "Release") - set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX") - endif() --else() -- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror") - endif() - - # SHARED From patchwork Wed Apr 3 01:30:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62655 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 CEF4727BBEE; Wed, 3 Apr 2024 02:32:35 +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=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 E7E0227BBED for ; Wed, 3 Apr 2024 02:32:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrpTw-0008KG-L9; Tue, 02 Apr 2024 21:32:04 -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 1rrpTt-0008J0-OH for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:01 -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 1rrpTt-0001GD-FN for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrpTx-0002Da-Fr for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH v3 7/9] gnu: openvdb: Update to 11.0.0. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 01:32:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70035 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70035@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 70035-submit@debbugs.gnu.org id=B70035.17121079058356 (code B ref 70035); Wed, 03 Apr 2024 01:32:05 +0000 Received: (at 70035) by debbugs.gnu.org; 3 Apr 2024 01:31:45 +0000 Received: from localhost ([127.0.0.1]:56626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTd-0002Af-40 for submit@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:45 -0400 Received: from mout01.posteo.de ([185.67.36.65]:59055) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTa-00029X-Qt for 70035@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:44 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 2820E240027 for <70035@debbugs.gnu.org>; Wed, 3 Apr 2024 03:31:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1712107893; bh=GmNP5mI0NODMAI8XQgI+0FNnsT4Vf/bQjF8dpF5WjQ0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=oRA6HjKCAutAaxlE/ohih3b4GTkpXFlVaxx8ZkttQDG68pTtqO5dx5Gk3Z+NZq7p8 oJFOFiHcmG+5amiULltq7EkzkT4ZWaaG6dAo/YOWg+87UHhyqTQGOhF21QH1lrDXHy 1Ez3ElsdFecQKix52cOoyzp5CAn1pTXGbz+VjR3RWHK+KcwscGuv3Z/05JxOviXYOl iS1jiLrOz+evf3L82fK5mtLCUTy9ykqlYkteXEzX+w0hCxh8o+9mDTdjLgKtZ/g4sc shwjA0LDMcBWaWAAcPD/NaDrgHSXSw8KR65l3JXuY0pR9GV4Pvhx3Y7Eu15dfBXRip 8B8yW72d6xmeg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V8Rzl72Q1z6tx5; Wed, 3 Apr 2024 03:31:31 +0200 (CEST) From: Vinicius Monego Date: Wed, 3 Apr 2024 01:30:27 +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/graphics.scm (openvdb): Update to 11.0.0. [inputs]: Add jemalloc. Remove ilmbase. Change-Id: Ia8b248c1171c62344ff6da924afa5f4d83cd8d49 --- gnu/packages/graphics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 360a1c89f1..8fda96e6e6 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -461,7 +461,7 @@ (define-public embree (define-public openvdb (package (name "openvdb") - (version "8.2.0") + (version "11.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -471,14 +471,14 @@ (define-public openvdb (file-name (git-file-name name version)) (sha256 (base32 - "0856697hnwk8xsp29kx8y2p1kliy0bdwfsznxm38v4690vna15rk")))) + "0r6q7bl8513ggrvx3n73j1s3f7n5x1rxy5xi471qyrya95gy6c60")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list (string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")))) (inputs - (list boost c-blosc ilmbase tbb zlib)) + (list boost c-blosc jemalloc tbb zlib)) (native-inputs (list pkg-config)) (home-page "https://www.openvdb.org/") From patchwork Wed Apr 3 01:30:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62659 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 605A127BBEC; Wed, 3 Apr 2024 02:32:47 +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 D33FE27BBE2 for ; Wed, 3 Apr 2024 02:32:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrpTw-0008KH-T0; Tue, 02 Apr 2024 21:32:04 -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 1rrpTu-0008JH-6H for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:02 -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 1rrpTt-0001IL-U2 for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrpTx-0002Di-TF for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH v3 8/9] gnu: opensubdiv: Update to 3.6.0. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 01:32:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70035 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70035@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 70035-submit@debbugs.gnu.org id=B70035.17121079088370 (code B ref 70035); Wed, 03 Apr 2024 01:32:05 +0000 Received: (at 70035) by debbugs.gnu.org; 3 Apr 2024 01:31:48 +0000 Received: from localhost ([127.0.0.1]:56630 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTf-0002Av-M8 for submit@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:48 -0400 Received: from mout01.posteo.de ([185.67.36.65]:44321) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTe-0002A6-DZ for 70035@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:46 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id B5AF2240027 for <70035@debbugs.gnu.org>; Wed, 3 Apr 2024 03:31:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1712107896; bh=6291lKrDAmznBzN18mO7hNlz4CMXzjYNem9jqgEi8sg=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=eUPyk7oEQ0BeIxWcRKDiPeFSDO9a/xq+q9qKGEEyMQwW3tlqrygOqlU8WbIBzzOWB CYzcRj06I7a6OIQ5qbELFyYcKWYjkvKYqeCRrLXP0UXr+aCS6owSj3inL1AD7qiXHm pQ7/32egUGzuZAoh+phe0HBpkTa1lrZYU4OHhfd3ZE9uVff1rgQhRd3NWFIiBu9ipp 7YAfp1RIePk6U04OUGl9XrPG+6HchJVgq7WAFNKKdOocikq7Vazv6KoXMr/zqmNe3M UMwHQ2vtP2njL5h8MhyhqEUJA/ncXCcSTrot1an5RrT2PBDozVFkCvh7sRuUgCFwXS 3u25RV+nN5btA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V8Rzr02tGz6tx5; Wed, 3 Apr 2024 03:31:35 +0200 (CEST) From: Vinicius Monego Date: Wed, 3 Apr 2024 01:30:28 +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/graphics.scm (opensubdiv): Update to 3.6.0. [arguments]: Use G-Expressions. Delete the set-glew-location phase. Change-Id: Ie37f70a5146e5072b362a4439d0669ea19ca2869 --- gnu/packages/graphics.scm | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 8fda96e6e6..555800e517 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1907,7 +1907,7 @@ (define-public fgallery (define-public opensubdiv (package (name "opensubdiv") - (version "3.4.0") + (version "3.6.0") (source (origin (method git-fetch) (uri (git-reference @@ -1917,20 +1917,15 @@ (define-public opensubdiv (file-name (git-file-name name version)) (sha256 (base32 - "0cippg6aqc5dlya1cmh3908pwssrg52fwgyylnvz5343yrxmgk12")))) + "0h9scxiigijzlpv4r0s0nhxlndhv1cmarb2bqgmlwcln1jjvlb4n")))) (build-system cmake-build-system) (arguments - `(#:phases (modify-phases %standard-phases - (add-before 'configure 'set-glew-location - (lambda* (#:key inputs #:allow-other-keys) - (setenv "GLEW_LOCATION" (assoc-ref inputs "glew")) - #t)) - (add-before 'check 'start-xorg-server - (lambda* (#:key inputs #:allow-other-keys) - ;; The test suite requires a running X server. - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1") - #t))))) + (list #:phases #~(modify-phases %standard-phases + (add-before 'check 'start-xorg-server + (lambda* (#:key inputs #:allow-other-keys) + ;; The test suite requires a running X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1")))))) (native-inputs (list xorg-server-for-tests)) (inputs From patchwork Wed Apr 3 01:30:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62657 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 5FD1827BBEA; Wed, 3 Apr 2024 02:32:37 +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 2CD9827BBE2 for ; Wed, 3 Apr 2024 02:32:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrpTv-0008K8-OU; Tue, 02 Apr 2024 21:32:03 -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 1rrpTu-0008JV-Kj for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:02 -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 1rrpTu-0001IR-CH for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrpTy-0002Dp-DN for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH v3 9/9] gnu: blender: Update to 3.6.10. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 01:32:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70035 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70035@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 70035-submit@debbugs.gnu.org id=B70035.17121079138421 (code B ref 70035); Wed, 03 Apr 2024 01:32:06 +0000 Received: (at 70035) by debbugs.gnu.org; 3 Apr 2024 01:31:53 +0000 Received: from localhost ([127.0.0.1]:56634 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTl-0002Bk-29 for submit@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:53 -0400 Received: from mout02.posteo.de ([185.67.36.66]:57959) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTi-0002Ag-Cy for 70035@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:51 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id B52B7240101 for <70035@debbugs.gnu.org>; Wed, 3 Apr 2024 03:31:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1712107900; bh=eboYQXN80eOjKoFzoVuW/VgfoN+Kdw4/GP4s1Z/Rlxo=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=QHEkpe5KZy0fthQQmmipr/Mi+JKGLzGEWn9d+OXnP9TYCtSFsdjpSYjvwsnDLF9vM gO1i6PynW9LQ7EpI4UztTumwLpIpP6MC2fjYMiy6eJKXk5WuW0nlcs4HSD67EmdQc1 s1/Tg7Bqba0y3eCUZ8kZzWDZ5NXQrvmBsOuX3hcMhS3XagEbJnOHzuIekH/mX5b03m ojCeGeihqJ61R8iOV/vbq3YkXqZh0t9l/9gRsGzmTc/RKOr02SHRq8x0dJwQohnkih LWLnQEJH9zqsffUnrqs9CA5GbyWEgiKGonOu8o93YILgyC8KzeijdgQPG1XBqfDWl/ yh6mA6GYK6azQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V8Rzv6Ng3z6twB; Wed, 3 Apr 2024 03:31:39 +0200 (CEST) From: Vinicius Monego Date: Wed, 3 Apr 2024 01:30:29 +0000 Message-Id: <6f9730b7537fc44d36c0b28db981919d16c3f965.1712107465.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/graphics.scm (blender): Update to 3.6.10. [arguments]<#:configure-flags>: Unset "-DPYTHON_LIBRARY", "-DPYTHON_LIBPATH", "-DPYTHON_VERSION", "-DPYTHON_NUMPY_INCLUDE_DIRS", "-DPYTHON_NUMPY_PATH", "-DCMAKE_CXX_FLAGS". [inputs]: Add libepoxy. Replace freetype with freetype-with-brotli, ilmbase with imath, openexr-2 with openexr. Change-Id: Ifb5e5cdb4d26aac9626bf5cd77e171d8b0ebfaed --- gnu/packages/graphics.scm | 43 +++++++-------------------------------- 1 file changed, 7 insertions(+), 36 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 555800e517..fc99da8a12 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -493,14 +493,14 @@ (define-public openvdb (define-public blender (package (name "blender") - (version "3.3.5") ;3.3.x is the current LTS version + (version "3.6.10") ;3.6.x is the current LTS version (source (origin (method url-fetch) (uri (string-append "https://download.blender.org/source/" "blender-" version ".tar.xz")) (sha256 (base32 - "1pwl4lbc00g0bj97rd8l9fnrv3w1gny9ci6mrma3pp2acgs56502")))) + "1srwr365y40hhpjmfsg52rphdybvin0ay2r23pknm7b9pkpw0wqs")))) (build-system cmake-build-system) (arguments (list @@ -520,48 +520,19 @@ (define-public blender "-DWITH_MOD_OCEANSIM=ON" "-DWITH_OPENVDB=ON" "-DWITH_OPENSUBDIV=ON" - "-DWITH_PYTHON_INSTALL=OFF" - (string-append "-DPYTHON_LIBRARY=python" #$python-version) - (string-append "-DPYTHON_LIBPATH=" - (assoc-ref %build-inputs "python") - "/lib") - (string-append "-DPYTHON_INCLUDE_DIR=" - (assoc-ref %build-inputs "python") - "/include/python" #$python-version) - (string-append "-DPYTHON_VERSION=" #$python-version) - (string-append "-DPYTHON_NUMPY_INCLUDE_DIRS=" - (assoc-ref %build-inputs "python-numpy") - "/lib/python" #$python-version - "/site-packages/numpy/core/include/") - (string-append "-DPYTHON_NUMPY_PATH=" - (assoc-ref %build-inputs "python-numpy") - "/lib/python" #$python-version - "/site-packages/") - ;; OpenEXR propagates ilmbase, but its include files do not - ;; appear in the C_INCLUDE_PATH, so we need to add - ;; "$ilmbase/include/OpenEXR/" to the C_INCLUDE_PATH to - ;; satisfy the dependency on "half.h" and "Iex.h". - (string-append "-DCMAKE_CXX_FLAGS=-I" - (search-input-directory %build-inputs - "include/OpenEXR")))) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'fix-broken-import - (lambda _ - (substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py" - (("import encode_bin") - "from . import encode_bin"))))))) + "-DWITH_PYTHON_INSTALL=OFF")))) (inputs (list boost embree ffmpeg-5 fftw - freetype + freetype-with-brotli glew gmp ;needed for boolean operations on meshes - ilmbase + imath jack-1 jemalloc + libepoxy libjpeg-turbo libpng libsndfile @@ -571,7 +542,7 @@ (define-public blender libxrender openal opencolorio - openexr-2 + openexr openimageio openjpeg opensubdiv