From patchwork Wed Apr 3 01:30:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62657 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 5FD1827BBEA; Wed, 3 Apr 2024 02:32:37 +0100 (BST) 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=ham 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 2CD9827BBE2 for ; Wed, 3 Apr 2024 02:32:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrpTv-0008K8-OU; Tue, 02 Apr 2024 21:32:03 -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 1rrpTu-0008JV-Kj for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:02 -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 1rrpTu-0001IR-CH for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rrpTy-0002Dp-DN for guix-patches@gnu.org; Tue, 02 Apr 2024 21:32:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70035] [PATCH v3 9/9] gnu: blender: Update to 3.6.10. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 01:32:06 +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.17121079138421 (code B ref 70035); Wed, 03 Apr 2024 01:32:06 +0000 Received: (at 70035) by debbugs.gnu.org; 3 Apr 2024 01:31:53 +0000 Received: from localhost ([127.0.0.1]:56634 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTl-0002Bk-29 for submit@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:53 -0400 Received: from mout02.posteo.de ([185.67.36.66]:57959) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rrpTi-0002Ag-Cy for 70035@debbugs.gnu.org; Tue, 02 Apr 2024 21:31:51 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id B52B7240101 for <70035@debbugs.gnu.org>; Wed, 3 Apr 2024 03:31:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1712107900; bh=eboYQXN80eOjKoFzoVuW/VgfoN+Kdw4/GP4s1Z/Rlxo=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=QHEkpe5KZy0fthQQmmipr/Mi+JKGLzGEWn9d+OXnP9TYCtSFsdjpSYjvwsnDLF9vM gO1i6PynW9LQ7EpI4UztTumwLpIpP6MC2fjYMiy6eJKXk5WuW0nlcs4HSD67EmdQc1 s1/Tg7Bqba0y3eCUZ8kZzWDZ5NXQrvmBsOuX3hcMhS3XagEbJnOHzuIekH/mX5b03m ojCeGeihqJ61R8iOV/vbq3YkXqZh0t9l/9gRsGzmTc/RKOr02SHRq8x0dJwQohnkih LWLnQEJH9zqsffUnrqs9CA5GbyWEgiKGonOu8o93YILgyC8KzeijdgQPG1XBqfDWl/ yh6mA6GYK6azQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V8Rzv6Ng3z6twB; Wed, 3 Apr 2024 03:31:39 +0200 (CEST) From: Vinicius Monego Date: Wed, 3 Apr 2024 01:30:29 +0000 Message-Id: <6f9730b7537fc44d36c0b28db981919d16c3f965.1712107465.git.monego@posteo.net> In-Reply-To: References: 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 * gnu/packages/graphics.scm (blender): Update to 3.6.10. [arguments]<#:configure-flags>: Unset "-DPYTHON_LIBRARY", "-DPYTHON_LIBPATH", "-DPYTHON_VERSION", "-DPYTHON_NUMPY_INCLUDE_DIRS", "-DPYTHON_NUMPY_PATH", "-DCMAKE_CXX_FLAGS". [inputs]: Add libepoxy. Replace freetype with freetype-with-brotli, ilmbase with imath, openexr-2 with openexr. Change-Id: Ifb5e5cdb4d26aac9626bf5cd77e171d8b0ebfaed --- gnu/packages/graphics.scm | 43 +++++++-------------------------------- 1 file changed, 7 insertions(+), 36 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 555800e517..fc99da8a12 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -493,14 +493,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.10") ;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")))) + "1srwr365y40hhpjmfsg52rphdybvin0ay2r23pknm7b9pkpw0wqs")))) (build-system cmake-build-system) (arguments (list @@ -520,48 +520,19 @@ (define-public blender "-DWITH_MOD_OCEANSIM=ON" "-DWITH_OPENVDB=ON" "-DWITH_OPENSUBDIV=ON" - "-DWITH_PYTHON_INSTALL=OFF" - (string-append "-DPYTHON_LIBRARY=python" #$python-version) - (string-append "-DPYTHON_LIBPATH=" - (assoc-ref %build-inputs "python") - "/lib") - (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/") - ;; OpenEXR propagates ilmbase, but its include files do not - ;; appear in the C_INCLUDE_PATH, so we need to add - ;; "$ilmbase/include/OpenEXR/" to the C_INCLUDE_PATH to - ;; 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"))))))) + "-DWITH_PYTHON_INSTALL=OFF")))) (inputs (list boost embree ffmpeg-5 fftw - freetype + freetype-with-brotli glew gmp ;needed for boolean operations on meshes - ilmbase + imath jack-1 jemalloc + libepoxy libjpeg-turbo libpng libsndfile @@ -571,7 +542,7 @@ (define-public blender libxrender openal opencolorio - openexr-2 + openexr openimageio openjpeg opensubdiv