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/openimageio_static_libs.diff | |
| 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/openimageio_static_libs.diff')
| -rw-r--r-- | build_files/build_environment/patches/openimageio_static_libs.diff | 22 |
1 files changed, 0 insertions, 22 deletions
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 () - |