From bea665e01fca7fdbdf9eea86125b11e92abff7e2 Mon Sep 17 00:00:00 2001 From: Stefan Walter Date: Thu, 5 Apr 2007 21:30:23 +0000 Subject: [PATCH] Fix build with OpenEXR 1.4.0. PR: 110653 Submitted by: Jon Spencer Approved by: maintainer timeout (2 weeks) --- .../files/patch-source_nan_definitions.mk | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/graphics/blender-devel/files/patch-source_nan_definitions.mk b/graphics/blender-devel/files/patch-source_nan_definitions.mk index 5118e4365185..81c41c1bb688 100644 --- a/graphics/blender-devel/files/patch-source_nan_definitions.mk +++ b/graphics/blender-devel/files/patch-source_nan_definitions.mk @@ -1,5 +1,5 @@ ---- source/nan_definitions.mk.orig Wed Nov 22 14:05:35 2006 -+++ source/nan_definitions.mk Tue Feb 20 03:38:18 2007 +--- source/nan_definitions.mk.orig Wed Nov 22 11:05:35 2006 ++++ source/nan_definitions.mk Wed Mar 21 21:24:37 2007 @@ -55,9 +55,9 @@ export NAN_LIBDIR ?= $(NANBLENDERHOME)/../lib export NAN_OBJDIR ?= $(NANBLENDERHOME)/obj @@ -12,6 +12,15 @@ export NAN_MOTO ?= $(LCGDIR)/moto ifeq ($(FREE_WINDOWS), true) +@@ -132,7 +132,7 @@ + export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a + else + export NAN_OPENEXR ?= /usr/local +- export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a ++ export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libIlmThread.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a + endif + endif + export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR @@ -291,6 +291,7 @@ # enable freetype2 support for text objects