From patchwork Fri Dec 29 16:33:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christine Lemmer-Webber X-Patchwork-Id: 58167 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 5D6D327BBE9; Fri, 29 Dec 2023 16:34:13 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,MISSING_HEADERS,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 634AA27BBE2 for ; Fri, 29 Dec 2023 16:34:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJFoE-0000cG-Kx; Fri, 29 Dec 2023 11:34:06 -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 1rJFoA-0000bo-Nf for guix-patches@gnu.org; Fri, 29 Dec 2023 11:34: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 1rJFoA-0001VZ-G8 for guix-patches@gnu.org; Fri, 29 Dec 2023 11:34:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJFoA-0008AR-Er for guix-patches@gnu.org; Fri, 29 Dec 2023 11:34: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:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68112 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: Cc: 68112@debbugs.gnu.org X-Debbugs-Original-Cc: 68112@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by 68112-submit@debbugs.gnu.org id=B68112.170386762131335 (code B ref 68112); Fri, 29 Dec 2023 16:34:02 +0000 Received: (at 68112) by debbugs.gnu.org; 29 Dec 2023 16:33:41 +0000 Received: from localhost ([127.0.0.1]:42103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJFnp-00089K-91 for submit@debbugs.gnu.org; Fri, 29 Dec 2023 11:33:41 -0500 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:48799) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJFnn-000895-Kz for 68112@debbugs.gnu.org; Fri, 29 Dec 2023 11:33:40 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id E32463200A49; Fri, 29 Dec 2023 11:33:33 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Fri, 29 Dec 2023 11:33:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dustycloud.org; h=cc:cc:content-type:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to; s=fm2; t=1703867613; x=1703954013; bh=zdMDN1LML/NP0AiBf210tdppq7y0AZ8TdyUhOMyCRVM=; b=U3YDTDWtKOmZ DCnaxz54qgEYYsxYqMAL6CfK9s6VvtaMDZeicGxeMk9BxZ07niT2z+qiifIZRLAu aYKJ9KTc5daic3f5Ek1ZcN3XNwNWgANAzmO6bujgOM4zF5GZxoN24Sw29PeXyRTn neqIXQC0dJw2WlvAwMAyQ74KtxCTl9ts6oCWfSw3BOl0U4p6IbZXtYi4+NMZA11e WQm0z00wHOlodB3yGcVzZ2DJqnQzLJuGt5V84Y6DczL+EPjXDY+9xk2BLrTY1DQL yp7Vu5yeLFCV5ctu8fC0AdLmnYzqkviCYJcsQKG9zVUUEN81tZesJd+D74XFcwHZ ojU9uIikkQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1703867613; x=1703954013; bh=zdMDN1LML/NP0AiBf210tdppq7y0 AZ8TdyUhOMyCRVM=; b=ICXLjbyD4LwUYPLC9+1riIOxoTv7aco4H7EEoUBw4UcF SclC1UoHjgF3Sc6+u1jg6tPPIFT8E8NtgjOp5VKv3t2MCID0fzIAOOqEdaHRD5gy 4fAHf8VsZmv0wjeB4SwbuTvOyC7ITpmYcLhRtYC3GBrpkNSklGdBHbW5xSSniCY4 4+7WY3FXkPo22hdO/yd1bZyas/TEyshKW6o8UKVDiYz7f0F6AjH7AOyaEHIcc+aH 8IEv3vJdM2TAbptntI0UZuESFcUAEFFteUmEDs/ASe/hQ5LQtyuSN7E/QTllT2Fc 9pQec+aCrEdAjn81h5f0R89yXLNnuiLUeW5zprxA7g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdeffedgleduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenuchmihhsshhinhhgucfvqfcufhhivghlugculdeftd dmnecujfgurhepfhgfhfevufffjgfkgggtsehgtderredtredtnecuhfhrohhmpeevhhhr ihhsthhinhgvucfnvghmmhgvrhdqhggvsggsvghruceotgifvggssggvrhesughushhthi gtlhhouhgurdhorhhgqeenucggtffrrghtthgvrhhnpeegieevvdetueehveduhfeuueeu leekhfdtjeeflefhgefhueetfedtleetgeeutdenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpegtfigvsggsvghrseguuhhsthihtghlohhuugdr ohhrgh X-ME-Proxy: Feedback-ID: i006446df:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 29 Dec 2023 11:33:32 -0500 (EST) References: <878r5d2cr0.fsf@dustycloud.org> User-agent: mu4e 1.10.7; emacs 29.1 From: Christine Lemmer-Webber Date: Fri, 29 Dec 2023 11:33:10 -0500 In-reply-to: <878r5d2cr0.fsf@dustycloud.org> Message-ID: <874jg12ckk.fsf@dustycloud.org> 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 And here's Blender! From db6f54bd2555efe0bd16a384b0444c6c72490130 Mon Sep 17 00:00:00 2001 Message-ID: In-Reply-To: References: From: Christine Lemmer-Webber Date: Fri, 29 Dec 2023 11:16:09 -0500 Subject: [PATCH 2/2] gnu: blender: Update to 3.6.7. * gnu/packages/graphics.scm (blender): Update to 3.6.7. [arguments]<#:phases>: Remove no longer required fix-broken-import phase. [inputs] Switch freetype to freetype-with-brotli and add libepoxy. Change-Id: I42690a2de4b36806f9ad3aa08c71ff78e87b1651 Signed-off-by: Christine Lemmer-Webber --- gnu/packages/graphics.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index edbdc74dc8..69320521d9 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -494,14 +494,14 @@ (define-public openvdb (define-public blender (package (name "blender") - (version "3.3.5") ;3.3.x is the current LTS version + (version "3.6.7") ;3.6.x is the current LTS version (source (origin (method url-fetch) (uri (string-append "https://download.blender.org/source/" "blender-" version ".tar.xz")) (sha256 (base32 - "1pwl4lbc00g0bj97rd8l9fnrv3w1gny9ci6mrma3pp2acgs56502")))) + "10i42w5l0xrz30x9y0ba5q2g05ixlzw1gprhrgzzvrjgy1vgp00x")))) (build-system cmake-build-system) (arguments (list @@ -544,25 +544,19 @@ (define-public blender ;; satisfy the dependency on "half.h" and "Iex.h". (string-append "-DCMAKE_CXX_FLAGS=-I" (search-input-directory %build-inputs - "include/OpenEXR")))) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'fix-broken-import - (lambda _ - (substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py" - (("import encode_bin") - "from . import encode_bin"))))))) + "include/OpenEXR")))))) (inputs (list boost embree ffmpeg-5 fftw - freetype + freetype-with-brotli glew gmp ;needed for boolean operations on meshes ilmbase jack-1 jemalloc + libepoxy libjpeg-turbo libpng libsndfile -- 2.41.0