From patchwork Wed Mar 27 17:17:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62302 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 E6DD227BBEC; Wed, 27 Mar 2024 17:19:35 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-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 58F0A27BBE2 for ; Wed, 27 Mar 2024 17:19:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpWvZ-00008B-NB; Wed, 27 Mar 2024 13:19:05 -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 1rpWvW-000078-4O for guix-patches@gnu.org; Wed, 27 Mar 2024 13:19: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 1rpWvV-0006Zp-Ro for guix-patches@gnu.org; Wed, 27 Mar 2024 13:19:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpWvW-00031N-1W for guix-patches@gnu.org; Wed, 27 Mar 2024 13:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH 1/8] gnu: openimageio: Update to 2.5.9.0. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Mar 2024 17:19:01 +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.171155992311471 (code B ref 70035); Wed, 27 Mar 2024 17:19:01 +0000 Received: (at 70035) by debbugs.gnu.org; 27 Mar 2024 17:18:43 +0000 Received: from localhost ([127.0.0.1]:38271 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpWvC-0002yx-JQ for submit@debbugs.gnu.org; Wed, 27 Mar 2024 13:18:42 -0400 Received: from mout01.posteo.de ([185.67.36.65]:36547) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpWvA-0002yj-Vg for 70035@debbugs.gnu.org; Wed, 27 Mar 2024 13:18:41 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id D6F1E240028 for <70035@debbugs.gnu.org>; Wed, 27 Mar 2024 18:18:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711559914; bh=vzeJOvFgU3HraWzpqky/2+M9sEzkEkMWYgV92YqrlmY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=JB98ujNn4gwpQ3M+feiB0HQ/2tvixLdfjzGna9mU/uHHgvy1d1USfVdnwaL6q/TEW Wo3k/kPzwAUP9+6xgxrVP3mqZsFeuutKQNvprBSkTQrWVmI6DJdDixZC3x5ircWYo7 uaWrXMyFFM/zTxI2tEZxSycKrK3Hh4v/UmrJzTEQjKZ98HNMKblRgNWFa3nYb+PwDy LAI0TDPa9z/uLx0tiI7e+CK83KSU00teuoQQEkebFsqU/ti3qOdYQ6v17r1n7LnjbD XwUHZjVQUbVakafGKOIVg13OqHHNMbLnmKX1W4OQNt+eORLXMbca5j+2mbv0KPNHbC p/IAzr0pxz3+A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V4YKj2T1Jz9rxL; Wed, 27 Mar 2024 18:18:32 +0100 (CET) From: Vinicius Monego Date: Wed, 27 Mar 2024 17:17:41 +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 (openimageio): Update to 2.5.9.0. [source]: Adjust tag prefix. [inputs]: Replace openexr-2 with openexr, fmt-8 with fmt. Use package labels. Change-Id: I7016f89c5b7c78cbc1ffeac23e5c0cefe2a8f43b --- gnu/packages/graphics.scm | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 9bc81a3a81..fcc7886b34 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1313,16 +1313,16 @@ (define-public openexr-2 (define-public openimageio (package (name "openimageio") - (version "2.2.21.0") + (version "2.5.9.0") (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")))) + "1djqna387vargrvf6dl53bsb7j36lvah4l9fvj0818s4sjkw4npd")))) (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 @@ -1333,20 +1333,19 @@ (define-public openimageio (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)) (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 Mar 27 17:17:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62303 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 907B327BBE2; Wed, 27 Mar 2024 17:19:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-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 8D39A27BBEA for ; Wed, 27 Mar 2024 17:19:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpWvZ-00008C-N0; Wed, 27 Mar 2024 13:19:05 -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 1rpWvY-00007P-1i for guix-patches@gnu.org; Wed, 27 Mar 2024 13:19:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpWvW-0006a8-E3 for guix-patches@gnu.org; Wed, 27 Mar 2024 13:19:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpWvW-00031b-Jh for guix-patches@gnu.org; Wed, 27 Mar 2024 13:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH 2/8] gnu: openshadinglanguage: Update to 1.13.7.0. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Mar 2024 17:19: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.171155992911528 (code B ref 70035); Wed, 27 Mar 2024 17:19:02 +0000 Received: (at 70035) by debbugs.gnu.org; 27 Mar 2024 17:18:49 +0000 Received: from localhost ([127.0.0.1]:38275 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpWvI-0002zs-V5 for submit@debbugs.gnu.org; Wed, 27 Mar 2024 13:18:49 -0400 Received: from mout01.posteo.de ([185.67.36.65]:38689) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpWvE-0002yo-VC for 70035@debbugs.gnu.org; Wed, 27 Mar 2024 13:18:46 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id D1651240028 for <70035@debbugs.gnu.org>; Wed, 27 Mar 2024 18:18:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711559918; bh=0ttb4i0m8B7HPQj54L+aPWcKrIwdH4zTKvym+1A0jUE=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=iSIkNa9qr2ObnKoQJnPVLX31K4z4NXA/DqTdOhN9aJu4s50Df/gTzMPA7O/xQkHLq 8r6KWzASaARrLoVoljfOUxQhRLFytkioHbdSm1mZfPIjtP+gf5KJ3g/t7lUsYgg48m 0tc2uhm8haujIoubcIdpMvtyHCCi0SCkyoFAInKZUhrJq0eqYrCCWVjRjTAYM7oswI 6RIULnm5/Hjm+QJU4B4BtJyCRym4fsAJ8aZsR2HNJow8LOPtgqRc7m6R1Vu623oE/k zgDqd/nDSVopqSLwkIcfYwVqXZioxfp/hLCi6HUeboBeNjq/a+iFiZ9X+Nbo2/Iwm9 B2FEbDVmjxOuw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V4YKn6vl1z9rxL; Wed, 27 Mar 2024 18:18:37 +0100 (CET) From: Vinicius Monego Date: Wed, 27 Mar 2024 17:17:42 +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.7.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 fcc7886b34..50786e594b 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.7.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 "0nb7kc7kh6k71wda3nzcwpiycx8lknl08y0c7ns6p7f4fab7kh1k")))) (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 Mar 27 17:17:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62300 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 BAC2B27BBE9; Wed, 27 Mar 2024 17:19:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-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 8C06027BBE2 for ; Wed, 27 Mar 2024 17:19:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpWva-00008Q-63; Wed, 27 Mar 2024 13:19:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpWvY-00007e-6f for guix-patches@gnu.org; Wed, 27 Mar 2024 13:19:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpWvW-0006aD-SG for guix-patches@gnu.org; Wed, 27 Mar 2024 13:19:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpWvX-00031o-1W for guix-patches@gnu.org; Wed, 27 Mar 2024 13:19:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH 3/8] gnu: Add partio. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Mar 2024 17:19: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.171155993511576 (code B ref 70035); Wed, 27 Mar 2024 17:19:03 +0000 Received: (at 70035) by debbugs.gnu.org; 27 Mar 2024 17:18:55 +0000 Received: from localhost ([127.0.0.1]:38279 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpWvO-00030M-EL for submit@debbugs.gnu.org; Wed, 27 Mar 2024 13:18:55 -0400 Received: from mout02.posteo.de ([185.67.36.66]:59471) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpWvJ-0002zG-UP for 70035@debbugs.gnu.org; Wed, 27 Mar 2024 13:18:53 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id B216A240106 for <70035@debbugs.gnu.org>; Wed, 27 Mar 2024 18:18:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711559923; bh=8qkQorPxGpXBQEeoE3rdEzWLfvPfbkjxU6IJNYynHi0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=KuD3qlvdMlBF1vm8pOhj/tOG762woT6vcsXG9sOeVLi0h0OqMZf33eQSf9o/XP1kL 1VVM9+J6gbLNPmPFN4xSWDlpH0FB/T3tCWdCS9jheuS1YMK3xzSUbJLPq26vCWNgoZ 2HphZSCdkUUIppHjCtjTOGxHfbTt4Tdv11lfQ/UX4+mDo3JDNaKW0wC6PF2Xj0tXya NxflrgQ4m3zKQMQ6ixmKlIYs2f09j5CzMaAaTEYlFsxkAw+WmSCqIzX1EUEOJ22IcI DOIuaDOeb0UMiMYsZ9H3CChaiMT0WgVzuUlM4BtyXAkTw3y0IDDuCDvTwkNQXTWVK3 nBLoBrXfIIRLw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V4YKt18qMz9rxD; Wed, 27 Mar 2024 18:18:41 +0100 (CET) From: Vinicius Monego Date: Wed, 27 Mar 2024 17:17:43 +0000 Message-Id: <595ca17f154d7229f9a81beb8cd2622de0437e82.1711551246.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 | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 50786e594b..55d87524db 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1519,6 +1519,43 @@ (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* (#:key inputs outputs #:allow-other-keys) + (setenv "LDFLAGS" + (string-append + "-Wl,-rpath=" + (assoc-ref outputs "out") "/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 Mar 27 17:17:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62299 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 986AC27BBEA; Wed, 27 Mar 2024 17:19:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-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 DE17927BBE2 for ; Wed, 27 Mar 2024 17:19:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpWva-00008R-93; Wed, 27 Mar 2024 13:19:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpWvY-00007R-6b for guix-patches@gnu.org; Wed, 27 Mar 2024 13:19:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpWvX-0006aR-8D for guix-patches@gnu.org; Wed, 27 Mar 2024 13:19:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpWvX-00031w-Ec for guix-patches@gnu.org; Wed, 27 Mar 2024 13:19:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH 4/8] gnu: Add pystring. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Mar 2024 17:19: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.171155994211622 (code B ref 70035); Wed, 27 Mar 2024 17:19:03 +0000 Received: (at 70035) by debbugs.gnu.org; 27 Mar 2024 17:19:02 +0000 Received: from localhost ([127.0.0.1]:38285 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpWvV-00031G-A9 for submit@debbugs.gnu.org; Wed, 27 Mar 2024 13:19:01 -0400 Received: from mout02.posteo.de ([185.67.36.66]:48907) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpWvP-000300-7t for 70035@debbugs.gnu.org; Wed, 27 Mar 2024 13:18:57 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 5FBF7240101 for <70035@debbugs.gnu.org>; Wed, 27 Mar 2024 18:18:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711559929; bh=Pp+C7AAhwchMRU3zrmcS9MXliwSfqHLE1pPE5lqprWU=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=Tsf1jtZIyvy3XCHqgmK/Wi6tbwOm9MUK3Hb8LXN+YgubbVjUragKXU+Gf/UOenBoz 8lXd5ChyRbUeJpQbcqbA8K9RwihrX6qQuRBeavOxD8I/Z1pp0zaDyLy00C+U2lIov4 khuHKPRYLOlGyoMUEAefXwijYqaxaqlfC7AMhyg6+UqOCXMsOXGSc+0iPsPU1RlFZM FdkyKx8NSHK6Y2/VSqYpQ8Wz4NcqeUzI3Wz5YD8LpvVUOQf7inkAgjmMHhNJmOSktX OwhvvaRkDVCd0WPATQB0i4lI+AqZizzAk8mtsWcr4wjBcXj28luahVzLE+ebDGot+0 y+u/BFLPGiN2g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V4YL031V8z9rxL; Wed, 27 Mar 2024 18:18:47 +0100 (CET) From: Vinicius Monego Date: Wed, 27 Mar 2024 17:17:44 +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/cpp.scm (pystring): New variable. Change-Id: Ifff1ae3d3ed8ec880a2dd098d6d81de28d7bdda6 --- gnu/packages/cpp.scm | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index acbe3e4836..02445eecea 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 @@ -477,6 +477,45 @@ (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 #:tests? #f + #: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/aseba-community/dashel") + (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 Mar 27 17:17:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62301 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 9443427BBE9; Wed, 27 Mar 2024 17:19:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-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 9F68E27BBE2 for ; Wed, 27 Mar 2024 17:19:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpWvb-00008k-1x; Wed, 27 Mar 2024 13:19:07 -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 1rpWvY-00008A-Kz for guix-patches@gnu.org; Wed, 27 Mar 2024 13:19:05 -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 1rpWvX-0006aZ-Ky for guix-patches@gnu.org; Wed, 27 Mar 2024 13:19:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpWvX-000323-QF for guix-patches@gnu.org; Wed, 27 Mar 2024 13:19:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH 5/8] gnu: Add minizip-ng. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Mar 2024 17:19: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.171155994211637 (code B ref 70035); Wed, 27 Mar 2024 17:19:03 +0000 Received: (at 70035) by debbugs.gnu.org; 27 Mar 2024 17:19:02 +0000 Received: from localhost ([127.0.0.1]:38287 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpWvV-00031M-Vs for submit@debbugs.gnu.org; Wed, 27 Mar 2024 13:19:02 -0400 Received: from mout02.posteo.de ([185.67.36.66]:51627) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpWvT-00030K-9c for 70035@debbugs.gnu.org; Wed, 27 Mar 2024 13:18:59 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 7094A240103 for <70035@debbugs.gnu.org>; Wed, 27 Mar 2024 18:18:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711559933; bh=MNX8xU7Cn+QIe6lPVpF+s348fJweNiCBJrM7ZCBeo+o=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=b9MqpvYnNo1bD5NvtJZHiUa7uLVG95aXY3F3YixBbqlGTnREHJ+TIJ5SwUPHUF3PN LpVBZq8o3KtPGQz8LgzHi8oszxB4ntjl9I443hJnSGLcwP+BBObuTcdNB/q/VnNFp3 99t1DN3xfYzQEmGA4x8P/FmKuCmgdwhg1ojADbleIlxiLYV30KIpbTTVhcsLKXXD/n BGIdygGiaGWqlSaiQn9zPR6Iy/bkmpsr65N6UCJkLNyuMPvfvJZJDiPes8WlUiC/AE bqD0O14a8Aai8uEr/KRyuJBl93XCg/eCZ5xjOCRqfmzbbNGAe1j9gwnV9CmiktgOk4 UPB6E7Pwyztfw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V4YL43bGcz9rxD; Wed, 27 Mar 2024 18:18:52 +0100 (CET) From: Vinicius Monego Date: Wed, 27 Mar 2024 17:17:45 +0000 Message-Id: <4756eccc822af87454ef7cdbcb949db7c2271807.1711551246.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 Mar 27 17:17:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62306 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 7DA4227BBE9; Wed, 27 Mar 2024 17:20:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-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 4C65D27BBE2 for ; Wed, 27 Mar 2024 17:20:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpWwX-0000Uc-U3; Wed, 27 Mar 2024 13:20:05 -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 1rpWwV-0000UG-8z for guix-patches@gnu.org; Wed, 27 Mar 2024 13:20:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpWwU-0006te-VY for guix-patches@gnu.org; Wed, 27 Mar 2024 13:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpWwV-00038L-35 for guix-patches@gnu.org; Wed, 27 Mar 2024 13:20:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH 6/8] gnu: opencolorio: Update to 2.3.2. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Mar 2024 17:20: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.171155995111742 (code B ref 70035); Wed, 27 Mar 2024 17:20:03 +0000 Received: (at 70035) by debbugs.gnu.org; 27 Mar 2024 17:19:11 +0000 Received: from localhost ([127.0.0.1]:38298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpWve-00033I-Lb for submit@debbugs.gnu.org; Wed, 27 Mar 2024 13:19:11 -0400 Received: from mout01.posteo.de ([185.67.36.65]:50565) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpWvX-000312-L3 for 70035@debbugs.gnu.org; Wed, 27 Mar 2024 13:19:04 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id C9EC7240027 for <70035@debbugs.gnu.org>; Wed, 27 Mar 2024 18:18:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711559937; bh=xnMmVSXF3A3A8587TJmSIA68R7OElUxbVFo0IEAn40U=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=ADWW7HjOCu15AJ8mb3rxztd/KUqbaLIiBKglt2b9Qc0oWVri6uPwwlgunBKALenSl cqx5MIgGuKZ1LrdJ3+HFc4qIdIRxnHLjFsXYwlDMTB9ijWm+HT8J1LiMI0uk+r38l6 dMAkZZayIFiOVeL1BnGOcMcRKBo+xSWxGG+pEVLwvJEDBXIwEVmpkmtb3RCNzBigEF rHdtHMApNK4+Q8yP/emmjoRYCzv+fQOGz8sxfD7on8FqvRS3NTQiZAdyA8THNqVivf reGdLD4k4pntrlMWW29jxOe8DbK/++yo0VZjkq/0nPSEX9rZxoymIzuzI13ZTbDKLw z9rFFu1RZWchw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V4YL85xPSz9rxL; Wed, 27 Mar 2024 18:18:56 +0100 (CET) From: Vinicius Monego Date: Wed, 27 Mar 2024 17:17:46 +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 (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. Change-Id: Iafd87762df81d0f5c23089251b4241a57d414dc4 --- gnu/packages/image-processing.scm | 63 ++++++++++--------------------- 1 file changed, 20 insertions(+), 43 deletions(-) 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 From patchwork Wed Mar 27 17:17:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62305 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 6B51D27BBE9; Wed, 27 Mar 2024 17:20:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-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 CB89B27BBE2 for ; Wed, 27 Mar 2024 17:20:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpWwe-0000WR-C5; Wed, 27 Mar 2024 13:20:12 -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 1rpWwV-0000UR-Sz for guix-patches@gnu.org; Wed, 27 Mar 2024 13:20:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpWwV-0006yp-Kd for guix-patches@gnu.org; Wed, 27 Mar 2024 13:20:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpWwV-00038T-RG for guix-patches@gnu.org; Wed, 27 Mar 2024 13:20:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH 7/8] gnu: openvdb: Update to 11.0.0. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Mar 2024 17:20: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.171155995111756 (code B ref 70035); Wed, 27 Mar 2024 17:20:03 +0000 Received: (at 70035) by debbugs.gnu.org; 27 Mar 2024 17:19:11 +0000 Received: from localhost ([127.0.0.1]:38300 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpWvf-00033L-3V for submit@debbugs.gnu.org; Wed, 27 Mar 2024 13:19:11 -0400 Received: from mout02.posteo.de ([185.67.36.66]:37481) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpWvb-00031Z-GC for 70035@debbugs.gnu.org; Wed, 27 Mar 2024 13:19:08 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 6C280240103 for <70035@debbugs.gnu.org>; Wed, 27 Mar 2024 18:19:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711559941; bh=4iMPveWdstKi4U6lSRraIIUltye7DbeRuY4pvigI4oY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=cEaE99AiKpshAAFx9p5b9zVh75fBPlILkCGGZLCmGQqu3y/2re6XaAR+rffMbADCk Al+CGQFen2wp8kCw92sp1lU0ZBQdMNa4Ql1FXXzxCgyrLUql0ZxUO90c0rvLw3swBW L2P+WDMfeFT+kUGWsg9ba7/xz7dFyg6hfRk7rXXqBeEI2pelkv3np1njT+RwqEaIdE GUsCfJsAnfftD68eMUUjqGMN3PF/49ao2fV0OtvFOVMloW8VUnKDJ7fmCz2ic2Hotk A4qlLaxpIVjm5JXlxcMt0BrwzoNZhiCX4Zt4BHpPL1GivQxk9F9MZSR1CZQMvswBHu 4AVUz8qtTFVjg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V4YLD3tFNz9rxD; Wed, 27 Mar 2024 18:19:00 +0100 (CET) From: Vinicius Monego Date: Wed, 27 Mar 2024 17:17:47 +0000 Message-Id: <2ac3aad3b3b74acb385b0caf533cd144865d4b7c.1711551246.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 (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 55d87524db..a794d378a3 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 Mar 27 17:17:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62304 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 D5CD227BBEA; Wed, 27 Mar 2024 17:20:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-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 34B2C27BBE2 for ; Wed, 27 Mar 2024 17:20:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpWwZ-0000V0-Nc; Wed, 27 Mar 2024 13:20:07 -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 1rpWwW-0000Ua-PY for guix-patches@gnu.org; Wed, 27 Mar 2024 13:20:05 -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 1rpWwW-00072S-0a for guix-patches@gnu.org; Wed, 27 Mar 2024 13:20:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpWwW-00038a-6r for guix-patches@gnu.org; Wed, 27 Mar 2024 13:20:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH 8/8] gnu: opensubdiv: Update to 3.6.0. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Mar 2024 17:20: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.171155996111814 (code B ref 70035); Wed, 27 Mar 2024 17:20:04 +0000 Received: (at 70035) by debbugs.gnu.org; 27 Mar 2024 17:19:21 +0000 Received: from localhost ([127.0.0.1]:38304 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpWvo-00034T-MW for submit@debbugs.gnu.org; Wed, 27 Mar 2024 13:19:20 -0400 Received: from mout01.posteo.de ([185.67.36.65]:38027) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpWvf-00032p-27 for 70035@debbugs.gnu.org; Wed, 27 Mar 2024 13:19:11 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 325F1240029 for <70035@debbugs.gnu.org>; Wed, 27 Mar 2024 18:19:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711559945; bh=UZlA54DjGckSrzq+hfLbJ1MnNMrRxxnZrK9bQH6BST0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=VfP/7Hx4uGYcgpF3jvTHl329Zk6G+WKekvcU7GlqymEbmIjAydRVI+D9WAyv0du3K Uomjp+2u/nLcHBluSXiD2JwNtVkjr7vhZv0mq2Y5HDoq11vtF67ilK1COz3n4FDe5a ZW0J47wfI+pJw9JtGve/RnQ6oE4W3yy9zA3T2c3t8BKBYORUrdFIzQCrqo7B8JeS0T ZAsiUaJQtf4EWNENxF2vUpf1gfprgj5efh1EmklBZyeyq22OC1qCtHmPzNa7dPAl3e ukG8Z9zyWIw5n0ZDWCeB7uR9qS6DJLqF5oX15VJOUF9kuNly9LwqIlDRzjeE3GoUD/ 9SmsfnBSMIH7w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V4YLJ28Zhz9rxD; Wed, 27 Mar 2024 18:19:04 +0100 (CET) From: Vinicius Monego Date: Wed, 27 Mar 2024 17:17:48 +0000 Message-Id: <4a79b597ab88667f1f3a3b3f421be4075c991d76.1711551246.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 (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 a794d378a3..ad253cab49 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1913,7 +1913,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 @@ -1923,20 +1923,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