diff options
| author | CYBERDEViL | 2023-12-25 18:38:09 +0100 |
|---|---|---|
| committer | CYBERDEViL | 2023-12-25 18:38:09 +0100 |
| commit | 4b4bd525ed40337fcd05872d641dc3e1c0bf95e2 (patch) | |
| tree | d235a1b42053a521d0fcf89cef913d2e43f7177c /opencolorio1.patch | |
| parent | 67d230f7ca8022b95126b550e47b2b9ea097ba06 (diff) | |
| download | aur-4b4bd525ed40337fcd05872d641dc3e1c0bf95e2.tar.gz | |
New source and patches.
The source of this package (`git.blender.org/blender.git#branch=blender2.7`)
does not exist anymore, Blender moved the repo to
`https://projects.blender.org/blender/blender.git`. There is no branch
`blender2.7` on this new repo, only a `v2.79b` tag which is a different source.
As the new source I choose the 2.79b source tarball from Blender. Patches to
keep Blender 2.79b up-to-date with modern compiler and libs where mostly
derived from Blender upstream commits/code.
Diffstat (limited to 'opencolorio1.patch')
| -rw-r--r-- | opencolorio1.patch | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/opencolorio1.patch b/opencolorio1.patch index 89fbbd65455d..7e52cd057d3b 100644 --- a/opencolorio1.patch +++ b/opencolorio1.patch @@ -1,7 +1,7 @@ diff --git a/build_files/cmake/Modules/FindOpenColorIO.cmake b/build_files/cmake/Modules/FindOpenColorIO.cmake index 090032e06ec..f5db181d73d 100644 ---- a/build_files/cmake/Modules/FindOpenColorIO.cmake -+++ b/build_files/cmake/Modules/FindOpenColorIO.cmake +--- a/blender-2.79b/build_files/cmake/Modules/FindOpenColorIO.cmake ++++ b/blender-2.79b/build_files/cmake/Modules/FindOpenColorIO.cmake @@ -28,7 +28,7 @@ IF(NOT OPENCOLORIO_ROOT_DIR AND NOT $ENV{OPENCOLORIO_ROOT_DIR} STREQUAL "") ENDIF() @@ -11,7 +11,7 @@ index 090032e06ec..f5db181d73d 100644 yaml-cpp tinyxml ) -@@ -40,7 +40,7 @@ SET(_opencolorio_SEARCH_DIRS +@@ -44,7 +44,7 @@ SET(_opencolorio_SEARCH_DIRS FIND_PATH(OPENCOLORIO_INCLUDE_DIR NAMES @@ -22,9 +22,9 @@ index 090032e06ec..f5db181d73d 100644 PATH_SUFFIXES diff --git a/intern/opencolorio/ocio_impl.cc b/intern/opencolorio/ocio_impl.cc index 0e25c89f5d7..f1f99de4bd8 100644 ---- a/intern/opencolorio/ocio_impl.cc -+++ b/intern/opencolorio/ocio_impl.cc -@@ -26,7 +26,7 @@ +--- a/blender-2.79b/intern/opencolorio/ocio_impl.cc ++++ b/blender-2.79b/intern/opencolorio/ocio_impl.cc +@@ -33,7 +33,7 @@ # pragma warning(push) # pragma warning(disable : 4251 4275) #endif @@ -35,9 +35,9 @@ index 0e25c89f5d7..f1f99de4bd8 100644 #endif diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc index df6adc8f34b..24d1ec8a871 100644 ---- a/intern/opencolorio/ocio_impl_glsl.cc -+++ b/intern/opencolorio/ocio_impl_glsl.cc -@@ -40,7 +40,7 @@ +--- a/blender-2.79b/intern/opencolorio/ocio_impl_glsl.cc ++++ b/blender-2.79b/intern/opencolorio/ocio_impl_glsl.cc +@@ -43,7 +43,7 @@ # pragma warning(push) # pragma warning(disable : 4251 4275) #endif @@ -46,16 +46,4 @@ index df6adc8f34b..24d1ec8a871 100644 #ifdef _MSC_VER # pragma warning(pop) #endif -diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp -index 8403a636e1c..54abe4cfa3c 100644 ---- a/intern/cycles/render/shader.cpp -+++ b/intern/cycles/render/shader.cpp -@@ -35,7 +35,7 @@ - #include "util/util_murmurhash.h" - - #ifdef WITH_OCIO --# include <OpenColorIO/OpenColorIO.h> -+# include <OpenColorIO1/OpenColorIO.h> - namespace OCIO = OCIO_NAMESPACE; - #endif - + |