From patchwork Fri Dec 29 16:24:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christine Lemmer-Webber X-Patchwork-Id: 58166 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 E965727BBE9; Fri, 29 Dec 2023 16:31: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=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 65E3127BBE2 for ; Fri, 29 Dec 2023 16:31:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJFlL-00078B-GB; Fri, 29 Dec 2023 11:31:07 -0500 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 1rJFlG-00077f-Jz for guix-patches@gnu.org; Fri, 29 Dec 2023 11:31:02 -0500 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 1rJFlG-00018d-AE for guix-patches@gnu.org; Fri, 29 Dec 2023 11:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJFlG-0007ep-9D for guix-patches@gnu.org; Fri, 29 Dec 2023 11:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68112] Update openimageio and Blender [1/2] Resent-From: Christine Lemmer-Webber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Dec 2023 16:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68112 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 68112@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170386741924633 (code B ref -1); Fri, 29 Dec 2023 16:31:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Dec 2023 16:30:19 +0000 Received: from localhost ([127.0.0.1]:42096 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJFkY-0006N5-D3 for submit@debbugs.gnu.org; Fri, 29 Dec 2023 11:30:18 -0500 Received: from lists.gnu.org ([2001:470:142::17]:59476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJFkW-00063E-Ao for submit@debbugs.gnu.org; Fri, 29 Dec 2023 11:30:17 -0500 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 1rJFkR-0006uI-24 for guix-patches@gnu.org; Fri, 29 Dec 2023 11:30:11 -0500 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJFkM-0000n4-5U for guix-patches@gnu.org; Fri, 29 Dec 2023 11:30:10 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id E7E6A3200A70 for ; Fri, 29 Dec 2023 11:30:01 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Fri, 29 Dec 2023 11:30:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dustycloud.org; h=cc:content-type:content-type:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:subject:subject:to:to; s=fm2; t=1703867401; x=1703953801; bh=PVisKTb6DzzZNWKSAlPcD5a6ldKmnUPc brp15wPUdzM=; b=pe/nylkQs2OrBT7k8qF/hS+B8NbWZP+I9pBAXSQg4TU1hfzG ELl5XvbE/D7+x5T+IghzpZlgyvlVMui31/MXTxwq3hQPjk/le37ooZCHYGN5mj56 vLiy5jR1Gf9Rrg3ZXmK1M9/DUx4csvHKrN92lW/4eI2S76Fi8SSRJ7nZ7GZcSfRG 5oL8bHnhqNbn4UQo6tUYLOSnmNWbglbnSod9TgIK8l9rJgFTtZ8JKc0Itj3RM2qr MLJxyD97ZATGtFpoFIckULVaVCM8JU/TfbLxVGSyFhfaJgGwDtmBX2+3tzY/ce2N iDhpAwYcsnGIJccR2UfBCH3NZw+k64maH1lz7Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1703867401; x=1703953801; bh=PVisKTb6DzzZNWKSAlPcD5a6ldKmnUPcbrp 15wPUdzM=; b=UpDAMwxQmZaPAU9gLCiHiWRe3mbpnuIOZv2UUkKgI5TJhWR+YUf tn5tzF56soj5ZDLq1fT/9FvTrarnN7BZYncEFX8B4eL4LgMc4uFtCAoIcZrXrFSh 6fWInHy9Kbk9nEvgaZbm/E91skvfgwyKTIpm76mJMp2DC0Q+ElhdG3Jx/xJxMcL2 j5sQ7Kl/IPvKhAlMo2s/qLBVHcKv+EXwc0V7GGKlhKzLxHtTm38+/TUen5G1Lt/9 4KWV8ewOtx5cdUgRw1c5abD5E5fv3oxERYDvSdtN88PzreZuR2pjRuIoMvR0xOjP nsmIgR+CPU12Dx9pzTR4F9EHqosRrc9pJIg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdeffedgledtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpegfhffvufffkfggtgesghdtreertd ertdenucfhrhhomhepvehhrhhishhtihhnvgcunfgvmhhmvghrqdghvggssggvrhcuoegt figvsggsvghrseguuhhsthihtghlohhuugdrohhrgheqnecuggftrfgrthhtvghrnhepvd egheeuudelhfffueefkeevheffhfdvjeeileduiedtueevhfeiieefleffgeelnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheptgifvggssggvrh esughushhthigtlhhouhgurdhorhhg X-ME-Proxy: Feedback-ID: i006446df:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 29 Dec 2023 11:30:00 -0500 (EST) User-agent: mu4e 1.10.7; emacs 29.1 From: Christine Lemmer-Webber Date: Fri, 29 Dec 2023 11:24:15 -0500 Message-ID: <878r5d2cr0.fsf@dustycloud.org> MIME-Version: 1.0 Received-SPF: pass client-ip=64.147.123.20; envelope-from=cwebber@dustycloud.org; helo=wout4-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Two patches. We need a newer version of openimageio to update to the newest Blender LTS version. However the newer version of openimageio doesn't work with our old version of openshadinglanguage... for now, I've just preserved an older version of openimageio for openshadinglanguage to use. It would be ideal to update openshadinglanguage and add that as an input to Blender too since that would open up custom shading nodes for our Blender users, but alas, I ran into trouble upgrading openshadinglanguage and don't have time to do that right now. I suggest we get in the Blender update and if someone wants to take a crack at upgrading OSL and adding to Blender too they can do that as a future patch series. - Christine From e3f1d5554676dc40bd4e76b6b01554472aa8a939 Mon Sep 17 00:00:00 2001 Message-ID: From: Christine Lemmer-Webber Date: Fri, 29 Dec 2023 11:07:20 -0500 Subject: [PATCH 1/2] gnu: openimageio: Update to 2.5.6.0. For the sake of supporting the older version of openshadinglanguage we have, we also introduce openimageio-2.2 which preserves the older version * gnu/packages/graphics.scm (openimageio): Update to 2.5.6.0. (openimageio-2.2): New variable, inherits from openimageio and provides old version of 2.2.21.0. (openshadinglanguage): Switch input to using openimageio-2.2. Change-Id: I6e9b9563a367f86d2159ac0079c69ce38207fd14 Signed-off-by: Christine Lemmer-Webber --- gnu/packages/graphics.scm | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 9bc81a3a81..edbdc74dc8 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2023 David Thompson ;;; Copyright © 2023 Eric Bavier ;;; Copyright © 2023 Artyom V. Poptsov +;;; Copyright © 2023 Christine Lemmer-Webber ;;; ;;; This file is part of GNU Guix. ;;; @@ -759,7 +760,7 @@ (define-public openshadinglanguage (list boost imath openexr-2 - openimageio + openimageio-2.2 pugixml qtbase-5 zlib)) @@ -1313,16 +1314,16 @@ (define-public openexr-2 (define-public openimageio (package (name "openimageio") - (version "2.2.21.0") + (version "2.5.6.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")))) + "14hxydp55cqp5v1kqjpqz7ifv4j9h92hgycqql8hi7n3s4vzjc6j")))) (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 @@ -1354,6 +1355,23 @@ (define-public openimageio on formats and functionality used in professional, large-scale animation and visual effects work for film.") (home-page "https://www.openimageio.org") + (license license:asl2.0))) + +;; This is here to support our older version of openimageio. +;; Once openimageio is upgraded, this can be removed. +(define-public openimageio-2.2 + (package + (inherit openimageio) + (version "2.2.21.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OpenImageIO/oiio") + (commit (string-append "Release-" version)))) + (file-name (git-file-name "openimageio" version)) + (sha256 + (base32 + "0aicxbshzv1g9d8d08vsj1a9klaycxaifvvp565qjv70wyma2vkr")))) (license license:bsd-3))) (define-public openscenegraph base-commit: 4d8b93e865ba71d2baa606d11529c3ecb5f14aea -- 2.41.0