From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id ONhxBcCxDGZxDQEAqHPOHw:P1 (envelope-from ) for ; Wed, 03 Apr 2024 03:32:48 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id ONhxBcCxDGZxDQEAqHPOHw (envelope-from ) for ; Wed, 03 Apr 2024 03:32:48 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=aXgOdw5u; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1712107968; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=HMc1G/ltoVXV+PTDqQbSh6bIvU9gwU4vFzCKJWF4Cpw=; b=UkrHOdRQ0eHlVeE/dSMZiL+k/gA65+9NI7EKVUGUj1xSkhInflr8Z9sv7zH8rUesgkKaN9 mlkXaV/IOpu9c0j44poPg+bhP5ZbWOwtUfhMy6H7JbMgSBiBQ89kZFcu3Mbrsi7xFLJcm1 80fjqVvo/51c1IS453+NBZLqw7EUSlMI8i6KBz7UBFY8N2AtK1gJJ67DWBDLJjEoh62Dls +d6LxUEPdoPzKWaTRQG5aW1a18X4Kda0hgUuLLOlUZBUni+zswF75dwv38Za0zLto7w4dn SSK8x1iaVaSSmMZnt1QVjGIHItgOAOgjjqxWXkI3s4MuAM4o7BVju49kjzxrpw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1712107968; a=rsa-sha256; cv=none; b=YAHna9brPGwQpd8+frWqUXhT2ovq29TTdMw7wjhlrYBlj++TgG9d5pEA/+IPoZuMto3u3f 3oZAfhu7nSwk1pv7yc6rUHpRUcKlVYuprgqhpQ7Hc5V8owHZgu9k7BBAv1gMPypx8v7cT/ YxwvJV75+9stEDDF6utKKiRHn6JSv7TMWRJyR+gbYwMiGo25QgToFrHRdJpeqbFSv19PVR 62BhZa63GXQwoaXZZqiMFQMX6zVUjqP/hmh6OaNzm2dN/yA4FiU07f+pvbEL/iCNbRGcQX CuxITRUqjwjjde7G8fZUgIjbi8DF1NA4Q4V47MjGQHyoeiqudqYkACe1ZYRgTg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=aXgOdw5u; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C399669AC7 for ; Wed, 3 Apr 2024 03:32:47 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrpTs-0008I0-VA; Tue, 02 Apr 2024 21:32:00 -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 1rrpTr-0008H4-HF for guix-patches@gnu.org; Tue, 02 Apr 2024 21:31:59 -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 1rrpTr-0001A7-8j for guix-patches@gnu.org; Tue, 02 Apr 2024 21:31:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrpTv-0002Cw-9p for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH v3 2/9] gnu: openshadinglanguage: Update to 1.13.8.0. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 01:32: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.17121078888194 (code B ref 70035); Wed, 03 Apr 2024 01:32:03 +0000 Received: (at 70035) by debbugs.gnu.org; 3 Apr 2024 01:31:28 +0000 Received: from localhost ([127.0.0.1]:56606 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTL-000286-WD for submit@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:28 -0400 Received: from mout01.posteo.de ([185.67.36.65]:39505) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTJ-00026x-Rh for 70035@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:26 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 339C2240027 for <70035@debbugs.gnu.org>; Wed, 3 Apr 2024 03:31:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1712107875; bh=+1sEQvSjzaA/5c05QCgDYaAz4JpiY+2q840oLROocX0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=aXgOdw5uEPAcUXvGdKyYeqxVV3FlcxRvKeCp4ulmC3zjlVl+MettqlNfalr+Vvf/j 6K401tHyfNWwcnxQFQmaXzKfcUEASbQWkY4Zvb6x72/GV0E3Lg6cmN5Lhv3o7dNviO SCHZSrJvykhfhM4CnM/x1sK+Zmd5mU2hoQcnEXJOarsw+dnU716ugiEbWubAs/u7qS 7P35eFJCO2Uw2ywKOTFi8NW/8D6k0Nq3F9rndi8woC+6u+DcQrYZFnPlPfL9ZsJivf sGP70R4oe6O9+pvPgv0We1zD1KBA/7LYQMxqN/eYKSo4FjBnTyCdOJoWEMUqMcwWnE Ag++2ixWoRVQw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V8RzQ1sbZz6tsf; Wed, 3 Apr 2024 03:31:14 +0200 (CEST) From: Vinicius Monego Date: Wed, 3 Apr 2024 01:30:22 +0000 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -3.95 X-Spam-Score: -3.95 X-Migadu-Queue-Id: C399669AC7 X-Migadu-Scanner: mx13.migadu.com X-TUID: HyOXMfOf69RL * gnu/packages/graphics.scm (openshadinglanguage): Update to 1.13.8.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 23b6af066a..b593f03690 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.8.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 "1ji4bw8z4ylsh0jvir3d40p6xyhr63g588gh3bag7bzsr3flsb02")))) (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") -- 2.39.2