From patchwork Mon Apr 26 15:05:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Csepp X-Patchwork-Id: 28923 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 EFE1827BC7D; Mon, 26 Apr 2021 21:47:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5A14127BC7C for ; Mon, 26 Apr 2021 21:47:30 +0100 (BST) Received: from localhost ([::1]:38896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lb88c-00033E-Ql for patchwork@mira.cbaines.net; Mon, 26 Apr 2021 16:47:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lb88E-00031X-KH for guix-patches@gnu.org; Mon, 26 Apr 2021 16:47:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35788) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lb88E-00019Q-Bh for guix-patches@gnu.org; Mon, 26 Apr 2021 16:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lb88E-0005um-AO for guix-patches@gnu.org; Mon, 26 Apr 2021 16:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48048] [PATCH] update blender to 2.92 Resent-From: raingloom Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Apr 2021 20:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48048 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48048@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.161946997322656 (code B ref -1); Mon, 26 Apr 2021 20:47:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Apr 2021 20:46:13 +0000 Received: from localhost ([127.0.0.1]:47329 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lb87R-0005tF-0p for submit@debbugs.gnu.org; Mon, 26 Apr 2021 16:46:13 -0400 Received: from lists.gnu.org ([209.51.188.17]:38064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lb87G-0005sB-Um for submit@debbugs.gnu.org; Mon, 26 Apr 2021 16:46:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39712) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lb87G-0001wR-MB for guix-patches@gnu.org; Mon, 26 Apr 2021 16:46:02 -0400 Received: from mx1.riseup.net ([198.252.153.129]:52524) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lb87E-0000Zd-GK for guix-patches@gnu.org; Mon, 26 Apr 2021 16:46:02 -0400 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "Sectigo RSA Domain Validation Secure Server CA" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4FTcP200DbzDqgQ for ; Mon, 26 Apr 2021 13:45:57 -0700 (PDT) X-Riseup-User-ID: C5316111A0FF273AA01380437E655B2EAF3E6ED45C6E68CB01B5C3CEA7F4883F Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4FTcP13fh6z5w5X for ; Mon, 26 Apr 2021 13:45:57 -0700 (PDT) Date: Mon, 26 Apr 2021 17:05:06 +0200 From: raingloom Message-ID: <20210426170506.3f99aa1c@riseup.net> MIME-Version: 1.0 Received-SPF: pass client-ip=198.252.153.129; envelope-from=raingloom@riseup.net; helo=mx1.riseup.net X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_03_06=1.592, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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 Tiny update for Blender. Tested with some quick geometry nodes shenanigans, everything seems to be in order. Piled another explicit path definition onto the pile to fix the build. Sadly it doesn't fail during configure without it, only a good half way into the build does it error. Some brave soul should probably fix that upstream and then we could get rid of all that added complexity. From 2e4c63de33641b015606b4cc63f908286e55954b Mon Sep 17 00:00:00 2001 From: raingloom Date: Mon, 26 Apr 2021 16:58:47 +0200 Subject: [PATCH] gnu: blender: Update to 2.92.0. * gnu/packages/graphics.scm (blender): Update to 2.92.0. [arguments]: Added workaround for numpy headers not being found. --- gnu/packages/graphics.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 7e83c7ea4e..da4b5ae32c 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -466,14 +466,14 @@ applications.") (define-public blender (package (name "blender") - (version "2.91.0") + (version "2.92.0") (source (origin (method url-fetch) (uri (string-append "https://download.blender.org/source/" "blender-" version ".tar.xz")) (sha256 (base32 - "0x396lgmk0dq9115yrc36s8zwxzmjr490sr5n2y6w27y17yllyjm")))) + "15a5vffn18a920286x0avbc2rap56k6y531wgibq68r90g2cz4g7")))) (build-system cmake-build-system) (arguments (let ((python-version (version-major+minor (package-version python)))) @@ -498,6 +498,9 @@ applications.") (string-append "-DPYTHON_INCLUDE_DIR=" (assoc-ref %build-inputs "python") "/include/python" ,python-version) (string-append "-DPYTHON_VERSION=" ,python-version) + (string-append "-DPYTHON_NUMPY_INCLUDE_DIRS=" + (assoc-ref %build-inputs "python-numpy") + "/lib/python" ,python-version "/site-packages/numpy/core/include/") (string-append "-DPYTHON_NUMPY_PATH=" (assoc-ref %build-inputs "python-numpy") "/lib/python" ,python-version "/site-packages/")) -- 2.31.1