[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40638] trunk/lib/win64: OpenImageIO 0.10. 2 for windows x64, built against boost 1.45 with MSVC 2008 Professional.

Tue Sep 27 23:43:09 CEST 2011

Revision: 40638
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40638
Author:   dingto
Date:     2011-09-27 21:43:09 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
OpenImageIO 0.10.2 for windows x64, built against boost 1.45 with MSVC 2008 Professional. 

Modified Paths:
--------------
    trunk/lib/win64/Readme.txt

Added Paths:
-----------
    trunk/lib/win64/openimageio/
    trunk/lib/win64/openimageio/bin/
    trunk/lib/win64/openimageio/bin/OpenImageIO.dll
    trunk/lib/win64/openimageio/build.bat
    trunk/lib/win64/openimageio/build.patch
    trunk/lib/win64/openimageio/include/
    trunk/lib/win64/openimageio/include/OpenImageIO/
    trunk/lib/win64/openimageio/include/OpenImageIO/argparse.h
    trunk/lib/win64/openimageio/include/OpenImageIO/colortransfer.h
    trunk/lib/win64/openimageio/include/OpenImageIO/dassert.h
    trunk/lib/win64/openimageio/include/OpenImageIO/errorhandler.h
    trunk/lib/win64/openimageio/include/OpenImageIO/export.h
    trunk/lib/win64/openimageio/include/OpenImageIO/filesystem.h
    trunk/lib/win64/openimageio/include/OpenImageIO/filter.h
    trunk/lib/win64/openimageio/include/OpenImageIO/fmath.h
    trunk/lib/win64/openimageio/include/OpenImageIO/hash.h
    trunk/lib/win64/openimageio/include/OpenImageIO/imagebuf.h
    trunk/lib/win64/openimageio/include/OpenImageIO/imagebufalgo.h
    trunk/lib/win64/openimageio/include/OpenImageIO/imagecache.h
    trunk/lib/win64/openimageio/include/OpenImageIO/imageio.h
    trunk/lib/win64/openimageio/include/OpenImageIO/osdep.h
    trunk/lib/win64/openimageio/include/OpenImageIO/paramlist.h
    trunk/lib/win64/openimageio/include/OpenImageIO/pugiconfig.hpp
    trunk/lib/win64/openimageio/include/OpenImageIO/pugixml.hpp
    trunk/lib/win64/openimageio/include/OpenImageIO/refcnt.h
    trunk/lib/win64/openimageio/include/OpenImageIO/strutil.h
    trunk/lib/win64/openimageio/include/OpenImageIO/sysutil.h
    trunk/lib/win64/openimageio/include/OpenImageIO/texture.h
    trunk/lib/win64/openimageio/include/OpenImageIO/thread.h
    trunk/lib/win64/openimageio/include/OpenImageIO/timer.h
    trunk/lib/win64/openimageio/include/OpenImageIO/typedesc.h
    trunk/lib/win64/openimageio/include/OpenImageIO/ustring.h
    trunk/lib/win64/openimageio/include/OpenImageIO/varyingref.h
    trunk/lib/win64/openimageio/include/OpenImageIO/version.h
    trunk/lib/win64/openimageio/lib/
    trunk/lib/win64/openimageio/lib/OpenImageIO.lib
    trunk/lib/win64/openimageio/readme.txt

Modified: trunk/lib/win64/Readme.txt
===================================================================

--- trunk/lib/win64/Readme.txt	2011-09-27 21:35:05 UTC (rev 40637)
+++ trunk/lib/win64/Readme.txt	2011-09-27 21:43:09 UTC (rev 40638)
@@ -1,3 +1,4 @@
 OpenCOLLADA r788
 FreeType 2.4.4 (Release Multithread, Debug Multithread, settings copied from win32 configuration)
-png 1.2.46
\ No newline at end of file
+png 1.2.46
+OpenImageIO 0.10.2
\ No newline at end of file


Property changes on: trunk/lib/win64/openimageio
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: trunk/lib/win64/openimageio/bin
___________________________________________________________________
Added: bugtraq:number
   + true

Added: trunk/lib/win64/openimageio/bin/OpenImageIO.dll
===================================================================
(Binary files differ)


Property changes on: trunk/lib/win64/openimageio/bin/OpenImageIO.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/lib/win64/openimageio/build.bat
===================================================================
--- trunk/lib/win64/openimageio/build.bat	                        (rev 0)
+++ trunk/lib/win64/openimageio/build.bat	2011-09-27 21:43:09 UTC (rev 40638)
@@ -0,0 +1,88 @@
+ at Echo off
+
+set LIBDIR=%CD%\..\..
+
+:: hack to get compatible EXR headers
+set EXRINC=%LIBDIR%\openexr\include
+mkdir %LIBDIR%\openexr\include\OpenEXR
+xcopy /E /Y %EXRINC%\Iex %EXRINC%\OpenEXR\
+xcopy /E /Y %EXRINC%\IlmImf %EXRINC%\OpenEXR\
+xcopy /E /Y %EXRINC%\Imath %EXRINC%\OpenEXR\
+xcopy /E /Y %EXRINC%\IlmThread %EXRINC%\OpenEXR\
+xcopy /Y %EXRINC%\half.h %EXRINC%\OpenEXR\
+xcopy /Y %EXRINC%\halfFunction.h %EXRINC%\OpenEXR\
+xcopy /Y %EXRINC%\halfLimits.h %EXRINC%\OpenEXR\
+xcopy /Y %EXRINC%\IlmBaseConfig.h %EXRINC%\OpenEXR\
+
+:: create build directory
+mkdir build\windows
+cd build\windows
+
+cmake -G "NMake Makefiles" ..\..\src ^
+ -DCMAKE_INSTALL_PREFIX=%LIBDIR%\openimageio\release ^
+ -DILMBASE_INCLUDE_DIR=%LIBDIR%\openexr\include ^
+ -DILMBASE_HALF_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\Half.lib ^
+ -DILMBASE_IMATH_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\Imath.lib ^
+ -DILMBASE_ILMTHREAD_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\IlmThread.lib ^
+ -DILMBASE_IEX_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\Iex.lib ^
+ -DOPENEXR_INCLUDE_DIR=%LIBDIR%\openexr\include ^
+ -DOPENEXR_ILMIMF_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\IlmImf.lib ^
+ -DLINKSTATIC=ON ^
+ -DBOOST_ROOT=%LIBDIR%\boost ^
+ -DBoost_USE_STATIC_RUNTIME=ON ^
+ -DZLIB_INCLUDE_DIR=%LIBDIR%\zlib\include ^
+ -DZLIB_LIBRARY=%LIBDIR%\zlib\lib\libz.lib ^
+ -DPNG_PNG_INCLUDE_DIR=%LIBDIR%\png\include ^
+ -DPNG_LIBRARY=%LIBDIR%\png\lib\libpng.lib ^
+ -DJPEG_INCLUDE_DIR=%LIBDIR%\jpeg\include ^
+ -DJPEG_LIBRARY=%LIBDIR%\jpeg\lib\libjpeg.lib ^
+ -DTIFF_INCLUDE_DIR=%LIBDIR%\tiff\include ^
+ -DTIFF_LIBRARY=%LIBDIR%\tiff\lib\libtiff.lib ^
+ -DUSE_OPENGL=OFF ^
+ -DUSE_TBB=OFF ^
+ -DUSE_FIELD3D=OFF ^
+ -DUSE_QT=OFF ^
+ -DUSE_PYTHON=OFF ^
+ -DCMAKE_BUILD_TYPE=Release
+
+nmake
+nmake install
+
+cd ..\..
+
+:: create build directory
+mkdir build\windows_debug
+cd build\windows_debug
+
+cmake -G "NMake Makefiles" ..\..\src ^
+ -DCMAKE_INSTALL_PREFIX=%LIBDIR%\openimageio\debug ^
+ -DILMBASE_INCLUDE_DIR=%LIBDIR%\openexr\include ^
+ -DILMBASE_HALF_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\Half_d.lib ^
+ -DILMBASE_IMATH_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\Imath_d.lib ^
+ -DILMBASE_ILMTHREAD_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\IlmThread_d.lib ^
+ -DILMBASE_IEX_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\Iex_d.lib ^
+ -DOPENEXR_INCLUDE_DIR=%LIBDIR%\openexr\include ^
+ -DOPENEXR_ILMIMF_LIBRARIES=%LIBDIR%\openexr\lib_vs2008\IlmImf_d.lib ^
+ -DLINKSTATIC=ON ^
+ -DBOOST_ROOT=%LIBDIR%\boost ^
+ -DBoost_USE_STATIC_RUNTIME=ON ^
+ -DZLIB_INCLUDE_DIR=%LIBDIR%\zlib\include ^
+ -DZLIB_LIBRARY=%LIBDIR%\zlib\lib\libz.lib ^
+ -DPNG_PNG_INCLUDE_DIR=%LIBDIR%\png\include ^
+ -DPNG_LIBRARY=%LIBDIR%\png\lib\libpng_st.lib ^
+ -DJPEG_INCLUDE_DIR=%LIBDIR%\jpeg\include ^
+ -DJPEG_LIBRARY=%LIBDIR%\jpeg\lib\libjpeg.lib ^
+ -DTIFF_INCLUDE_DIR=%LIBDIR%\tiff\include ^
+ -DTIFF_LIBRARY=%LIBDIR%\tiff\lib\libtiff.lib ^
+ -DUSE_OPENGL=OFF ^
+ -DUSE_TBB=OFF ^
+ -DUSE_FIELD3D=OFF ^
+ -DUSE_QT=OFF ^
+ -DUSE_PYTHON=OFF ^
+ -DCMAKE_BUILD_TYPE=Debug
+
+nmake
+nmake install
+
+cd ..\..
+

Added: trunk/lib/win64/openimageio/build.patch
===================================================================
--- trunk/lib/win64/openimageio/build.patch	                        (rev 0)
+++ trunk/lib/win64/openimageio/build.patch	2011-09-27 21:43:09 UTC (rev 40638)
@@ -0,0 +1,146 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index f322e83..fdc1f70 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -116,20 +116,30 @@ if (MSVC)
+     if (BUILDSTATIC)
+          add_definitions(-DOIIO_STATIC_BUILD=1)
+     endif ()
++
++    set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1")
++    set(CMAKE_C_FLAGS_MINSIZEREL     "/MT /O1 /Ob1 /D NDEBUG")
++    set(CMAKE_C_FLAGS_RELEASE        "/MT /O2 /Ob2 /D NDEBUG")
++    set(CMAKE_C_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1 /D NDEBUG")
++
++    set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1")
++    set(CMAKE_CXX_FLAGS_MINSIZEREL     "/MT /O1 /Ob1 /D NDEBUG")
++    set(CMAKE_CXX_FLAGS_RELEASE        "/MT /O2 /Ob2 /D NDEBUG")
++    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1 /D NDEBUG")
+ endif (MSVC)
+ 
+ 
+ # Tell CMake to process the sub-directories
+ add_subdirectory (libOpenImageIO)
+ 
+-add_subdirectory (iconvert)
+-add_subdirectory (idiff)
+-add_subdirectory (igrep)
+-add_subdirectory (iinfo)
+-add_subdirectory (iprocess)
+-add_subdirectory (maketx)
+-add_subdirectory (testtex)
+-add_subdirectory (iv)
++#add_subdirectory (iconvert)
++#add_subdirectory (idiff)
++#add_subdirectory (igrep)
++#add_subdirectory (iinfo)
++#add_subdirectory (iprocess)
++#add_subdirectory (maketx)
++#add_subdirectory (testtex)
++#add_subdirectory (iv)
+ 
+ # Add IO plugin directories
+ if (NOT EMBEDPLUGINS)
+@@ -167,41 +177,41 @@ add_subdirectory (doc)
+ # Testing
+ 
+ # List all the individual testsuite tests here:
+-oiio_add_tests (ico gpsread sgi 
+-                texture-fill texture-gray texture-grid
+-                texture-missing texture-pointsample texture-res
+-                texture-skinny texture-fat
+-                imagecache-files texture-field3d)
++#oiio_add_tests (ico gpsread sgi 
++#                texture-fill texture-gray texture-grid
++#                texture-missing texture-pointsample texture-res
++#                texture-skinny texture-fat
++#                imagecache-files texture-field3d)
+ 
+ # List testsuites which need special external reference images from the web
+ # here:
+-oiio_add_tests (bmp
+-    IMAGEDIR bmpsuite
+-    URL http://entropymine.com/jason/bmpsuite/bmpsuite.zip)
++#oiio_add_tests (bmp
++#    IMAGEDIR bmpsuite
++#    URL http://entropymine.com/jason/bmpsuite/bmpsuite.zip)
+ 
+-oiio_add_tests (tiff-suite tiff-depths
+-    IMAGEDIR libtiffpic
+-    URL http://www.remotesensing.org/libtiff/images.html)
++#oiio_add_tests (tiff-suite tiff-depths
++#    IMAGEDIR libtiffpic
++#    URL http://www.remotesensing.org/libtiff/images.html)
+ 
+-oiio_add_tests (openexr-suite openexr-multires openexr-chroma
+-    IMAGEDIR openexr-images-1.5.0
+-    URL http://www.openexr.com/downloads.html)
++#oiio_add_tests (openexr-suite openexr-multires openexr-chroma
++#    IMAGEDIR openexr-images-1.5.0
++#    URL http://www.openexr.com/downloads.html)
+ 
+-oiio_add_tests (jpeg2000
+-    IMAGEDIR j2kp4files_v1_5
+-    URL http://www.crc.ricoh.com/~gormish/jpeg2000conformance/)
++#oiio_add_tests (jpeg2000
++#    IMAGEDIR j2kp4files_v1_5
++#    URL http://www.crc.ricoh.com/~gormish/jpeg2000conformance/)
+ 
+-oiio_add_tests (targa-tgautils
+-    IMAGEDIR TGAUTILS
+-    URL http://tgautils.inequation.org/)
++#oiio_add_tests (targa-tgautils
++#    IMAGEDIR TGAUTILS
++#    URL http://tgautils.inequation.org/)
+ 
+-oiio_add_tests (fits
+-    IMAGEDIR fits-images
+-    URL http://www.cv.nrao.edu/fits/data/tests/)
++#oiio_add_tests (fits
++#    IMAGEDIR fits-images
++#    URL http://www.cv.nrao.edu/fits/data/tests/)
+ 
+-oiio_add_tests (webp
+-    IMAGEDIR webp-images
+-    URL http://code.google.com/speed/webp/gallery.html)
++#oiio_add_tests (webp
++#    IMAGEDIR webp-images
++#    URL http://code.google.com/speed/webp/gallery.html)
+ 
+ #########################################################################
+ # Packaging
+@@ -234,7 +244,7 @@ if (WIN32)
+     set(CPACK_PACKAGE_EXECUTABLES "iv" "iv - Image Viewer")
+ #    set(CPACK_CREATE_DESCTOP_LINKS "iv" "iv - Image Viewer")
+     set(CPACK_NSIS_MODIFY_PATH ON)
+-    add_dll_files ()
++    #add_dll_files ()
+     include (InstallRequiredSystemLibraries)
+ endif ()
+ set (CPACK_SOURCE_PACKAGE_FILE_NAME OpenImageIO-${OIIO_VERSION_MAJOR}.${OIIO_VERSION_MINOR}.${OIIO_VERSION_PATCH}-source)
+diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
+index 595ba92..d3b5c3d 100644
+--- a/src/cmake/externalpackages.cmake
++++ b/src/cmake/externalpackages.cmake
+@@ -82,7 +82,7 @@ endmacro ()
+ 
+ message (STATUS "BOOST_ROOT ${BOOST_ROOT}")
+ 
+-set (Boost_ADDITIONAL_VERSIONS "1.45" "1.44" 
++set (Boost_ADDITIONAL_VERSIONS "1.46" "1_46_1" "1.45" "1.44" 
+                                "1.43" "1.43.0" "1.42" "1.42.0" 
+                                "1.41" "1.41.0" "1.40" "1.40.0"
+                                "1.39" "1.39.0" "1.38" "1.38.0"
+diff --git a/src/libOpenImageIO/CMakeLists.txt b/src/libOpenImageIO/CMakeLists.txt
+index 8c162bc..d49c37a 100644
+--- a/src/libOpenImageIO/CMakeLists.txt
++++ b/src/libOpenImageIO/CMakeLists.txt
+@@ -207,6 +207,8 @@ oiio_install_targets (OpenImageIO)
+ if (NOT LINKSTATIC)
+     add_definitions (-DBOOST_TEST_DYN_LINK)
+     add_definitions (-DPTEX_EXPORTS)
++else ()
++    add_definitions (-DPTEX_STATIC)
+ endif ()
+ 
+ add_executable (imagebufalgo_test imagebufalgo_test.cpp)


Property changes on: trunk/lib/win64/openimageio/include
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: trunk/lib/win64/openimageio/include/OpenImageIO
___________________________________________________________________
Added: bugtraq:number
   + true

Added: trunk/lib/win64/openimageio/include/OpenImageIO/argparse.h

@@ Diff output truncated at 10240 characters. @@

