diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-05-31 22:15:40 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2020-05-31 22:15:40 +0300 |
| commit | 4cb883b6b2119385bbb4d1af050b491a62f52e4a (patch) | |
| tree | cc498293364e36a6464bcb70a207a9730403e465 /build_files/build_environment/patches | |
| parent | 6f1056ae635419245da245e70a0c7d4e6ff26a2f (diff) | |
Deps: Update OIIO + ImageLibs + OSL + Helpers
This is the cluster of OIIO and friends , since they are all kinda tangled best to deal with this as a single unit
OIIO 2.1.15.0
png 1.6.37
jpeg 2.0.4
opencolorio 1.1.1
tiff 4.1.0
OSL 1.10.10
pugixml 1.10
openjpeg 2.3.1
Differential Revision: https://developer.blender.org/D7727
Reviewed by: brecht
Diffstat (limited to 'build_files/build_environment/patches')
4 files changed, 55 insertions, 48 deletions
diff --git a/build_files/build_environment/patches/openimageio.diff b/build_files/build_environment/patches/openimageio.diff new file mode 100644 index 00000000000..d05fc1f295f --- /dev/null +++ b/build_files/build_environment/patches/openimageio.diff @@ -0,0 +1,36 @@ +diff -Naur orig/CMakeLists.txt external_openimageio/CMakeLists.txt +--- orig/CMakeLists.txt 2020-05-10 21:43:52 -0600 ++++ external_openimageio/CMakeLists.txt 2020-05-13 17:03:35 -0600 +@@ -170,7 +170,7 @@ + add_subdirectory (src/iinfo) + add_subdirectory (src/maketx) + add_subdirectory (src/oiiotool) +- add_subdirectory (src/testtex) ++ #add_subdirectory (src/testtex) + add_subdirectory (src/iv) + endif () + +diff -Naur orig/src/cmake/compiler.cmake external_openimageio/src/cmake/compiler.cmake +--- orig/src/cmake/compiler.cmake 2020-05-10 21:43:52 -0600 ++++ external_openimageio/src/cmake/compiler.cmake 2020-05-13 17:02:54 -0600 +@@ -172,6 +172,7 @@ + add_definitions (-D_CRT_NONSTDC_NO_WARNINGS) + add_definitions (-D_SCL_SECURE_NO_WARNINGS) + add_definitions (-DJAS_WIN_MSVC_BUILD) ++ add_definitions (-DOPJ_STATIC) + endif (MSVC) + + if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" +diff -Naur orig/src/include/OpenImageIO/platform.h external_openimageio/src/include/OpenImageIO/platform.h +--- orig/src/include/OpenImageIO/platform.h 2020-05-10 21:43:52 -0600 ++++ external_openimageio/src/include/OpenImageIO/platform.h 2020-05-13 17:04:36 -0600 +@@ -41,6 +41,9 @@ + # ifndef NOMINMAX + # define NOMINMAX + # endif ++# ifndef NOGDI ++# define NOGDI ++# endif + # include <windows.h> + #endif + diff --git a/build_files/build_environment/patches/openimageio_gdi.diff b/build_files/build_environment/patches/openimageio_gdi.diff deleted file mode 100644 index af0c90638de..00000000000 --- a/build_files/build_environment/patches/openimageio_gdi.diff +++ /dev/null @@ -1,26 +0,0 @@ -Index: OpenImageIO/osdep.h -=================================================================== ---- OpenImageIO/osdep.h (revision 61595) -+++ OpenImageIO/osdep.h (working copy) -@@ -34,6 +34,7 @@ - # define WIN32_LEAN_AND_MEAN - # define VC_EXTRALEAN - # define NOMINMAX -+# define NOGDI - # include <windows.h> - #endif - -Index: OpenImageIO/platform.h -=================================================================== ---- OpenImageIO/platform.h (revision 61595) -+++ OpenImageIO/platform.h (working copy) -@@ -77,6 +77,9 @@ - # ifndef NOMINMAX - # define NOMINMAX - # endif -+# ifndef NOGDI -+# define NOGDI -+# endif - # include <windows.h> - #endif - diff --git a/build_files/build_environment/patches/openimageio_static_libs.diff b/build_files/build_environment/patches/openimageio_static_libs.diff deleted file mode 100644 index 6a2e58bd139..00000000000 --- a/build_files/build_environment/patches/openimageio_static_libs.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur external_openimageio.orig/src/cmake/compiler.cmake external_openimageio/src/cmake/compiler.cmake ---- external_openimageio.orig/src/cmake/compiler.cmake 2018-07-31 23:45:19 -0600 -+++ external_openimageio/src/cmake/compiler.cmake 2018-08-16 12:50:12 -0600 -@@ -152,6 +152,7 @@ - add_definitions (-D_CRT_NONSTDC_NO_WARNINGS) - add_definitions (-D_SCL_SECURE_NO_WARNINGS) - add_definitions (-DJAS_WIN_MSVC_BUILD) -+ add_definitions (-DOPJ_STATIC) - endif (MSVC) - - # Use ccache if found ---- external_openimageio.orig/CMakeLists.txt 2018-07-31 23:45:19 -0600 -+++ external_openimageio/CMakeLists.txt 2018-08-17 15:22:56 -0600 -@@ -169,7 +169,7 @@ - add_subdirectory (src/iinfo) - add_subdirectory (src/maketx) - add_subdirectory (src/oiiotool) -- add_subdirectory (src/testtex) -+# add_subdirectory (src/testtex) - add_subdirectory (src/iv) - endif () - diff --git a/build_files/build_environment/patches/osl.diff b/build_files/build_environment/patches/osl.diff index b9b5937ae2b..989800174e2 100644 --- a/build_files/build_environment/patches/osl.diff +++ b/build_files/build_environment/patches/osl.diff @@ -48,3 +48,22 @@ diff -Naur OpenShadingLanguage-Release-1.9.9/src/liboslexec/llvm_util.cpp extern size_t LLVM_Util::total_jit_memory_held () +diff -Naur OpenShadingLanguage-Release-1.9.9/CMakeLists.txt external_osl/CMakeLists.txt + --- orig/CMakeLists.txt 2020-01-27 16:22:31 -0700 ++++ external_osl/CMakeLists.txt 2020-05-13 18:04:52 -0600 +@@ -102,10 +102,11 @@ + set (OPTIX_EXTRA_LIBS CACHE STRING "Extra lib targets needed for OptiX") + set (CUDA_TARGET_ARCH "sm_35" CACHE STRING "CUDA GPU architecture (e.g. sm_35)") + +-# set (USE_OIIO_STATIC ON CACHE BOOL "If OIIO is built static") +-# if (USE_OIIO_STATIC) +-# add_definitions ("-DOIIO_STATIC_BUILD=1") +-# endif () ++set (USE_OIIO_STATIC ON CACHE BOOL "If OIIO is built static") ++if (USE_OIIO_STATIC) ++ add_definitions ("-DOIIO_STATIC_BUILD=1") ++ add_definitions ("-DOIIO_STATIC_DEFINE=1") ++endif () + + set (OSL_NO_DEFAULT_TEXTURESYSTEM OFF CACHE BOOL "Do not use create a raw OIIO::TextureSystem") + if (OSL_NO_DEFAULT_TEXTURESYSTEM)
\ No newline at end of file |