Gernot Ziegler's patch to add OpenEXR support to blender.

To enable it you will need to download OpenEXR and install it.
For the Makefiles you will need to set WITH_OPENEXR=true
and set NAN_OPENEXR to point to where OpenEXR is installed.

For scons you'll need to remove config.opts to get the new options
so you can enable OpenEXR, I was not able to get blender to link
with scons so the scons stuff may need to be tweaked a little but
I think it should work.

For other platform managers  The OpenEXR stuff is similar to QUICKTIME
you need to define WITH_OPENEXR and setup the library stuff and
as you'll notice in this commit there are two extra files.

Kent

1 files changed, 33 insertions, 0 deletions

diff --git a/SConstruct b/SConstruct
index ce3e77bccb2..0cbecdfa937 100644
--- a/SConstruct
+++ b/SConstruct
@@ -82,6 +82,10 @@ if sys.platform == 'linux2' or sys.platform == 'linux-i386':
 	png_lib = ['png']
 	png_libpath = ['/usr/lib']
 	png_include = ['/usr/include']
+	# OpenEXR library information
+	openexr_lib = ['Iex', 'Half', 'IlmImf', 'Imath']
+	openexr_libpath = ['/usr/lib']
+	openexr_include = ['/usr/include/OpenEXR']
 	# jpeg library information
 	jpeg_lib = ['jpeg']
 	jpeg_libpath = ['/usr/lib']
@@ -128,6 +132,9 @@ if sys.platform == 'linux2' or sys.platform == 'linux-i386':
 	openal_lib = ['openal']
 	openal_libpath = ['/usr/lib']
 	openal_include = ['/usr/include']
+        use_openexr = 'false'
+	if use_openexr == 'true':
+		defines += ['WITH_OPENEXR']
 
 elif sys.platform == 'darwin':
 	use_international = 'true'
@@ -240,6 +247,8 @@ elif sys.platform == 'darwin':
 	openal_lib = ['libopenal']
 	openal_libpath = [darwin_precomp + 'openal/lib']
 	openal_include = [darwin_precomp + 'openal/include']
+	if use_openexr == 'false':
+		defines += ['WITH_OPENEXR']
 
 elif sys.platform == 'cygwin':
 	use_international = 'false'
@@ -320,6 +329,8 @@ elif sys.platform == 'cygwin':
 	openal_lib = []
 	openal_libpath = []
 	openal_include = []
+	if use_openexr == 'false':
+		defines += ['WITH_OPENEXR']
 
 elif sys.platform == 'win32':
 	use_international = 'true'
@@ -421,6 +432,8 @@ elif sys.platform == 'win32':
 	openal_lib = ['openal_static']
 	openal_libpath = ['#../lib/windows/openal/lib']
 	openal_include = ['#../lib/windows/openal/include']
+	if use_openexr == 'false':
+		defines += ['WITH_OPENEXR']
 
 elif string.find (sys.platform, 'sunos') != -1:
 	use_international = 'true'
@@ -499,6 +512,8 @@ elif string.find (sys.platform, 'sunos') != -1:
 	openal_lib = []
 	openal_libpath = []
 	openal_include = []
+	if use_openexr == 'false':
+		defines += ['WITH_OPENEXR']
 
 elif string.find (sys.platform, 'irix') != -1:
 	use_international = 'false'
@@ -584,10 +599,14 @@ elif string.find (sys.platform, 'irix') != -1:
 	openal_lib = []
 	openal_libpath = []
 	openal_include = []
+	if use_openexr == 'false':
+		defines += ['WITH_OPENEXR']
 
 elif string.find (sys.platform, 'hp-ux') != -1:
 	window_system = 'X11'
 	defines = []
+	if use_openexr == 'false':
+		defines += ['WITH_OPENEXR']
 
 elif sys.platform=='openbsd3':
 	print "Building for OpenBSD 3.x"
@@ -667,6 +686,8 @@ elif sys.platform=='openbsd3':
 	openal_lib = ['openal']
 	openal_libpath = ['/usr/lib']
 	openal_include = ['/usr/include']
+	if use_openexr == 'false':
+		defines += ['WITH_OPENEXR']
 	
 elif sys.platform=='freebsd4' or sys.platform=='freebsd5':
 	print "Building for FreeBSD"
@@ -746,6 +767,8 @@ elif sys.platform=='freebsd4' or sys.platform=='freebsd5':
 	openal_lib = ['openal']
 	openal_libpath = ['/usr/lib']
 	openal_include = ['/usr/include']
+	if use_openexr == 'false':
+		defines += ['WITH_OPENEXR']
 
 else:
 	print "Unknown platform %s"%sys.platform
@@ -820,6 +843,10 @@ else:
 	config.write ("PNG_INCLUDE = %r\n"%(png_include))
 	config.write ("PNG_LIBPATH = %r\n"%(png_libpath))
 	config.write ("PNG_LIBRARY = %r\n"%(png_lib))
+	config.write ("USE_OPENEXR = %r\n"%(use_openexr))
+	config.write ("OPENEXR_INCLUDE = %r\n"%(openexr_include))
+	config.write ("OPENEXR_LIBPATH = %r\n"%(openexr_libpath))
+	config.write ("if USE_OPENEXR == 'true':\n\tOPENEXR_LIBRARY = %r\n"%(openexr_lib))
 	config.write ("JPEG_INCLUDE = %r\n"%(jpeg_include))
 	config.write ("JPEG_LIBPATH = %r\n"%(jpeg_libpath))
 	config.write ("JPEG_LIBRARY = %r\n"%(jpeg_lib))
@@ -900,6 +927,9 @@ user_options.AddOptions (
 		(BoolOption ('USE_QUICKTIME',
 					'Set to 1 to add support for QuickTime.',
 					'false')),
+		(BoolOption ('USE_OPENEXR',
+					'Set to 1 to add support for OpenEXR.',
+					'false')),
 		('HOST_CC', 'C compiler for the host platfor. This is the same as target platform when not cross compiling.'),
 		('HOST_CXX', 'C++ compiler for the host platform. This is the same as target platform when not cross compiling.'),
 		('TARGET_CC', 'C compiler for the target platform.'),
@@ -923,6 +953,9 @@ user_options.AddOptions (
 		('PNG_INCLUDE', 'Include directory for png header files.'),
 		('PNG_LIBPATH', 'Library path where the png library is located.'),
 		('PNG_LIBRARY', 'png library name.'),
+		('OPENEXR_INCLUDE', 'Include directory for OpenEXR header files.'),
+		('OPENEXR_LIBPATH', 'Library path where the OpenEXR library is located.'),
+		('OPENEXR_LIBRARY', 'openexr library names.'),
 		('JPEG_INCLUDE', 'Include directory for jpeg header files.'),
 		('JPEG_LIBPATH', 'Library path where the jpeg library is located.'),
 		('JPEG_LIBRARY', 'jpeg library name.'),