From patchwork Thu Mar 28 15:40:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62339 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 2B79627BBEA; Thu, 28 Mar 2024 15:42:48 +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 9116127BBE2 for ; Thu, 28 Mar 2024 15:42:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rprtL-0003YW-8e; Thu, 28 Mar 2024 11:42:11 -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 1rprtD-0003P0-DC for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42: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 1rprtD-0007Yi-01 for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rprtD-0003VB-Nr for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH v2 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: Thu, 28 Mar 2024 15:42: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.171164048813199 (code B ref 70035); Thu, 28 Mar 2024 15:42:03 +0000 Received: (at 70035) by debbugs.gnu.org; 28 Mar 2024 15:41:28 +0000 Received: from localhost ([127.0.0.1]:40928 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rprsd-0003Ql-I5 for submit@debbugs.gnu.org; Thu, 28 Mar 2024 11:41:28 -0400 Received: from mout02.posteo.de ([185.67.36.66]:43967) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rprsW-0003Pk-Vn for 70035@debbugs.gnu.org; Thu, 28 Mar 2024 11:41:22 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 02CF6240103 for <70035@debbugs.gnu.org>; Thu, 28 Mar 2024 16:41:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711640474; bh=wmC5drdOL2EWdqGxvpV+XcC9Wsf2Pq7lxntLqoJyJOQ=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=bZKGwHN3kcOigT7LRxD4etHKu2+DyOn4vTDKi6VDskqKVWcZFzaQCV4DEBT5FepxC vc6HQEuln+QvjIEPU5iDKZ1vWlP3j5sn5I5jByQo0EZ5vaLVe1nIuhNMBcHwqrYOCY 7EKwDLYRY43Gg6K+DF2sukUjH7RQsZJJOp+ehJmNydBbDmDQACt4IagYn7rd8mI0WQ lrbaOTr06Y5n7ipwVWNhMcTTLCkas+Xup6UzQuNWIULbGkbv6NRW2CJ5PlHjMQDb36 mLwLvwRMydnq+LtnyEETggqe4XXMnobjWOdqO94yWYOODW2xiueoPE09emhtT/oNQP 3xwXPXh44XMTA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V576w6SpWz6tx0; Thu, 28 Mar 2024 16:41:12 +0100 (CET) From: Vinicius Monego Date: Thu, 28 Mar 2024 15:40: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/cpp.scm | 2 +- gnu/packages/graphics.scm | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 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 9bc81a3a81..e10e157f61 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,20 @@ (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 + 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 Thu Mar 28 15:40: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: 62337 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 D693527BBE9; Thu, 28 Mar 2024 15:42:39 +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 7943B27BBE2 for ; Thu, 28 Mar 2024 15:42:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rprtS-0004O8-QG; Thu, 28 Mar 2024 11:42:18 -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 1rprtD-0003Pp-Tj for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42: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 1rprtD-0007Yt-Jk for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rprtE-0003VL-Ag for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH v2 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: Thu, 28 Mar 2024 15:42: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.171164048913209 (code B ref 70035); Thu, 28 Mar 2024 15:42:04 +0000 Received: (at 70035) by debbugs.gnu.org; 28 Mar 2024 15:41:29 +0000 Received: from localhost ([127.0.0.1]:40931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rprse-0003Qo-9c for submit@debbugs.gnu.org; Thu, 28 Mar 2024 11:41:28 -0400 Received: from mout01.posteo.de ([185.67.36.65]:45877) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rprsZ-0003Po-WB for 70035@debbugs.gnu.org; Thu, 28 Mar 2024 11:41:24 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 94E19240027 for <70035@debbugs.gnu.org>; Thu, 28 Mar 2024 16:41:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711640477; bh=bQcM305WoaOW5408fes/o+0ORwHlCULKt5+zTqOoY+M=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=UmKkUKkInqkF7++Fjbx8gLrXrhUdN+jTgg96fICePrYCMBJlqaJESOe2vV6NHQbCV 94cMIZxQkNuGlhmxQiKUADK1Kfwedohr8TVz98ESc0FqYfkmV6emweSUAaHFAFS5X3 QLiGfSL+hQuy+QHuWvma26Lu0kwiW5cXjEqVbONrz+T3IadYT84lPlHL9colL9g/bm JpZFnQEQccYDlW1kR3GP9Oc1asdWgzk8/MYIbuRcpBBlr1a5um53TqPfeNhJHyaeIZ 87UikEO2z2KMuLXYIDR4EcMVhtqhX79QoVIASlPel9zWJWocexRPRTAF0EQLtV3CV6 s/YUB3y6DjZUg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V57704ZGYz6tsb; Thu, 28 Mar 2024 16:41:16 +0100 (CET) From: Vinicius Monego Date: Thu, 28 Mar 2024 15:40:42 +0000 Message-Id: <7185760428868307165e9786cfb12414e31b6396.1711639886.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 (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 e10e157f61..20b783f01d 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 Thu Mar 28 15:40: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: 62340 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 08BC927BBE9; Thu, 28 Mar 2024 15:42:57 +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 3E47227BBE2 for ; Thu, 28 Mar 2024 15:42:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rprtM-0003ix-Bh; Thu, 28 Mar 2024 11:42: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 1rprtE-0003V8-UZ for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:06 -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 1rprtE-0007ZA-Kb for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rprtF-0003VY-Aq for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH v2 3/8] gnu: Add partio. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2024 15:42: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.171164049413233 (code B ref 70035); Thu, 28 Mar 2024 15:42:05 +0000 Received: (at 70035) by debbugs.gnu.org; 28 Mar 2024 15:41:34 +0000 Received: from localhost ([127.0.0.1]:40937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rprsj-0003RN-Tq for submit@debbugs.gnu.org; Thu, 28 Mar 2024 11:41:34 -0400 Received: from mout01.posteo.de ([185.67.36.65]:59407) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rprsd-0003QJ-I3 for 70035@debbugs.gnu.org; Thu, 28 Mar 2024 11:41:28 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 26E11240027 for <70035@debbugs.gnu.org>; Thu, 28 Mar 2024 16:41:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711640481; bh=dqyCXGgIrqQVShTDcRfTZdHc/ToaW3lvXC6uC1Iq9nY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=QanWiWE2fvTzbKgqE2J3HRd6QgZVxbw/ngDqETI/R54kzw82hWiUvwf8/BZt+Oyb7 LK099ygSGxKQd6t8fKTb1xA7IDJYsNdjO7Bg60wPbcoAeOpwzW2qiX61dVk0pZox6C B0TW2PVwWlqzExwPIT33pVxIYHKJgY0xtnicXMih5XpAkn+1XedWQcggNJ9FD2E+Gf ik7/DCF2yG9g12+iw4jD3XlfybcYJ626ZjtrxG87zsDERJjvKxJYrd7PR6Ps3vyZh1 NzT1uOZb+iEO6KW+5k+a77Nq1IKonLpRyw6L5/nsR6dWGJIx7GdRV7Wsn0iuxfyhyq z8Xm9mmUdo/oA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V57741hmXz6v00; Thu, 28 Mar 2024 16:41:19 +0100 (CET) From: Vinicius Monego Date: Thu, 28 Mar 2024 15:40:43 +0000 Message-Id: <64ec1dc020fe286e5127821ad0950502c09e9517.1711639886.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 20b783f01d..aea8f3b972 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1520,6 +1520,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 Thu Mar 28 15:40:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62333 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 3A02427BBE9; Thu, 28 Mar 2024 15:42: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=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 6735E27BBE2 for ; Thu, 28 Mar 2024 15:42:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rprtL-0003fz-UH; Thu, 28 Mar 2024 11:42:11 -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 1rprtF-0003VX-Pr for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:06 -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 1rprtF-0007ZK-EP for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rprtG-0003Vh-1v for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH v2 4/8] gnu: Add pystring. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2024 15:42: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.171164049513249 (code B ref 70035); Thu, 28 Mar 2024 15:42:06 +0000 Received: (at 70035) by debbugs.gnu.org; 28 Mar 2024 15:41:35 +0000 Received: from localhost ([127.0.0.1]:40941 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rprsk-0003RX-QN for submit@debbugs.gnu.org; Thu, 28 Mar 2024 11:41:35 -0400 Received: from mout01.posteo.de ([185.67.36.65]:46671) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rprsh-0003Qj-U7 for 70035@debbugs.gnu.org; Thu, 28 Mar 2024 11:41:32 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 84D2A24002A for <70035@debbugs.gnu.org>; Thu, 28 Mar 2024 16:41:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711640485; bh=mFfLlijsRIHSQau664UOfXE0rg1puY0eGfl5Vd5UdLk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=pNEd+J6S13QEes8x9dNxFEawZXG7T8Bj2WkVMtA5sqdwBDH+QKkT1MWvS3VDYgX7A I+56ua2fBTXtMreBkvsVmQvL9Cl7gcMWFz0l5VWz4MwX44LfXXEnH8RpEV+KdWxcLL Jh76x1aZXkQeNpzLp3+2TNZ329EQQdUqiCobB9drxdrKT0jwTgCXtGaCN6XgN7bKpp 7eMzjyd8m3sDlhqckkPTZ2FiSMiLA9mFrNbIzNzcsfXm/rQc936+fBOwuEa+NNCicc cmrX0I9CjqBD8xR4Xl55rhtSkxPDxQcFwljjnVdf4bPJ0OefCKv1w9qTHRkGMJ7ssH BaDOPlo90zZwg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V57784mmqz6txS; Thu, 28 Mar 2024 16:41:24 +0100 (CET) From: Vinicius Monego Date: Thu, 28 Mar 2024 15:40:44 +0000 Message-Id: <8ae01dfca2c5cfa3942d1cf7f319c94f33268d8a.1711639886.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 Thu Mar 28 15:40: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: 62334 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 071B427BBEA; Thu, 28 Mar 2024 15:42: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=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 8212127BBE2 for ; Thu, 28 Mar 2024 15:42:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rprtP-0004AR-Gr; Thu, 28 Mar 2024 11:42:16 -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 1rprtG-0003WD-Ed for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:08 -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 1rprtF-0007ZR-Ox for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rprtG-0003Vp-E9 for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH v2 5/8] gnu: Add minizip-ng. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2024 15:42: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.171164050913358 (code B ref 70035); Thu, 28 Mar 2024 15:42:06 +0000 Received: (at 70035) by debbugs.gnu.org; 28 Mar 2024 15:41:49 +0000 Received: from localhost ([127.0.0.1]:40947 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rprsy-0003TD-7b for submit@debbugs.gnu.org; Thu, 28 Mar 2024 11:41:48 -0400 Received: from mout01.posteo.de ([185.67.36.65]:34599) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rprsl-0003R8-NU for 70035@debbugs.gnu.org; Thu, 28 Mar 2024 11:41:36 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 4E24A240027 for <70035@debbugs.gnu.org>; Thu, 28 Mar 2024 16:41:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711640489; bh=MNX8xU7Cn+QIe6lPVpF+s348fJweNiCBJrM7ZCBeo+o=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=PVoCmdLMlA4ZHlxVuSka2RytwLhIJwVdPET0M4BQHufHmcDMhbc2Nl2rZTCY5HdlG Kz2ZkO+31Y5vreo5Z8Fw9d1Q+3glnuauOBgyxHjM4tVSs8qfrbk1RwYWoB8Jiya0Co mhFehErqnOTykt/+UbUb6g0RjUXepnL8EdSA/g5ZHCyKUwnlopZKxao6RAQAB2bYBv NlJgzVvV1uFcsBjOYwcKmAD3oxmDffHTUqg55BoDAZZQJI7D5ZimFBLTWheoj3JRkd bLk30+0w5/Ve5tmvWBwgxHRdUc7FHxa38FivO5dqgQq+upWwZj7nHXBw+zMaNBnkLn ycMobtQ84BKYA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V577D2ZFhz6tx0; Thu, 28 Mar 2024 16:41:28 +0100 (CET) From: Vinicius Monego Date: Thu, 28 Mar 2024 15:40:45 +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/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 Thu Mar 28 15:40:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62335 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 C8D3D27BBEA; Thu, 28 Mar 2024 15:42:27 +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 92C8F27BBE2 for ; Thu, 28 Mar 2024 15:42:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rprtQ-0004J4-Jh; Thu, 28 Mar 2024 11:42:16 -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 1rprtG-0003We-Hp for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:08 -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 1rprtG-0007ZV-29 for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rprtG-0003Vw-QN for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH v2 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: Thu, 28 Mar 2024 15:42: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.171164051013370 (code B ref 70035); Thu, 28 Mar 2024 15:42:06 +0000 Received: (at 70035) by debbugs.gnu.org; 28 Mar 2024 15:41:50 +0000 Received: from localhost ([127.0.0.1]:40949 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rprsy-0003TO-UU for submit@debbugs.gnu.org; Thu, 28 Mar 2024 11:41:50 -0400 Received: from mout01.posteo.de ([185.67.36.65]:42937) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rprsp-0003RT-LT for 70035@debbugs.gnu.org; Thu, 28 Mar 2024 11:41:41 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 4264F240027 for <70035@debbugs.gnu.org>; Thu, 28 Mar 2024 16:41:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711640493; bh=KssVuWivIFFCt4OU01uracvGnQjzwUV/ASiXckGN3Lc=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=dwNM6KiKvRFHXZRl1DJg8sIeKthnYBE+peUKLQs2or5sTBQWeNZDlCoFYGn4yQmX3 lQv2PVc0/43iaLondoVr05UmvXpxeSBWxIzqZZfbt/2hoNipD4ns5VUdgJS16ieslC bhT5auXVfN25gTV0kFAktz9xi/QZKIOwahxYk46XTGKOaLizNb/mYEhqwCA6amaua0 ZajXrzvh9j65GepSCe0Z4n6IUO+FI3xWifbuVMddkxzmvEmlHE4F5aPM1XDuYmZ8EJ YbYxNv3jHAM7eP4cBBZHm53sr/+oqCwLGUdfqtuyC+XCprKKiewXB3Trc+fpUfGPck XibO+B8AjP+kw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V577J3DCSz6tyV; Thu, 28 Mar 2024 16:41:32 +0100 (CET) From: Vinicius Monego Date: Thu, 28 Mar 2024 15:40:46 +0000 Message-Id: <30626bad8bacab181be1a8ac988267c0b63c1682.1711639886.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 5429dc498c..9eb61ecb80 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1756,7 +1756,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 Thu Mar 28 15:40: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: 62336 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 BA21827BBE9; Thu, 28 Mar 2024 15:42:31 +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 739C427BBE2 for ; Thu, 28 Mar 2024 15:42:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rprtN-0003xq-Od; Thu, 28 Mar 2024 11:42:13 -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 1rprtG-0003Wg-Qi for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:08 -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 1rprtG-0007Zd-FU for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rprtH-0003W3-6c for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH v2 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: Thu, 28 Mar 2024 15:42:07 +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.171164051113382 (code B ref 70035); Thu, 28 Mar 2024 15:42:07 +0000 Received: (at 70035) by debbugs.gnu.org; 28 Mar 2024 15:41:51 +0000 Received: from localhost ([127.0.0.1]:40951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rprt0-0003Ta-95 for submit@debbugs.gnu.org; Thu, 28 Mar 2024 11:41:51 -0400 Received: from mout01.posteo.de ([185.67.36.65]:60207) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rprsu-0003Ru-Bg for 70035@debbugs.gnu.org; Thu, 28 Mar 2024 11:41:45 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id EF35E240027 for <70035@debbugs.gnu.org>; Thu, 28 Mar 2024 16:41:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711640498; bh=QlW5ZipEK0crL/DE2GKLnKrhn3Mba7eAro5oK+YNP1I=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=MuutR2AO3zoVdtwjKtEVdkkmhVwuoOowQfpXSW1VrTmly5/092A1G+5REiezBq9G3 gL2fW0YCk/yyNAsMT5nK0Mz88Q4wh5fBrvBiW0VvG7CvvtfQddYbT79jAAMzlwoPpc MNqjK/qqyMe8vnV9WhWIP/8Cv5iwVFF2VFAId2Tg93uNsKxwijBxpVHKY2ho/ATKgf cRvTVi2s0nepSsrbWvB9pTWdaRmN/96RO3LKl1xXXfU33nfd+IKRHnHPzd+nveYbsP qQTl2uF5mmzyEo2NHzbwRKjWy8elj4TNCmYE7coNpk5VDgZE1xNMdM61qmDE1rpTlw cjiCdAummSN/g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V577P13N1z6tsb; Thu, 28 Mar 2024 16:41:36 +0100 (CET) From: Vinicius Monego Date: Thu, 28 Mar 2024 15:40:47 +0000 Message-Id: <81029afe042812deb57e53384d9d1fb27af17abc.1711639886.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 aea8f3b972..5915ecc329 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 Thu Mar 28 15:40: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: 62338 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 01EE227BBE9; Thu, 28 Mar 2024 15:42:43 +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 3AC2927BBE2 for ; Thu, 28 Mar 2024 15:42:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rprtS-0004Ol-R9; Thu, 28 Mar 2024 11:42:18 -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 1rprtH-0003Wi-9t for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:08 -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 1rprtG-0007aO-VE for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rprtH-0003WB-LV for guix-patches@gnu.org; Thu, 28 Mar 2024 11:42:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH v2 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: Thu, 28 Mar 2024 15:42:07 +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.171164052113433 (code B ref 70035); Thu, 28 Mar 2024 15:42:07 +0000 Received: (at 70035) by debbugs.gnu.org; 28 Mar 2024 15:42:01 +0000 Received: from localhost ([127.0.0.1]:40953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rprtB-0003UT-44 for submit@debbugs.gnu.org; Thu, 28 Mar 2024 11:42:01 -0400 Received: from mout01.posteo.de ([185.67.36.65]:59907) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rprsy-0003SS-2R for 70035@debbugs.gnu.org; Thu, 28 Mar 2024 11:41:48 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id A7D58240027 for <70035@debbugs.gnu.org>; Thu, 28 Mar 2024 16:41:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711640501; bh=gar7QFrf/glXIb4RLBRwfQMvbPUKGcYsemtvgXN1ZXo=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=ADpdcQRjeGsw2W80g0afP3T0klPdzPi9kGAqluEE1yl1pMqtJbksnZ3M2+CzKx/1B W7EwoORmXeFo9M7aRsr4A9bBvFH6/gp3N3qtsHEDmhE0z4QdvymY+85wJ8nfXb88Ze Q3oa9pFbmALJy7BE/Cu3PFyr/j5p3WLO+gtA8lEOKErNG7cXrjENGxWlY/Z7v53+7E dTqfyKDc6DrEKltms55ASa6xGneIMRyJsRFfPyITqv23+UztWqBvt+kbqupGc1a60r uXCw2MwRLV5xdxFjAcin7is7T2u9dVZ6bH+1DnFjK6ijowg3oop5TzkV7S+Eud8p10 H2069iUrmAqQg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V577S5jdbz6tyJ; Thu, 28 Mar 2024 16:41:40 +0100 (CET) From: Vinicius Monego Date: Thu, 28 Mar 2024 15:40:48 +0000 Message-Id: <02432389f666adf5e365ee4d0035b378dfacb493.1711639886.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 5915ecc329..f7519c3abf 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1909,7 +1909,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 @@ -1919,20 +1919,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