From patchwork Tue Dec 28 13:26:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 35748 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 1C8BC27BBEA; Tue, 28 Dec 2021 13:27:11 +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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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 71CB327BBE9 for ; Tue, 28 Dec 2021 13:27:10 +0000 (GMT) Received: from localhost ([::1]:38064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n2CVR-0005PT-I6 for patchwork@mira.cbaines.net; Tue, 28 Dec 2021 08:27:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n2CVK-0005OZ-GM for guix-patches@gnu.org; Tue, 28 Dec 2021 08:27:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33801) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n2CVK-0001Rh-4i for guix-patches@gnu.org; Tue, 28 Dec 2021 08:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n2CVK-0005dJ-24 for guix-patches@gnu.org; Tue, 28 Dec 2021 08:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52848] [PATCH] gnu: Add openshadinglanguage. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Dec 2021 13:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52848 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52848@debbugs.gnu.org Cc: Vinicius Monego X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164069801621634 (code B ref -1); Tue, 28 Dec 2021 13:27:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Dec 2021 13:26:56 +0000 Received: from localhost ([127.0.0.1]:45347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2CVE-0005cr-4n for submit@debbugs.gnu.org; Tue, 28 Dec 2021 08:26:56 -0500 Received: from lists.gnu.org ([209.51.188.17]:39722) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2CVD-0005cl-Gb for submit@debbugs.gnu.org; Tue, 28 Dec 2021 08:26:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n2CVD-0005OR-CJ for guix-patches@gnu.org; Tue, 28 Dec 2021 08:26:55 -0500 Received: from mout02.posteo.de ([185.67.36.66]:48687) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n2CVB-0001Q1-5H for guix-patches@gnu.org; Tue, 28 Dec 2021 08:26:55 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id B5F44240101 for ; Tue, 28 Dec 2021 14:26:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1640698009; bh=bxaD30/bWXOPsn+dGMmA8o1c1V8Lr3aK4YMDHEOq0yI=; h=From:To:Cc:Subject:Date:From; b=DxYbLfHJ33ZPzvtwlsT3rxT46ctF/doerfmVgTxDvLMx9ORnGIkk/jGapgiTztAEB XzkH+GJICPFcCJ2lRFJHVG1iyxvE2nzRErKUtcEwOBV6+Qw37BNZUTAm+7A4yLSKZI E84zPI7CClXGbdb3HC1A8xnEK0PNaXlCfx0o2DRkIvnWEGy56EHUy5jtUcJ+G6KrH6 dxpu3FhS8sImvQ8KL6O2PRajmmyeULsl+30UJ6SRYBrMCxptE6REtCKIZrAbOASTmC 2Yu/NjQvygi2cmy+RXgQuVuD43aBUYWGlpjbgvdsQWmZf5/E0p5Q3dVhLQTMedNQfN MqKm8HdVIDrJg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JNb0m54Fyz9rxR; Tue, 28 Dec 2021 14:26:48 +0100 (CET) From: Vinicius Monego Date: Tue, 28 Dec 2021 13:26:03 +0000 Message-Id: <20211228132603.59064-1-monego@posteo.net> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.66; envelope-from=monego@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/graphics.scm (openshadinglanguage): New variable. --- gnu/packages/graphics.scm | 55 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) base-commit: 28b477cb2e5d9185da16f305caff15809dfa06f3 diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 3be37d7841..f857aa04db 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -79,6 +79,7 @@ #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages lua) #:use-module (gnu packages maths) #:use-module (gnu packages mp3) @@ -666,6 +667,60 @@ vertices, sorting by primitive type, merging of redundant materials and many more.") (license license:bsd-3))) +(define-public openshadinglanguage + (package + (name "openshadinglanguage") + (version "1.11.16.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AcademySoftwareFoundation/OpenShadingLanguage") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0x0lc163vl2b57l75bf5zxlr6vm2y1f1izlxdnrw3vsapv3r9k9g")))) + (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 _ + (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 + "|"))))))) + (native-inputs + (list bison clang flex llvm pybind11 python-wrapper)) + (inputs + (list boost imath openexr-2 openimageio pugixml qtbase-5 zlib)) + (home-page "https://github.com/AcademySoftwareFoundation/OpenShadingLanguage") + (synopsis "Shading language for production GI renderers") + (description "Open Shading Language (OSL) is a language for programmable +shading in advanced renderers and other applications, ideal for describing +materials, lights, displacement, and pattern generation.") + (license license:bsd-3))) + (define-public cgal (package (name "cgal")