[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61383] trunk/lib/ darwin-9.x.universal/osl/osx_osl_compile.patch: OSX: update osl/llvm/ oiio complex: update osl patch

[jens verwiebe]

Revision: 61383
          https://developer.blender.org/rBL61383
Author:   jensverwiebe
Date:     2014-07-25 08:16:06 +0000 (Fri, 25 Jul 2014)
Log Message:
-----------
OSX: update osl/llvm/oiio complex: update osl patch

Modified Paths:
--------------
    trunk/lib/darwin-9.x.universal/osl/osx_osl_compile.patch

Modified: trunk/lib/darwin-9.x.universal/osl/osx_osl_compile.patch
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/osx_osl_compile.patch	2014-07-25 08:14:23 UTC (rev 61382)
+++ trunk/lib/darwin-9.x.universal/osl/osx_osl_compile.patch	2014-07-25 08:16:06 UTC (rev 61383)
@@ -1,38 +1,38 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6f4bcc9..878eb41 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -12,6 +12,39 @@ set (OSO_FILE_VERSION_MINOR 0)
- set (BUILDSTATIC OFF CACHE BOOL "Build static library instead of shared")
- set (LINKSTATIC OFF CACHE BOOL "Link with static external libraries when possible")
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cc1520e..6cab1fa 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,10 +10,50 @@ set (OSL_LIBRARY_VERSION_RELEASE_TYPE "dev")   # "dev", "betaX", "RCY", ""
+ set (OSO_FILE_VERSION_MAJOR 1)
+ set (OSO_FILE_VERSION_MINOR 0)
  
-+set(OPENIMAGEIOHOME "${CMAKE_SOURCE_DIR}/../../openimageio")
-+set(ILMBASE_HOME "${CMAKE_SOURCE_DIR}/../../openexr")
-+set(BOOST_ROOT "${CMAKE_SOURCE_DIR}/../../boost")
-+set(OPENEXR_HOME "${CMAKE_SOURCE_DIR}/../../openexr")
-+set(LLVM_DIRECTORY "${CMAKE_SOURCE_DIR}/../../llvm")
++set(OPENIMAGEIOHOME "${CMAKE_SOURCE_DIR}/../openimageio")
++set(ILMBASE_HOME "${CMAKE_SOURCE_DIR}/../openexr")
++set(BOOST_ROOT "${CMAKE_SOURCE_DIR}/../boost")
++set(OPENEXR_HOME "${CMAKE_SOURCE_DIR}/../openexr")
++set(LLVM_DIRECTORY "${CMAKE_SOURCE_DIR}/../llvm")
 +set(LLVM_STATIC YES)
-+set(TBB_INCLUDES "${CMAKE_SOURCE_DIR}/../../openimageio/include/OpenImageIO")
-+set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/../../osl" CACHE PATH "" FORCE)
-+set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE)
-+set(CMAKE_OSX_ARCHITECTURES "x86_64; i386" CACHE STRING "" FORCE)
++#set(TBB_INCLUDES "${CMAKE_SOURCE_DIR}/openimageio/include/OpenImageIO") # removed in oiio !
++set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/../osl" CACHE PATH "" FORCE)
++set(CMAKE_OSX_DEPLOYMENT_TARGET "10.6" CACHE STRING "" FORCE)
++set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "" FORCE)
 +set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
 +
 +# extern libs that could not be linked to static oiio
 +add_library(imp_oiio STATIC IMPORTED)
-+set_property(TARGET imp_oiio PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../openimageio/lib/libopenimageio.a)
++set_property(TARGET imp_oiio PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../openimageio/lib/libopenimageio.a)
 +
 +add_library(imp_tiff STATIC IMPORTED)
-+set_property(TARGET imp_tiff PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../tiff/lib/libtiff.a)
++set_property(TARGET imp_tiff PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../tiff/lib/libtiff.a)
 +
 +add_library(imp_png STATIC IMPORTED)
-+set_property(TARGET imp_png PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../png/lib/libpng12.a)
++set_property(TARGET imp_png PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../png/lib/libpng12.a)
 +
 +add_library(imp_jpeg STATIC IMPORTED)
-+set_property(TARGET imp_jpeg PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../jpeg/lib/libjpeg.a)
++set_property(TARGET imp_jpeg PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../jpeg/lib/libjpeg.a)
 +
 +add_library(imp_imf STATIC IMPORTED)
-+set_property(TARGET imp_imf PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../openexr/lib/libIlmImf.a )
++set_property(TARGET imp_imf PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../openexr/lib/libIlmImf.a )
 +
 +add_library(imp_z STATIC IMPORTED)
 +set_property(TARGET imp_z PROPERTY IMPORTED_LOCATION /usr/lib/libz.1.dylib )
@@ -39,27 +39,28 @@
 +
 +set(OIIO_STATIC_EXTRALIBS imp_tiff imp_png imp_jpeg imp_imf imp_z)
 +set(OPENIMAGEIO_LIBRARY imp_oiio ${OIIO_STATIC_EXTRALIBS})
- 
++
  cmake_minimum_required (VERSION 2.6)
  if (NOT CMAKE_VERSION VERSION_LESS 2.8.4)
-@@ -73,6 +106,11 @@ else ()
- 	set ( CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1 /D NDEBUG /GR-" )
- endif()
- 
+     cmake_policy (SET CMP0017 NEW)
+ endif ()
++
 +## Force the deployment target to really work
-+set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.5" )
-+set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.5" )
-+add_definitions ("-mmacosx-version-min=10.5")
++set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.6 -stdlib=libstdc++" ) #  -lncurses when llvm terminfo is active
++set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.6 -stdlib=libstdc++" )
++add_definitions ("-mmacosx-version-min=10.6")
 +
- # For gcc < 4.3, Boost needs some extra help detecting that we've
- # disabled RTTI.
- if (CMAKE_COMPILER_IS_GNUCC AND GCC_VERSION VERSION_LESS 4.3)
-@@ -111,7 +149,7 @@ if (CMAKE_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNUCC)
- endif ()
+ set (CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
+ message (STATUS "Project source dir = ${PROJECT_SOURCE_DIR}")
+ message (STATUS "Project build dir = ${CMAKE_BINARY_DIR}")
+@@ -243,8 +283,8 @@ add_subdirectory (src/liboslexec)
+ add_subdirectory (src/oslc)
+ add_subdirectory (src/shaders)
+ add_subdirectory (src/oslinfo)
+-add_subdirectory (src/testshade)
+-add_subdirectory (src/testrender)
++#add_subdirectory (src/testshade)
++#add_subdirectory (src/testrender)
  
- set (USE_TBB ON CACHE BOOL "Use TBB if needed")
--if (WIN32)
-+if (WIN32 OR APPLE)
-     set (USE_BOOST_WAVE ON CACHE BOOL "Use Boost Wave as preprocessor")
- else ()
-     set (USE_BOOST_WAVE OFF CACHE BOOL "Use Boost Wave as preprocessor")
+ add_subdirectory (src/include)
+ add_subdirectory (src/doc)