[Bf-blender-cvs] [62b1393] alembic: Merge branch 'master' into alembic

[Lukas Tönne]

Commit: 62b139385a1a4c59dc966b4ffdfe0c6e1fb92690
Author: Lukas Tönne
Date:   Mon May 4 17:15:00 2015 +0200
Branches: alembic
https://developer.blender.org/rB62b139385a1a4c59dc966b4ffdfe0c6e1fb92690

Merge branch 'master' into alembic

===================================================================



===================================================================

diff --cc CMakeLists.txt
index 4d65520,ea1ca3d..3416a3f
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1137,22 -1127,9 +1137,22 @@@ if(UNIX AND NOT APPLE
  
  	if(WITH_LLVM OR WITH_SDL_DYNLOAD)
  		# Fix for conflict with Mesa llvmpipe
- 		set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,--version-script=${CMAKE_SOURCE_DIR}/source/creator/blender.map")
+ 		set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,--version-script='${CMAKE_SOURCE_DIR}/source/creator/blender.map'")
  	endif()
  
 +	if(WITH_ALEMBIC)
 +		find_package_wrapper(Alembic)
 +		set(ALEMBIC_LIBRARIES ${ALEMBIC_LIBRARIES} ${BOOST_LIBRARIES})
 +		if(NOT ALEMBIC_HDF5_FOUND AND WITH_HDF5)
 +			message(STATUS "Alembic is compiled without HDF5 support, disabling HDF5 options")
 +			set(WITH_HDF5 OFF)
 +		endif()
 +	endif()
 +
 +	if(WITH_HDF5)
 +		find_package_wrapper(HDF5)
 +	endif()
 +
  	# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
  	list(APPEND PLATFORM_LINKLIBS -lutil -lc -lm)
  
diff --cc build_files/build_environment/install_deps.sh
index 56f7206,ea60eb3..ac8fbe3
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@@ -530,12 -510,9 +530,12 @@@ OSL_SOURCE_REPO_UID="22ee5ea298fd215430
  OSL_SOURCE_REPO_BRANCH="blender-fixes"
  
  OPENCOLLADA_SOURCE=( "https://github.com/KhronosGroup/OpenCOLLADA.git" )
- OPENCOLLADA_REPO_UID="18da7f4109a8eafaa290a33f5550501cc4c8bae8"
+ OPENCOLLADA_REPO_UID="3335ac164e68b2512a40914b14c74db260e6ff7d"
  FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" )
  
 +ALEMBIC_SOURCE=( "https://code.google.com/p/alembic/" )
 +ALEMBIC_REPO_UID=( "1_05_05" )
 +
  
  ##### Generic Helpers #####