update image libraries, D3005 with few mods

14 files changed, 62 insertions, 224 deletions

diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt
index 4643c48fa72..1ca102508e1 100644
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -45,6 +45,17 @@ cmake_minimum_required(VERSION 3.5)
 include(ExternalProject)
 include(cmake/options.cmake)
 include(cmake/versions.cmake)
+
+if(ENABLE_MINGW64)
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+		include(cmake/setup_mingw64.cmake)
+	else()
+		include(cmake/setup_mingw32.cmake)
+	endif()
+else()
+	set(mingw_LIBDIR ${LIBDIR})
+endif()
+
 include(cmake/zlib.cmake)
 include(cmake/blendthumb.cmake)
 include(cmake/openal.cmake)
@@ -88,16 +99,6 @@ if(WIN32)
 	include(cmake/hidapi.cmake)
 endif()
 
-if(ENABLE_MINGW64)
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-		include(cmake/setup_mingw64.cmake)
-	else()
-		include(cmake/setup_mingw32.cmake)
-	endif()
-else()
-	set(mingw_LIBDIR ${LIBDIR})
-endif()
-
 if(NOT WIN32 OR ENABLE_MINGW64)
 	include(cmake/openjpeg.cmake)
 	if(BUILD_MODE STREQUAL Release)
@@ -109,8 +110,6 @@ if(NOT WIN32 OR ENABLE_MINGW64)
 		include(cmake/vorbis.cmake)
 		include(cmake/theora.cmake)
 		include(cmake/vpx.cmake)
-		include(cmake/orc.cmake)
-		include(cmake/schroedinger.cmake)
 		include(cmake/x264.cmake)
 		include(cmake/xvidcore.cmake)
 		include(cmake/faad.cmake)
diff --git a/build_files/build_environment/cmake/ffmpeg.cmake b/build_files/build_environment/cmake/ffmpeg.cmake
index 3ea1b282d9a..42504e8120b 100644
--- a/build_files/build_environment/cmake/ffmpeg.cmake
+++ b/build_files/build_environment/cmake/ffmpeg.cmake
@@ -16,10 +16,10 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-set(FFMPEG_CFLAGS "-I${mingw_LIBDIR}/lame/include -I${mingw_LIBDIR}/openjpeg/include/ -I${mingw_LIBDIR}/ogg/include -I${mingw_LIBDIR}/vorbis/include -I${mingw_LIBDIR}/theora/include -I${mingw_LIBDIR}/vpx/include -I${mingw_LIBDIR}/x264/include -I${mingw_LIBDIR}/xvidcore/include -I${mingw_LIBDIR}/dirac/include/dirac -I${mingw_LIBDIR}/schroedinger/include/schroedinger-1.0 -I${mingw_LIBDIR}/zlib/include")
-set(FFMPEG_LDFLAGS "-L${mingw_LIBDIR}/lame/lib -L${mingw_LIBDIR}/openjpeg/lib -L${mingw_LIBDIR}/ogg/lib -L${mingw_LIBDIR}/vorbis/lib -L${mingw_LIBDIR}/theora/lib -L${mingw_LIBDIR}/vpx/lib -L${mingw_LIBDIR}/x264/lib -L${mingw_LIBDIR}/xvidcore/lib -L${mingw_LIBDIR}/dirac/lib -L${mingw_LIBDIR}/schroedinger/lib -L${mingw_LIBDIR}/orc/lib -L${mingw_LIBDIR}/zlib/lib")
+set(FFMPEG_CFLAGS "-I${mingw_LIBDIR}/lame/include -I${mingw_LIBDIR}/openjpeg/include/ -I${mingw_LIBDIR}/ogg/include -I${mingw_LIBDIR}/vorbis/include -I${mingw_LIBDIR}/theora/include -I${mingw_LIBDIR}/vpx/include -I${mingw_LIBDIR}/x264/include -I${mingw_LIBDIR}/xvidcore/include -I${mingw_LIBDIR}/zlib/include")
+set(FFMPEG_LDFLAGS "-L${mingw_LIBDIR}/lame/lib -L${mingw_LIBDIR}/openjpeg/lib -L${mingw_LIBDIR}/ogg/lib -L${mingw_LIBDIR}/vorbis/lib -L${mingw_LIBDIR}/theora/lib -L${mingw_LIBDIR}/vpx/lib -L${mingw_LIBDIR}/x264/lib -L${mingw_LIBDIR}/xvidcore/lib -L${mingw_LIBDIR}/zlib/lib")
 set(FFMPEG_EXTRA_FLAGS --extra-cflags=${FFMPEG_CFLAGS} --extra-ldflags=${FFMPEG_LDFLAGS})
-set(FFMPEG_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/schroedinger/lib/pkgconfig:${mingw_LIBDIR}/orc/lib/pkgconfig:${mingw_LIBDIR}/x264/lib/pkgconfig:${mingw_LIBDIR})
+set(FFMPEG_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/x264/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR})
 
 if(WIN32)
 	set(FFMPEG_ENV set ${FFMPEG_ENV} &&)
@@ -63,7 +63,6 @@ ExternalProject_Add(external_ffmpeg
 		--disable-libspeex
 		--enable-libvpx
 		--prefix=${LIBDIR}/ffmpeg
-		--enable-libschroedinger
 		--enable-libtheora
 		--enable-libvorbis
 		--enable-zlib
@@ -73,7 +72,6 @@ ExternalProject_Add(external_ffmpeg
 		--disable-nonfree
 		--enable-gpl
 		--disable-postproc
-		--disable-x11grab
 		--enable-libmp3lame
 		--disable-librtmp
 		--enable-libx264
@@ -91,7 +89,7 @@ ExternalProject_Add(external_ffmpeg
 		--disable-securetransport
 		--disable-indev=avfoundation
 		--disable-indev=qtkit
-		--disable-sdl
+		--disable-sdl2
 		--disable-gnutls
 		--disable-vda
 		--disable-videotoolbox
@@ -122,7 +120,6 @@ add_dependencies(
 	external_openjpeg
 	external_xvidcore
 	external_x264
-	external_schroedinger
 	external_vpx
 	external_theora
 	external_vorbis
diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake
index 8519d981964..7395490e107 100644
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -236,13 +236,12 @@ harvest(openimageio/bin openimageio/bin "maketx")
 harvest(openimageio/bin openimageio/bin "oiiotool")
 harvest(openimageio/include openimageio/include "*")
 harvest(openimageio/lib openimageio/lib "*.a")
-harvest(openjpeg/include/openjpeg-1.5 openjpeg/include "*.h")
+harvest(openjpeg/include/openjpeg-2.3 openjpeg/include "*.h")
 harvest(openjpeg/lib openjpeg/lib "*.a")
 harvest(opensubdiv/include opensubdiv/include "*.h")
 harvest(opensubdiv/lib opensubdiv/lib "*.a")
 harvest(openvdb/include/openvdb/openvdb openvdb/include/openvdb "*.h")
 harvest(openvdb/lib openvdb/lib "*.a")
-harvest(orc/lib/liborc-0.4.a ffmpeg/lib/liborc.a)
 harvest(osl/bin osl/bin "oslc")
 harvest(osl/include osl/include "*.h")
 harvest(osl/lib osl/lib "*.a")
@@ -252,7 +251,6 @@ harvest(png/lib png/lib "*.a")
 harvest(python/bin python/bin "python${PYTHON_SHORT_VERSION}m")
 harvest(python/include python/include "*h")
 harvest(python/lib python/lib "*")
-harvest(schroedinger/lib/libschroedinger-1.0.a ffmpeg/lib/libschroedinger.a)
 harvest(sdl/include/SDL2 sdl/include "*.h")
 harvest(sdl/lib sdl/lib "libSDL2.a")
 harvest(sndfile/include sndfile/include "*.h")
diff --git a/build_files/build_environment/cmake/jpeg.cmake b/build_files/build_environment/cmake/jpeg.cmake
index 1f2b04387f0..9975bb9c4f6 100644
--- a/build_files/build_environment/cmake/jpeg.cmake
+++ b/build_files/build_environment/cmake/jpeg.cmake
@@ -18,7 +18,7 @@
 
 if(WIN32)
 	# cmake for windows
-	set(JPEG_EXTRA_ARGS  -DWITH_JPEG8=ON  -DCMAKE_DEBUG_POSTFIX=d)
+	set(JPEG_EXTRA_ARGS -DNASM=${NASM_PATH} -DWITH_JPEG8=ON  -DCMAKE_DEBUG_POSTFIX=d)
 
 	ExternalProject_Add(external_jpeg
 		URL ${JPEG_URI}
diff --git a/build_files/build_environment/cmake/openimageio.cmake b/build_files/build_environment/cmake/openimageio.cmake
index fdc71508e47..5e7449fe079 100644
--- a/build_files/build_environment/cmake/openimageio.cmake
+++ b/build_files/build_environment/cmake/openimageio.cmake
@@ -51,8 +51,8 @@ if(MSVC)
 	set(OPENJPEG_FLAGS
 		-DOPENJPEG_HOME=${LIBDIR}/openjpeg_msvc
 		-DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg_msvc/include/openjpeg-${OPENJPEG_SHORT_VERSION}
-		-DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg_msvc/lib/openjpeg${LIBEXT}
-		-DOPENJPEG_LIBRARY_DEBUG=${LIBDIR}/openjpeg_msvc/lib/openjpeg${LIBEXT}
+		-DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg_msvc/lib/openjp2${LIBEXT}
+		-DOPENJPEG_LIBRARY_DEBUG=${LIBDIR}/openjpeg_msvc/lib/openjp2${LIBEXT}
 	)
 else()
 	set(OPENJPEG_FLAGS
diff --git a/build_files/build_environment/cmake/openjpeg.cmake b/build_files/build_environment/cmake/openjpeg.cmake
index 5cc49b1e519..df30783de40 100644
--- a/build_files/build_environment/cmake/openjpeg.cmake
+++ b/build_files/build_environment/cmake/openjpeg.cmake
@@ -58,7 +58,7 @@ if(MSVC)
 	endif()
 endif()
 
-set(OPENJPEG_LIBRARY libopenjpeg${LIBEXT})
+set(OPENJPEG_LIBRARY libopenjp2${LIBEXT})
 if(MSVC)
 	set_target_properties(external_openjpeg PROPERTIES FOLDER Mingw)
 endif()
diff --git a/build_files/build_environment/cmake/orc.cmake b/build_files/build_environment/cmake/orc.cmake
deleted file mode 100644
index aac7884f49e..00000000000
--- a/build_files/build_environment/cmake/orc.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-ExternalProject_Add(external_orc
-	URL ${ORC_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH SHA256=${ORC_HASH}
-	PREFIX ${BUILD_DIR}/orc
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/orc/src/external_orc/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/orc --disable-shared --enable-static
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/orc/src/external_orc/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/orc/src/external_orc/ && make install
-	INSTALL_DIR ${LIBDIR}/orc
-)
-
-if(MSVC)
-	set_target_properties(external_orc PROPERTIES FOLDER Mingw)
-endif()
diff --git a/build_files/build_environment/cmake/schroedinger.cmake b/build_files/build_environment/cmake/schroedinger.cmake
deleted file mode 100644
index 80bf84b06d7..00000000000
--- a/build_files/build_environment/cmake/schroedinger.cmake
+++ /dev/null
@@ -1,48 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-if(WIN32)
-	set(SCHROEDINGER_EXTRA_FLAGS "CFLAGS=-g -I./ -I${LIBDIR}/orc/include/orc-0.4" "LDFLAGS=-Wl,--as-needed -static-libgcc -L${LIBDIR}/orc/lib" ORC_CFLAGS=-I${LIBDIR}/orc/include/orc-0.4 ORC_LDFLAGS=-L${LIBDIR}/orc/lib ORC_LIBS=${LIBDIR}/orc/lib/liborc-0.4.a ORCC=${LIBDIR}/orc/bin/orcc.exe)
-else()
-	set(SCHROEDINGER_CFLAGS "${PLATFORM_CFLAGS} -I./ -I${LIBDIR}/orc/include/orc-0.4")
-	set(SCHROEDINGER_LDFLAGS "${PLATFORM_LDFLAGS} -L${LIBDIR}/orc/lib")
-	set(SCHROEDINGER_EXTRA_FLAGS CFLAGS=${SCHROEDINGER_CFLAGS} LDFLAGS=${SCHROEDINGER_LDFLAGS} ORC_CFLAGS=-I${LIBDIR}/orc/include/orc-0.4 ORC_LDFLAGS=-L${LIBDIR}/orc/lib ORCC=${LIBDIR}/orc/bin/orcc) # ORC_LIBS=${LIBDIR}/orc/lib/liborc-0.4.a
-endif()
-
-ExternalProject_Add(external_schroedinger
-	URL ${SCHROEDINGER_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH SHA256=${SCHROEDINGER_HASH}
-	PREFIX ${BUILD_DIR}/schroedinger
-	PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/schroedinger/src/external_schroedinger < ${PATCH_DIR}/schroedinger.diff
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
-		cd ${BUILD_DIR}/schroedinger/src/external_schroedinger/ &&
-		${CONFIGURE_COMMAND} --prefix=${LIBDIR}/schroedinger --disable-shared --enable-static ${SCHROEDINGER_EXTRA_FLAGS}
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/schroedinger/src/external_schroedinger/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/schroedinger/src/external_schroedinger/ && make install
-	INSTALL_DIR ${LIBDIR}/schroedinger
-)
-
-add_dependencies(
-	external_schroedinger
-	external_orc
-)
-
-if(MSVC)
-	set_target_properties(external_schroedinger PROPERTIES FOLDER Mingw)
-endif()
diff --git a/build_files/build_environment/cmake/setup_mingw32.cmake b/build_files/build_environment/cmake/setup_mingw32.cmake
index 96221bb5e10..b3df59f93c8 100644
--- a/build_files/build_environment/cmake/setup_mingw32.cmake
+++ b/build_files/build_environment/cmake/setup_mingw32.cmake
@@ -78,24 +78,24 @@ if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/pkg-config.exe") AND (EXISTS "
 endif()
 
 message("Checking for nasm")
-if(NOT EXISTS "${DOWNLOAD_DIR}/nasm-2.12.01-win32.zip")
+if(NOT EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip")
 	message("Downloading nasm")
-	file(DOWNLOAD "http://www.nasm.us/pub/nasm/releasebuilds/2.12.01/win32/nasm-2.12.01-win32.zip" "${DOWNLOAD_DIR}/nasm-2.12.01-win32.zip")
+	file(DOWNLOAD "http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/win32/nasm-2.13.02-win32.zip" "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip")
 endif()
 
 # extract nasm
-if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe") AND (EXISTS "${DOWNLOAD_DIR}/nasm-2.12.01-win32.zip"))
+if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe") AND (EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip"))
 	message("Extracting nasm")
 	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/nasm-2.12.01-win32.zip"
+		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip"
 		WORKING_DIRECTORY ${DOWNLOAD_DIR}/
 	)
 	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/nasm-2.12.01/nasm.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/nasm-2.13.02/nasm.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe"
 	)
 
 endif()
-
+SET(NASM_PATH ${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe)
 message("Checking for mingwGet")
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
 	message("Downloading mingw-get")
diff --git a/build_files/build_environment/cmake/setup_mingw64.cmake b/build_files/build_environment/cmake/setup_mingw64.cmake
index 9a45051ebf6..fbc0c91404c 100644
--- a/build_files/build_environment/cmake/setup_mingw64.cmake
+++ b/build_files/build_environment/cmake/setup_mingw64.cmake
@@ -78,23 +78,24 @@ if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/pkg-config.exe") AND (EXISTS "
 endif()
 
 message("Checking for nasm")
-if(NOT EXISTS "${DOWNLOAD_DIR}/nasm-2.12.01-win64.zip")
+if(NOT EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win64.zip")
 	message("Downloading nasm")
-	file(DOWNLOAD "http://www.nasm.us/pub/nasm/releasebuilds/2.12.01/win64/nasm-2.12.01-win64.zip" "${DOWNLOAD_DIR}/nasm-2.12.01-win64.zip")
+	file(DOWNLOAD "http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/win64/nasm-2.13.02-win64.zip" "${DOWNLOAD_DIR}/nasm-2.13.02-win64.zip")
 endif()
 
 # extract nasm
-if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/nasm.exe") AND (EXISTS "${DOWNLOAD_DIR}/nasm-2.12.01-win64.zip"))
+if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/nasm.exe") AND (EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win64.zip"))
 	message("Extracting nasm")
 	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/nasm-2.12.01-win64.zip"
+		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/nasm-2.13.02-win64.zip"
 		WORKING_DIRECTORY ${DOWNLOAD_DIR}/
 	)
 	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/nasm-2.12.01/nasm.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/nasm.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/nasm-2.13.02/nasm.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/nasm.exe"
 	)
 
 endif()
+SET(NASM_PATH ${DOWNLOAD_DIR}/mingw/mingw64/bin/nasm.exe)
 
 message("Checking for mingwGet")
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index eefc751a7a4..36d58090c75 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -24,13 +24,13 @@ set(OPENAL_VERSION 1.17.2)
 set(OPENAL_URI http://kcat.strangesoft.net/openal-releases/openal-soft-${OPENAL_VERSION}.tar.bz2)
 set(OPENAL_HASH 1764e0d8fec499589b47ebc724e0913d)
 
-set(PNG_VERSION 1.6.21)
-set(PNG_URI http://prdownloads.sourceforge.net/libpng/libpng-${PNG_VERSION}.tar.gz)
-set(PNG_HASH aca36ec8e0a3b406a5912243bc243717)
+set(PNG_VERSION 1.6.35)
+set(PNG_URI http://prdownloads.sourceforge.net/libpng/libpng-${PNG_VERSION}.tar.xz)
+set(PNG_HASH 678b7e696a62a193ed3503b04bf449d6)
 
-set(JPEG_VERSION 1.4.2)
+set(JPEG_VERSION 1.5.3)
 set(JPEG_URI https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${JPEG_VERSION}.tar.gz)
-set(JPEG_HASH f9804884c1c41eb7f4febb9353a2cb27)
+set(JPEG_HASH 5b7549d440b86c98a517355c102d155e)
 
 set(BOOST_VERSION 1.68.0)
 set(BOOST_VERSION_NODOTS 1_68_0)
@@ -45,13 +45,13 @@ set(PTHREADS_VERSION 2-9-1)
 set(PTHREADS_URI ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-${PTHREADS_VERSION}-release.tar.gz)
 set(PTHREADS_SHA512 9c06e85310766834370c3dceb83faafd397da18a32411ca7645c8eb6b9495fea54ca2872f4a3e8d83cb5fdc5dea7f3f0464be5bb9af3222a6534574a184bd551)
 
-set(ILMBASE_VERSION 2.2.0)
+set(ILMBASE_VERSION 2.2.1)
 set(ILMBASE_URI http://download.savannah.nongnu.org/releases/openexr/ilmbase-${ILMBASE_VERSION}.tar.gz)
-set(ILMBASE_HASH b540db502c5fa42078249f43d18a4652)
+set(ILMBASE_HASH 7b86128b04f0541b6bb33633e299cb44)
 
-set(OPENEXR_VERSION 2.2.0)
-set(OPENEXR_URI http://download.savannah.nongnu.org/releases/openexr/openexr-2.2.0.tar.gz)
-set(OPENEXR_HASH b64e931c82aa3790329c21418373db4e)
+set(OPENEXR_VERSION 2.2.1)
+set(OPENEXR_URI http://download.savannah.nongnu.org/releases/openexr/openexr-${OPENEXR_VERSION}.tar.gz)
+set(OPENEXR_HASH 421815c32989e1b98fc4798ee754c433)
 
 set(FREETYPE_VERSION 291)
 set(FREETYPE_URI http://download.savannah.gnu.org/releases/freetype/ft${FREETYPE_VERSION}.zip)
@@ -122,9 +122,9 @@ set(OPENIMAGEIO_HASH_1715 e2ece0f62c013d64c478f82265988b0b)
 set(OPENIMAGEIO_HASH ${OPENIMAGEIO_HASH_1715})
 
 
-set(TIFF_VERSION 4.0.6)
+set(TIFF_VERSION 4.0.9)
 set(TIFF_URI http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz)
-set(TIFF_HASH d1d2e940dea0b5ad435f21f03d96dd72)
+set(TIFF_HASH 54bad211279cc93eb4fca31ba9bfdc79)
 
 set(FLEXBISON_VERSION 2.5.5)
 set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison//win_flex_bison-2.5.5.zip)
@@ -190,14 +190,6 @@ set(VPX_VERSION 1.5.0)
 set(VPX_URI http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-${VPX_VERSION}.tar.bz2)
 set(VPX_HASH 306d67908625675f8e188d37a81fbfafdf5068b09d9aa52702b6fbe601c76797)
 
-set(ORC_VERSION 0.4.25)
-set(ORC_URI https://gstreamer.freedesktop.org/src/orc/orc-${ORC_VERSION}.tar.xz)
-set(ORC_HASH c1b1d54a58f26d483f0b3881538984789fe5d5460ab8fab74a1cacbd3d1c53d1)
-
-set(SCHROEDINGER_VERSION 1.0.11)
-set(SCHROEDINGER_URI https://download.videolan.org/contrib/schroedinger/schroedinger-${SCHROEDINGER_VERSION}.tar.gz)
-set(SCHROEDINGER_HASH 1e572a0735b92aca5746c4528f9bebd35aa0ccf8619b22fa2756137a8cc9f912)
-
 set(X264_URI http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20160401-2245-stable.tar.bz2)
 set(X264_HASH 1e9a7b835e80313aade53a9b6ff353e099de3856bf5f30a4d8dfc91281f786f5)
 
@@ -206,18 +198,19 @@ set(XVIDCORE_URI http://downloads.xvid.org/downloads/xvidcore-${XVIDCORE_VERSION
 set(XVIDCORE_HASH 4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f)
 
 #this has to be in sync with the version in blenders /extern folder
-set(OPENJPEG_VERSION 1.5.2)
-set(OPENJPEG_SHORT_VERSION 1.5)
-set(OPENJPEG_URI https://github.com/uclouvain/openjpeg/archive/version.${OPENJPEG_VERSION}.tar.gz)
-set(OPENJPEG_HASH 3734e95edd0bef6e056815591755efd822228dc3cd866894e00a2c929026b16d)
+set(OPENJPEG_VERSION 2.3.0)
+set(OPENJPEG_SHORT_VERSION 2.3)
+# Use slightly newer commit after release which includes a cmake fix
+set(OPENJPEG_URI https://github.com/uclouvain/openjpeg/archive/66297f07a43.zip)
+set(OPENJPEG_HASH 8242b18d908c7c42174e4231a741cfa7ce7c26b6ed5c9644feb9df7b3054310b)
 
 set(FAAD_VERSION 2-2.7)
 set(FAAD_URI http://downloads.sourceforge.net/faac/faad${FAAD_VERSION}.tar.bz2)
 set(FAAD_HASH 4c332fa23febc0e4648064685a3d4332)
 
-set(FFMPEG_VERSION 3.2.1)
+set(FFMPEG_VERSION 3.4.1)
 set(FFMPEG_URI http://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2)
-set(FFMPEG_HASH cede174178e61f882844f5870c35ce72)
+set(FFMPEG_HASH bbf3fcded80c33968c91bf323a744286)
 
 set(FFTW_VERSION 3.3.4)
 set(FFTW_URI http://www.fftw.org/fftw-${FFTW_VERSION}.tar.gz)
@@ -243,9 +236,9 @@ set(HIDAPI_UID 89a6c75dc6f45ecabd4ddfbd2bf5ba6ad8ba38b5)
 set(HIDAPI_URI https://github.com/TheOnlyJoey/hidapi/archive/${HIDAPI_UID}.zip)
 set(HIDAPI_HASH b6e22f6b514f8bcf594989f20ffc46fb)
 
-set(WEBP_VERSION 0.5.1)
+set(WEBP_VERSION 0.6.1)
 set(WEBP_URI https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz)
-set(WEBP_HASH 3d7db92ebba5b4f679413d25c6040881)
+set(WEBP_HASH b49ce9c3e3e9acae4d91bca44bb85a72)
 
 set(SPNAV_VERSION 0.2.3)
 set(SPNAV_URI http://downloads.sourceforge.net/project/spacenav/spacenav%20library%20%28SDK%29/libspnav%20${SPNAV_VERSION}/libspnav-${SPNAV_VERSION}.tar.gz)
diff --git a/build_files/build_environment/patches/ffmpeg.diff b/build_files/build_environment/patches/ffmpeg.diff
index 75fc6490031..6e925399c95 100644
--- a/build_files/build_environment/patches/ffmpeg.diff
+++ b/build_files/build_environment/patches/ffmpeg.diff
@@ -1,32 +1,11 @@
---- libavutil/common.h	2016-02-14 19:29:42 -0700
-+++ libavutil/common.h	2016-03-30 09:50:29 -0600
-@@ -99,6 +99,11 @@
- #define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
- #define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
- 
-+//msvc helper
-+#ifdef _MSC_VER
-+#define inline __inline
-+#endif
-+
- /* misc math functions */
- 
- #ifdef HAVE_AV_CONFIG_H
 --- configure	2016-11-26 03:12:05.000000000 +0100
 +++ configure	2017-04-05 03:24:35.000000000 +0200
-@@ -1899,7 +1899,6 @@
-     access
-     aligned_malloc
-     arc4random
--    clock_gettime
-     closesocket
-     CommandLineToArgvW
-     CoTaskMemFree
-@@ -5494,7 +5493,6 @@
+@@ -5494,7 +5493,5 @@
  
  check_func  access
  check_func_headers stdlib.h arc4random
--check_func_headers time.h clock_gettime || { check_func_headers time.h clock_gettime -lrt && add_extralibs -lrt && LIBRT="-lrt"; }
+-check_func_headers time.h clock_gettime ||
+-    { check_lib clock_gettime time.h clock_gettime -lrt && LIBRT="-lrt"; }
  check_func  fcntl
  check_func  fork
  check_func  gethrtime
diff --git a/build_files/build_environment/patches/schroedinger.diff b/build_files/build_environment/patches/schroedinger.diff
deleted file mode 100644
index 6acb35f2a7b..00000000000
--- a/build_files/build_environment/patches/schroedinger.diff
+++ /dev/null
@@ -1,54 +0,0 @@
---- configure.orig	2012-01-22 19:06:43 -0700
-+++ configure	2016-04-06 20:00:50 -0600
-@@ -16492,10 +16492,10 @@
- 	HAVE_ORC=yes
- fi
- if test "x${HAVE_ORC}" != xyes ; then
--  as_fn_error $? "orc-0.4 >= $ORC_VER is required" "$LINENO" 5
-+  $as_echo "orc-0.4 >= $ORC_VER is required" 
- fi
- SCHRO_PKG_DEPS="$SCHRO_PKG_DEPS orc-0.4 >= $ORC_VER"
--ORCC=`$PKG_CONFIG --variable=orcc orc-0.4`
-+#ORCC=`$PKG_CONFIG --variable=orcc orc-0.4`
- 
-  if test "x$cross_compiling" != xyes; then
-   HAVE_ORCC_TRUE=
---- Makefile.in	2012-01-22 18:06:42 -0700
-+++ Makefile.in	2016-04-06 20:30:09 -0600
-@@ -291,7 +291,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign
--SUBDIRS = schroedinger doc tools testsuite
-+SUBDIRS = schroedinger doc tools 
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
- DIST_SUBDIRS = schroedinger doc tools testsuite
- EXTRA_DIST = COPYING COPYING.GPL COPYING.LGPL COPYING.MIT COPYING.MPL \
-
---- schroedinger.pc.in  2011-03-21 17:08:39 -0600
-+++ schroedinger.pc.in  2016-04-08 13:30:42 -0600
-@@ -7,9 +7,9 @@
-
- Name: schroedinger-@SCHRO_MAJORMINOR@
- Description: Dirac codec library
--Requires.private: @SCHRO_PKG_DEPS@
-+Requires: @SCHRO_PKG_DEPS@
- Version: @VERSION@
--Libs: -L${libdir} -lschroedinger-@SCHRO_MAJORMINOR@
-+Libs: -L${libdir} -lschroedinger-@SCHRO_MAJORMINOR@ -lorc-0.4
- Libs.private: @PTHREAD_LIBS@ @LIBM@
- Cflags: -I${includedir}
- 
---- ./schroedinger/schrodecoder.c	2012-01-23 00:38:57.000000000 +0100
-+++ ./schroedinger/schrodecoder.c	2016-05-15 06:07:24.000000000 +0200
-@@ -70,8 +70,8 @@
- };
- 
- 
--int _schro_decode_prediction_only;
--int _schro_telemetry;
-+int _schro_decode_prediction_only = 0;
-+int _schro_telemetry = 0;
- 
- static void schro_decoder_x_decode_motion (SchroAsyncStage * stage);
- static void schro_decoder_x_render_motion (SchroAsyncStage * stage);
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index 93d7220c884..faed0cf25fc 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -159,7 +159,10 @@ if(WITH_CODEC_FFMPEG)
 	set(FFMPEG_LIBRARIES
 		avcodec avdevice avformat avutil
 		mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg
-	)
+		)
+	      # commenting out until libs are updated on svn. schroedinger and orc
+	      # will be removed then
+	      #	set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} vpx webp swresample)
 	set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} schroedinger orc vpx webp swresample)
 	set(FFMPEG_LIBPATH ${FFMPEG}/lib)
 endif()
@@ -169,6 +172,8 @@ if(WITH_IMAGE_OPENJPEG OR WITH_CODEC_FFMPEG)
 	set(OPENJPEG ${LIBDIR}/openjpeg)
 	set(WITH_SYSTEM_OPENJPEG ON)
 	set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG}/include)
+	# same as with ffmpeg libs, update when svn are updated
+	#set(OPENJPEG_LIBRARIES ${OPENJPEG}/lib/libopenjp2.a)
 	set(OPENJPEG_LIBRARIES ${OPENJPEG}/lib/libopenjpeg.a)
 endif()