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")