From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ricardo Wurmus <rekado@elephly.net>
Subject: Re: [PATCH] Add Blender
Date: Sat, 26 Sep 2015 14:00:13 +0200
Message-ID: <87612xpf02.fsf@elephly.net>
References: <87a8sg6cpx.fsf@elephly.net>
	<20150921184539.2cddac04@openmailbox.org>
	<87k2rhpraz.fsf@elephly.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49340)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <rekado@elephly.net>) id 1Zfo9Q-0005Fo-BI
	for guix-devel@gnu.org; Sat, 26 Sep 2015 08:00:26 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <rekado@elephly.net>) id 1Zfo9N-0006bI-3I
	for guix-devel@gnu.org; Sat, 26 Sep 2015 08:00:24 -0400
Received: from sender163-mail.zoho.com ([74.201.84.163]:25080)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <rekado@elephly.net>) id 1Zfo9M-0006YX-Rf
	for guix-devel@gnu.org; Sat, 26 Sep 2015 08:00:21 -0400
In-reply-to: <87k2rhpraz.fsf@elephly.net>
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=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: Eric Bavier <ericbavier@openmailbox.org>
Cc: guix-devel <guix-devel@gnu.org>


Ricardo Wurmus <rekado@elephly.net> writes:

> Eric Bavier <ericbavier@openmailbox.org> writes:

>>> +         (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?
>
> “half.h” is provided by “ilmbase”.  The include is in Blender, in this
> file:
>
>     blender-2.75a/source/blender/imbuf/intern/openexr/openexr_api.cpp
>
> I could patch this instead, replacing
>
>     #include <half.h>
>
> with
>
>     #include <OpenEXR/half.h>
>
> I’ll fix this, recompile and if there are no further objections push
> upon success.

I tried this, but there are more includes that need to be patched and
even that doesn’t help as the includes in “openexr” headers are still
broken, as the actual directory containing the headers is not in the
CPATH.

As this seems to be a problem with the “openexr”/“ilmbase” packages I’d
rather keep the originally proposed fix, i.e. adding the OpenEXR
directory to the CPATH.

If that’s okay, I’d push the “blender” package without further
modifications.

What do you think?

~~ Ricardo