From patchwork Sat Jan 15 21:48:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 36401 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 AF12527BBEA; Sat, 15 Jan 2022 21:49:10 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 7C97D27BBE9 for ; Sat, 15 Jan 2022 21:49:10 +0000 (GMT) Received: from localhost ([::1]:44300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n8qv7-0006Uo-Mp for patchwork@mira.cbaines.net; Sat, 15 Jan 2022 16:49:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8qv0-0006Si-Th for guix-patches@gnu.org; Sat, 15 Jan 2022 16:49:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49216) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n8qv0-00068U-KI for guix-patches@gnu.org; Sat, 15 Jan 2022 16:49:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n8qv0-0005Ug-Jk for guix-patches@gnu.org; Sat, 15 Jan 2022 16:49:02 -0500 Subject: bug#52848: [PATCH] gnu: Add openshadinglanguage. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sat, 15 Jan 2022 21:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 52848 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Vinicius Monego Cc: 52848-done@debbugs.gnu.org Mail-Followup-To: 52848@debbugs.gnu.org, ludo@gnu.org, monego@posteo.net Received: via spool by 52848-done@debbugs.gnu.org id=D52848.164228330221028 (code D ref 52848); Sat, 15 Jan 2022 21:49:02 +0000 Received: (at 52848-done) by debbugs.gnu.org; 15 Jan 2022 21:48:22 +0000 Received: from localhost ([127.0.0.1]:42118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8quL-0005T6-Tq for submit@debbugs.gnu.org; Sat, 15 Jan 2022 16:48:22 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:37104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8quK-0005Sr-8K for 52848-done@debbugs.gnu.org; Sat, 15 Jan 2022 16:48:20 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 649132D7; Sat, 15 Jan 2022 22:48:14 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dEbGsHAySt7L; Sat, 15 Jan 2022 22:48:13 +0100 (CET) Received: from ribbon (91-160-117-201.subs.proxad.net [91.160.117.201]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 162231D2; Sat, 15 Jan 2022 22:48:12 +0100 (CET) From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <20211228132603.59064-1-monego@posteo.net> Date: Sat, 15 Jan 2022 22:48:12 +0100 In-Reply-To: <20211228132603.59064-1-monego@posteo.net> (Vinicius Monego's message of "Tue, 28 Dec 2021 13:26:03 +0000") Message-ID: <871r183c2r.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: hera.aquilenet.fr; none X-Rspamd-Server: hera X-Rspamd-Queue-Id: 649132D7 X-Spamd-Result: default: False [0.46 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/mixed,text/plain,text/x-patch]; RCPT_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:+]; R_MIXED_CHARSET(0.56)[subject]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] 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 Hi Vinicius, Vinicius Monego skribis: > * gnu/packages/graphics.scm (openshadinglanguage): New variable. Applied with the tweaks below. Thanks, Ludo’. diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index bc59652d33..b69ab52aec 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -604,21 +604,33 @@ (define-public openshadinglanguage (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 - "|"))))))) + (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 + "|")))))))) (native-inputs - (list bison clang flex llvm pybind11 python-wrapper)) + (list bison + clang + flex + llvm + pybind11 + python-wrapper)) (inputs - (list boost imath openexr-2 openimageio pugixml qtbase-5 zlib)) + (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