[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61691] trunk/lib/windows_vc12/osl: MSVC 2013 Win32: Update OSL library to 1.7.3

Sergey Sharybin sergey.vfx at gmail.com
Tue Jul 12 13:41:10 CEST 2016 

Revision: 61691
          https://developer.blender.org/rBL61691
Author:   sergey
Date:     2016-07-12 13:41:07 +0200 (Tue, 12 Jul 2016)
Log Message:
-----------
MSVC 2013 Win32: Update OSL library to 1.7.3

Modified Paths:
--------------
    trunk/lib/windows_vc12/osl/bin/oslc.exe
    trunk/lib/windows_vc12/osl/bin/oslinfo.exe
    trunk/lib/windows_vc12/osl/build.bat
    trunk/lib/windows_vc12/osl/include/OSL/oslexec.h
    trunk/lib/windows_vc12/osl/include/OSL/oslversion.h
    trunk/lib/windows_vc12/osl/lib/oslcomp.lib
    trunk/lib/windows_vc12/osl/lib/oslcomp_d.lib
    trunk/lib/windows_vc12/osl/lib/oslexec.lib
    trunk/lib/windows_vc12/osl/lib/oslexec_d.lib
    trunk/lib/windows_vc12/osl/lib/oslquery.lib
    trunk/lib/windows_vc12/osl/lib/oslquery_d.lib
    trunk/lib/windows_vc12/osl/shaders/emitter.osl
    trunk/lib/windows_vc12/osl/shaders/emitter.oso
    trunk/lib/windows_vc12/osl/shaders/glass.osl
    trunk/lib/windows_vc12/osl/shaders/glass.oso
    trunk/lib/windows_vc12/osl/shaders/image.osl
    trunk/lib/windows_vc12/osl/shaders/image.oso
    trunk/lib/windows_vc12/osl/shaders/matte.osl
    trunk/lib/windows_vc12/osl/shaders/matte.oso
    trunk/lib/windows_vc12/osl/shaders/metal.osl
    trunk/lib/windows_vc12/osl/shaders/metal.oso
    trunk/lib/windows_vc12/osl/shaders/oslutil.h
    trunk/lib/windows_vc12/osl/shaders/stdosl.h
    trunk/lib/windows_vc12/osl/shaders/ubersurface.osl
    trunk/lib/windows_vc12/osl/shaders/ubersurface.oso

Removed Paths:
-------------
    trunk/lib/windows_vc12/osl/bin/testrender.exe
    trunk/lib/windows_vc12/osl/bin/testshade.exe
    trunk/lib/windows_vc12/osl/bin/testshade_dso.exe
    trunk/lib/windows_vc12/osl/build.patch
    trunk/lib/windows_vc12/osl/lib/libtestshade.lib
    trunk/lib/windows_vc12/osl/lib/libtestshade_d.lib

Modified: trunk/lib/windows_vc12/osl/bin/oslc.exe
===================================================================
(Binary files differ)

Modified: trunk/lib/windows_vc12/osl/bin/oslinfo.exe
===================================================================
(Binary files differ)

Deleted: trunk/lib/windows_vc12/osl/bin/testrender.exe
===================================================================
(Binary files differ)

Deleted: trunk/lib/windows_vc12/osl/bin/testshade.exe
===================================================================
(Binary files differ)

Deleted: trunk/lib/windows_vc12/osl/bin/testshade_dso.exe
===================================================================
(Binary files differ)

Modified: trunk/lib/windows_vc12/osl/build.bat
===================================================================
--- trunk/lib/windows_vc12/osl/build.bat	2016-07-12 11:40:06 UTC (rev 61690)
+++ trunk/lib/windows_vc12/osl/build.bat	2016-07-12 11:41:07 UTC (rev 61691)
@@ -3,7 +3,7 @@
 
 set LIBDIR=%CD%\..
 set LIBNAME=osl
-set OSL_VERSION=1.7.1
+set OSL_VERSION=1.7.3
 
 set "OSL_SOURCE=https://github.com/imageworks/OpenShadingLanguage/archive/Release-%OSL_VERSION%.zip"
 
@@ -44,10 +44,10 @@
 
 cmake -G "NMake Makefiles" ..\..\ ^
  -DCMAKE_INSTALL_PREFIX=%LIBDIR%\osl ^
- -DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /DPSAPI_VERSION=1 /RTC1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS " ^
- -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /DPSAPI_VERSION=1 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS " ^
- -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DPSAPI_VERSION=1 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS " ^
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /DPSAPI_VERSION=1 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS " ^
+ -DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /DPSAPI_VERSION=1 /RTC1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS /DBOOST_SYMBOL_EXPORT " ^
+ -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /DPSAPI_VERSION=1 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS /DBOOST_SYMBOL_EXPORT " ^
+ -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DPSAPI_VERSION=1 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS /DBOOST_SYMBOL_EXPORT " ^
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /DPSAPI_VERSION=1 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS /DBOOST_SYMBOL_EXPORT " ^
  -DCMAKE_CXX_STANDARD_LIBRARIES:STRING="kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib psapi.lib" ^
  -DBUILDSTATIC=ON ^
  -DOPENIMAGEIOHOME=%LIBDIR%\OpenImageIO ^
@@ -62,18 +62,18 @@
  -DZLIB_LIBRARY=%LIBDIR%\zlib\lib\libz_st.lib ^
  -DFLEX_EXECUTABLE=%LIBDIR%\osl\flex_bison\bin\win_flex.exe ^
  -DBISON_EXECUTABLE=%LIBDIR%\osl\flex_bison\bin\win_bison.exe ^
- -DILMBASE_CUSTOM="ON" ^
- -DILMBASE_CUSTOM_LIBRARIES="Imath-2_2 Half IlmThread-2_2 Iex-2_2" ^
- -DILMBASE_CUSTOM_INCLUDE_DIR=%LIBDIR%\openexr\include ^
- -DILMBASE_CUSTOM_LIB_DIR=%LIBDIR%\openexr\lib ^
+ -DOPENEXR_HOME=%LIBDIR%\openexr ^
+ -DOPENEXR_CUSTOM_LIB_SUFFIX="-2_2" ^
+ -DOPENEXR_CUSTOM_INCLUDE_DIR=%LIBDIR%\openexr\include ^
+ -DOPENEXR_CUSTOM_LIB_DIR=%LIBDIR%\openexr\lib ^
  -DLLVM_DIRECTORY=%LIBDIR%\llvm ^
  -DLLVM_INCLUDES=%LIBDIR%\llvm\include ^
  -DLLVM_LIB_DIR=%LIBDIR%\llvm\lib ^
  -DLLVM_VERSION=3.4 ^
  -DLLVM_LIBRARY=%LIBDIR%\llvm\lib\LLVMAnalysis.lib;%LIBDIR%\llvm\lib\LLVMAsmParser.lib;%LIBDIR%\llvm\lib\LLVMAsmPrinter.lib;%LIBDIR%\llvm\lib\LLVMBitReader.lib;%LIBDIR%\llvm\lib\LLVMBitWriter.lib;%LIBDIR%\llvm\lib\LLVMCodeGen.lib;%LIBDIR%\llvm\lib\LLVMCore.lib;%LIBDIR%\llvm\lib\LLVMDebugInfo.lib;%LIBDIR%\llvm\lib\LLVMExecutionEngine.lib;%LIBDIR%\llvm\lib\LLVMInstCombine.lib;%LIBDIR%\llvm\lib\LLVMInstrumentation.lib;%LIBDIR%\llvm\lib\LLVMInterpreter.lib;%LIBDIR%\llvm\lib\LLVMJIT.lib;%LIBDIR%\llvm\lib\LLVMLinker.lib;%LIBDIR%\llvm\lib\LLVMMC.lib;%LIBDIR%\llvm\lib\LLVMMCDisassembler.lib;%LIBDIR%\llvm\lib\LLVMMCJIT.lib;%LIBDIR%\llvm\lib\LLVMMCParser.lib;%LIBDIR%\llvm\lib\LLVMObject.lib;%LIBDIR%\llvm\lib\LLVMRuntimeDyld.lib;%LIBDIR%\llvm\lib\LLVMScalarOpts.lib;%LIBDIR%\llvm\lib\LLVMSelectionDAG.lib;%LIBDIR%\llvm\lib\LLVMSupport.lib;%LIBDIR%\llvm\lib\LLVMTableGen.lib;%LIBDIR%\llvm\lib\LLVMTarget.lib;%LIBDIR%\llvm\lib\LLVMTransformUtils.lib;%LIBDIR%\llvm\lib\LLVMVectorize.lib;%LIBDIR%\llvm\
 lib\LLVMX86AsmParser.lib;%LIBDIR%\llvm\lib\LLVMX86AsmPrinter.lib;%LIBDIR%\llvm\lib\LLVMX86CodeGen.lib;%LIBDIR%\llvm\lib\LLVMX86Desc.lib;%LIBDIR%\llvm\lib\LLVMX86Disassembler.lib;%LIBDIR%\llvm\lib\LLVMX86Info.lib;%LIBDIR%\llvm\lib\LLVMX86Utils.lib;%LIBDIR%\llvm\lib\LLVMipa.lib;%LIBDIR%\llvm\lib\LLVMipo.lib ^
- -DILMBASE_HOME=%LIBDIR%\openexr ^
- -DILMBASE_VERSION=2_2 ^
  -DUSE_SIMD=0 ^
+ -DOSL_BUILD_TESTS=OFF ^
+ -DOSL_BUILD_PLUGINS=OFF ^
  -DCMAKE_BUILD_TYPE=Release
 
 nmake install
@@ -91,10 +91,10 @@
 
 cmake -G "NMake Makefiles" ..\..\ ^
  -DCMAKE_INSTALL_PREFIX=%LIBDIR%\osl\debug ^
- -DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /DPSAPI_VERSION=1 /RTC1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS " ^
- -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /DPSAPI_VERSION=1 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS " ^
- -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DPSAPI_VERSION=1 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS " ^
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /DPSAPI_VERSION=1 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS " ^
+ -DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /DPSAPI_VERSION=1 /RTC1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS /DBOOST_SYMBOL_EXPORT " ^
+ -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /DPSAPI_VERSION=1 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS /DBOOST_SYMBOL_EXPORT " ^
+ -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DPSAPI_VERSION=1 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS /DBOOST_SYMBOL_EXPORT " ^
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /DPSAPI_VERSION=1 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS /DBOOST_SYMBOL_EXPORT " ^
  -DCMAKE_CXX_STANDARD_LIBRARIES:STRING="kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib psapi.lib" ^
  -DBUILDSTATIC=ON ^
  -DOPENIMAGEIOHOME=%LIBDIR%\OpenImageIO ^
@@ -102,10 +102,10 @@
  -DBOOST_ROOT=%LIBDIR%\boost ^
  -DBoost_USE_STATIC_LIBS=ON ^
  -DBoost_USE_STATIC_RUNTIME=ON ^
- -DILMBASE_CUSTOM="ON" ^
- -DILMBASE_CUSTOM_LIBRARIES="Imath-2_2_d Half_d IlmThread-2_2_d Iex-2_2_d" ^
- -DILMBASE_CUSTOM_INCLUDE_DIR=%LIBDIR%\openexr\include ^
- -DILMBASE_CUSTOM_LIB_DIR=%LIBDIR%\openexr\lib ^
+ -DOPENEXR_HOME=%LIBDIR%\openexr ^
+ -DOPENEXR_CUSTOM_LIB_SUFFIX="-2_2_d" ^
+ -DOPENEXR_CUSTOM_INCLUDE_DIR=%LIBDIR%\openexr\include ^
+ -DOPENEXR_CUSTOM_LIB_DIR=%LIBDIR%\openexr\lib ^
  -DZLIB_INCLUDE_DIR=%LIBDIR%\zlib\include ^
  -DZLIB_LIBRARY=%LIBDIR%\zlib\lib\libz_st.lib ^
  -DFLEX_EXECUTABLE=%LIBDIR%\osl\flex_bison\bin\win_flex.exe ^
@@ -116,9 +116,9 @@
  -DLLVM_VERSION=3.4 ^
  -DCMAKE_DEBUG_POSTFIX:STRING="_d" ^
  -DLLVM_LIBRARY=%LIBDIR%\llvm\debug\lib\LLVMAnalysis.lib;%LIBDIR%\llvm\debug\lib\LLVMAsmParser.lib;%LIBDIR%\llvm\debug\lib\LLVMAsmPrinter.lib;%LIBDIR%\llvm\debug\lib\LLVMBitReader.lib;%LIBDIR%\llvm\debug\lib\LLVMBitWriter.lib;%LIBDIR%\llvm\debug\lib\LLVMCodeGen.lib;%LIBDIR%\llvm\debug\lib\LLVMCore.lib;%LIBDIR%\llvm\debug\lib\LLVMDebugInfo.lib;%LIBDIR%\llvm\debug\lib\LLVMExecutionEngine.lib;%LIBDIR%\llvm\debug\lib\LLVMInstCombine.lib;%LIBDIR%\llvm\debug\lib\LLVMInstrumentation.lib;%LIBDIR%\llvm\debug\lib\LLVMInterpreter.lib;%LIBDIR%\llvm\debug\lib\LLVMJIT.lib;%LIBDIR%\llvm\debug\lib\LLVMLinker.lib;%LIBDIR%\llvm\debug\lib\LLVMMC.lib;%LIBDIR%\llvm\debug\lib\LLVMMCDisassembler.lib;%LIBDIR%\llvm\debug\lib\LLVMMCJIT.lib;%LIBDIR%\llvm\debug\lib\LLVMMCParser.lib;%LIBDIR%\llvm\debug\lib\LLVMObject.lib;%LIBDIR%\llvm\debug\lib\LLVMRuntimeDyld.lib;%LIBDIR%\llvm\debug\lib\LLVMScalarOpts.lib;%LIBDIR%\llvm\debug\lib\LLVMSelectionDAG.lib;%LIBDIR%\llvm\debug\lib\LLVMSupport.lib;%LIBDIR%\llvm\debug\l
 ib\LLVMTableGen.lib;%LIBDIR%\llvm\debug\lib\LLVMTarget.lib;%LIBDIR%\llvm\debug\lib\LLVMTransformUtils.lib;%LIBDIR%\llvm\debug\lib\LLVMVectorize.lib;%LIBDIR%\llvm\debug\lib\LLVMX86AsmParser.lib;%LIBDIR%\llvm\debug\lib\LLVMX86AsmPrinter.lib;%LIBDIR%\llvm\debug\lib\LLVMX86CodeGen.lib;%LIBDIR%\llvm\debug\lib\LLVMX86Desc.lib;%LIBDIR%\llvm\debug\lib\LLVMX86Disassembler.lib;%LIBDIR%\llvm\debug\lib\LLVMX86Info.lib;%LIBDIR%\llvm\debug\lib\LLVMX86Utils.lib;%LIBDIR%\llvm\debug\lib\LLVMipa.lib;%LIBDIR%\llvm\debug\lib\LLVMipo.lib ^
- -DILMBASE_HOME=%LIBDIR%\openexr ^
- -DILMBASE_VERSION=2_2 ^
  -DUSE_SIMD=0 ^
+ -DOSL_BUILD_TESTS=OFF ^
+ -DOSL_BUILD_PLUGINS=OFF ^
  -DCMAKE_BUILD_TYPE=Debug
 
 nmake install

Deleted: trunk/lib/windows_vc12/osl/build.patch
===================================================================
--- trunk/lib/windows_vc12/osl/build.patch	2016-07-12 11:40:06 UTC (rev 61690)
+++ trunk/lib/windows_vc12/osl/build.patch	2016-07-12 11:41:07 UTC (rev 61691)
@@ -1,143 +0,0 @@
-diff -ur a/OpenShadingLanguage-Release-1.4.1src/include/osl_pvt.h b/OpenShadingLanguage-Release-1.4.1/src/include/osl_pvt.h
---- a/OpenShadingLanguage-Release-1.4.1src/include/osl_pvt.h	Wed Jan 15 10:39:17 2014
-+++ b/OpenShadingLanguage-Release-1.4.1/src/include/osl_pvt.h	Sun Dec 15 23:13:47 2013
-@@ -33,7 +33,7 @@
- 
- #include "OpenImageIO/dassert.h"
- 
--#include <boost/tr1/memory.hpp>
-+#include <boost/shared_ptr.hpp>
- using std::tr1::shared_ptr;
- 
- 
-diff -ur a/OpenShadingLanguage-Release-1.4.1src/include/oslconfig.h b/OpenShadingLanguage-Release-1.4.1/src/include/oslconfig.h
---- a/OpenShadingLanguage-Release-1.4.1src/include/oslconfig.h	Wed Jan 15 10:39:17 2014
-+++ b/OpenShadingLanguage-Release-1.4.1/src/include/oslconfig.h	Sun Dec 15 23:15:40 2013
-@@ -38,7 +38,7 @@
- 
- // Test if we are using C++11
- #if (__cplusplus >= 201103L)
--#define OSL_USING_CPLUSPLUS11 1
-+//#define OSL_USING_CPLUSPLUS11 1
- #endif
- 
- // Symbol export defines
-diff -ur a/OpenShadingLanguage-Release-1.4.1src/liboslcomp/oslcomp_pvt.h b/OpenShadingLanguage-Release-1.4.1/src/liboslcomp/oslcomp_pvt.h
---- a/OpenShadingLanguage-Release-1.4.1src/liboslcomp/oslcomp_pvt.h	Wed Jan 15 10:39:18 2014

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list