From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Bavier Subject: Re: [PATCH] Add Blender Date: Mon, 21 Sep 2015 18:45:39 -0500 Message-ID: <20150921184539.2cddac04@openmailbox.org> References: <87a8sg6cpx.fsf@elephly.net> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57832) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZeFLp-000521-KB for guix-devel@gnu.org; Tue, 22 Sep 2015 00:38:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZeFLm-0002Gw-DR for guix-devel@gnu.org; Tue, 22 Sep 2015 00:38:45 -0400 Received: from smtp29.openmailbox.org ([62.4.1.63]:53229) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZeFLm-0002Gh-5K for guix-devel@gnu.org; Tue, 22 Sep 2015 00:38:42 -0400 In-Reply-To: <87a8sg6cpx.fsf@elephly.net> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Ricardo Wurmus Cc: guix-devel Hello Ricardo, Just some nitpicks: > From d1d46f01d7aad783f7931be1ea4bbdffb21fd9b7 Mon Sep 17 00:00:00 2001 > From: Ricardo Wurmus > Date: Sat, 5 Sep 2015 12:34:09 +0200 > Subject: [PATCH 1/2] gnu: Add openimageio. > > * gnu/packages/graphics.scm (openimageio): New variable. > --- > gnu/packages/graphics.scm | 38 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 38 insertions(+) > > diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm > index 14badc9..d9d1f26 100644 > --- a/gnu/packages/graphics.scm > +++ b/gnu/packages/graphics.scm > @@ -130,6 +130,44 @@ use in computer imaging applications. The IlmImf C++ libraries support > storage of the \"EXR\" file format for storing 16-bit floating-point images.") > (license license:bsd-3))) > > +(define-public openimageio > + (package [...] > + (description > + "OpenImageIO is a library for reading and writing images, and a bunch of ^ Align the opening quote to the 'd'. > From 6e9eba597d5588f845ccec6507ad1b7e987ba659 Mon Sep 17 00:00:00 2001 > From: Ricardo Wurmus > Date: Thu, 3 Sep 2015 14:17:34 +0200 > Subject: [PATCH 2/2] gnu: Add Blender. > > * gnu/packages/graphics.scm (blender): New variable. > --- > gnu/packages/graphics.scm | 67 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 67 insertions(+) [...] > +(define-public blender > + (package > + (name "blender") > + (version "2.75a") > + (source (origin > + (method url-fetch) > + (uri (string-append "http://download.blender.org/source/" > + "blender-" version ".tar.gz")) > + (sha256 > + (base32 > + "09lxb2li70p6fg7hbakin9ffy3b3101c1gdjqi3pykks5q3h9sq4")))) > + (build-system cmake-build-system) > + (arguments > + `(#:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'disable-broken-tests > + (lambda _ > + (substitute* "tests/python/CMakeLists.txt" > + (("# PLY Import tests") "if(FALSE)") > + (("# PLY Export") "endif()")) > + #t)) > + (add-after 'unpack 'fix-broken-import > + (lambda _ > + (substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py" > + (("import encode_bin") "from . import encode_bin")) > + #t)) > + (add-after 'set-paths 'add-ilmbase-include-path > + (lambda* (#:key inputs #:allow-other-keys) > + ;; OpenEXR propagates ilmbase, but its include files do not appear > + ;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to > + ;; the CPATH to satisfy the dependency on "half.h". > + (setenv "CPATH" > + (string-append (assoc-ref inputs "ilmbase") > + "/include/OpenEXR" > + ":" (getenv "CPATH"))) Is the "half.h" header in OpenEXR, or in blender? If the latter, would it make more sense to instead patch the include directive to include the OpenEXR path? Otherwise LGTM. `~Eric