Build against opencolorio1

3 files changed, 89 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9553fee469d2..6c8a9d4130cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = blender-2.83-git
 	pkgdesc = LTS Maintenance version of blender-v2.83-release branch
-	pkgver = 2.83.13.r2.gd35974cd870
-	pkgrel = 2
+	pkgver = 2.83.15.r11.ga925c8969d7
+	pkgrel = 1
 	url = https://blender.org/
 	changelog = blender.changelog
 	arch = i686
@@ -26,7 +26,7 @@ pkgbase = blender-2.83-git
 	depends = freetype2
 	depends = libxi
 	depends = openimageio
-	depends = opencolorio
+	depends = opencolorio1
 	depends = openvdb
 	depends = opencollada
 	depends = opensubdiv
@@ -48,6 +48,7 @@ pkgbase = blender-2.83-git
 	source = cpp14.patch::https://git.blender.org/gitweb/gitweb.cgi/blender.git/patch/171c4fb238a2a65291540ac5406187bc69f3a6bc
 	source = python39.patch::https://git.blender.org/gitweb/gitweb.cgi/blender.git/patch/56d0df51a36fdce7ec2d1fbb7b47b1d95b591b5f
 	source = openexr3.patch
+	source = opencolorio1.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -59,6 +60,7 @@ pkgbase = blender-2.83-git
 	sha256sums = 41e745b8fb37464a83dfedc09ff2158369cec09b96fdc855b71001e16b6cbe75
 	sha256sums = 7ae5ac4d636934cd46213e3f29ea67013d17316e122d8f312daec288e4f90cd9
 	sha256sums = 4d7c2db0464287178f0663debb6e00b4e9358cd5833f2a2b025e8be3f541e997
+	sha256sums = c17cb969e67854d2c588de1590f73330cfa44efffd996430e879829b1b6c2065
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
@@ -70,6 +72,6 @@ pkgbase = blender-2.83-git
 	b2sums = 33f4b7e71153b272f0ae3b16c9eabdb65fb275c2344a6454866c660ac9bdf6da1207e75c6f9198c64c52cebeab71f816d2852425596c0cfbcfed0835e64403ff
 	b2sums = 4b11df6d494644e740cfda654fbebb2988c430d18c093739724f331738099100925fd0399b94cf0a1188c4ae804081c8380424b64f35355f7cbfde6c7ee91b44
 	b2sums = 3a3d31deceb2cbe838e5054f43c288a8e8d98aab0f4ae8a67b9bb361a991b355d3c8c680ce6fd6c8efd4e38b387ac3396a67eaaba70f0c4785826d33d86c0fbe
+	b2sums = 325e8fef357b953e023dd6a0f317cd10baffa27233b439560b2188671b39f7ec27c667fce9490b9cb310ba11924d35c921fb8003dad619e8542b0673c7a3eea0
 
 pkgname = blender-2.83-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 3486c975efb1..5e32d1a9c855 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,14 +26,14 @@ _CMAKE_FLAGS+=( -DWITH_ALEMBIC_HDF5=ON )
 ((DISABLE_CUDA)) && optdepends+=('cuda: CUDA support in Cycles') || { makedepends+=('cuda') ; ((DISABLE_OPTIX)) || makedepends+=('optix70'); }
 
 pkgname=blender-${_blenver}-git
-pkgver=2.83.13.r2.gd35974cd870
-pkgrel=2
+pkgver=2.83.15.r11.ga925c8969d7
+pkgrel=1
 pkgdesc="LTS Maintenance version of ${_branch} branch"
 changelog=blender.changelog
 arch=('i686' 'x86_64')
 url="https://blender.org/"
 depends+=('alembic' 'libgl' 'python' 'python-numpy' 'openjpeg2' 'openexr'
-         'ffmpeg' 'fftw' 'openal' 'freetype2' 'libxi' 'openimageio' 'opencolorio'
+         'ffmpeg' 'fftw' 'openal' 'freetype2' 'libxi' 'openimageio' 'opencolorio1'
          'openvdb' 'opencollada' 'opensubdiv' 'openshadinglanguage' 'libtiff' 'libpng')
 depends+=('openimagedenoise')
 makedepends+=('git' 'cmake' 'boost' 'mesa' 'llvm')
@@ -56,6 +56,7 @@ source=("git://git.blender.org/blender.git${_fragment}"
         'cpp14.patch::https://git.blender.org/gitweb/gitweb.cgi/blender.git/patch/171c4fb238a2a65291540ac5406187bc69f3a6bc'
         'python39.patch::https://git.blender.org/gitweb/gitweb.cgi/blender.git/patch/56d0df51a36fdce7ec2d1fbb7b47b1d95b591b5f'
         'openexr3.patch'
+        'opencolorio1.patch'
         )
 sha256sums=('SKIP'
             'SKIP'
@@ -67,7 +68,8 @@ sha256sums=('SKIP'
             '42afe119529a5350034a489225958112bf4b84bdee38757a932e5caaa9bd5ed4'
             '41e745b8fb37464a83dfedc09ff2158369cec09b96fdc855b71001e16b6cbe75'
             '7ae5ac4d636934cd46213e3f29ea67013d17316e122d8f312daec288e4f90cd9'
-            '4d7c2db0464287178f0663debb6e00b4e9358cd5833f2a2b025e8be3f541e997')
+            '4d7c2db0464287178f0663debb6e00b4e9358cd5833f2a2b025e8be3f541e997'
+            'c17cb969e67854d2c588de1590f73330cfa44efffd996430e879829b1b6c2065')
 b2sums=('SKIP'
         'SKIP'
         'SKIP'
@@ -78,7 +80,8 @@ b2sums=('SKIP'
         '62567f79f86684e7fd99b8879b692e862c7ea85317cfacae4539d3035fe3ffc71fd39b0aa385be1efc8c31c8fe9ccac86e4b20275905150540349ba5fe3f8cbb'
         '33f4b7e71153b272f0ae3b16c9eabdb65fb275c2344a6454866c660ac9bdf6da1207e75c6f9198c64c52cebeab71f816d2852425596c0cfbcfed0835e64403ff'
         '4b11df6d494644e740cfda654fbebb2988c430d18c093739724f331738099100925fd0399b94cf0a1188c4ae804081c8380424b64f35355f7cbfde6c7ee91b44'
-        '3a3d31deceb2cbe838e5054f43c288a8e8d98aab0f4ae8a67b9bb361a991b355d3c8c680ce6fd6c8efd4e38b387ac3396a67eaaba70f0c4785826d33d86c0fbe')
+        '3a3d31deceb2cbe838e5054f43c288a8e8d98aab0f4ae8a67b9bb361a991b355d3c8c680ce6fd6c8efd4e38b387ac3396a67eaaba70f0c4785826d33d86c0fbe'
+        '325e8fef357b953e023dd6a0f317cd10baffa27233b439560b2188671b39f7ec27c667fce9490b9cb310ba11924d35c921fb8003dad619e8542b0673c7a3eea0')
 
 pkgver() {
   git -C "$srcdir"/blender describe --long --tags | sed -r 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
@@ -95,7 +98,7 @@ prepare() {
   fi
   ((DISABLE_USD)) || git -C "$srcdir/blender" apply -v "${srcdir}"/usd_python.patch
   ((DISABLE_EMBREE)) || git -C "$srcdir/blender" apply -v "${srcdir}"/embree.patch
-  git -C "$srcdir/blender" apply -v "$srcdir"/{cpp14,python39,openexr3}.patch
+  git -C "$srcdir/blender" apply -v "$srcdir"/{cpp14,python39,openexr3,opencolorio1}.patch
 }
 
 build() {
diff --git a/opencolorio1.patch b/opencolorio1.patch
new file mode 100644
index 000000000000..259d04e8cb71
--- /dev/null
+++ b/opencolorio1.patch
@@ -0,0 +1,74 @@
+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
+@@ -28,7 +28,7 @@ IF(NOT OPENCOLORIO_ROOT_DIR AND NOT $ENV{OPENCOLORIO_ROOT_DIR} STREQUAL "")
+ ENDIF()
+ 
+ SET(_opencolorio_FIND_COMPONENTS
+-  OpenColorIO
++  OpenColorIO1
+   yaml-cpp
+   tinyxml
+ )
+@@ -40,7 +40,7 @@ SET(_opencolorio_SEARCH_DIRS
+ 
+ FIND_PATH(OPENCOLORIO_INCLUDE_DIR
+   NAMES
+-    OpenColorIO/OpenColorIO.h
++    OpenColorIO1/OpenColorIO.h
+   HINTS
+     ${_opencolorio_SEARCH_DIRS}
+   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 @@
+ #  pragma warning(push)
+ #  pragma warning(disable : 4251 4275)
+ #endif
+-#include <OpenColorIO/OpenColorIO.h>
++#include <OpenColorIO1/OpenColorIO.h>
+ #ifdef _MSC_VER
+ #  pragma warning(pop)
+ #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 @@
+ #  pragma warning(push)
+ #  pragma warning(disable : 4251 4275)
+ #endif
+-#include <OpenColorIO/OpenColorIO.h>
++#include <OpenColorIO1/OpenColorIO.h>
+ #ifdef _MSC_VER
+ #  pragma warning(pop)
+ #endif
+diff --git a/intern/cycles/render/colorspace.cpp b/intern/cycles/render/colorspace.cpp
+index 7605fcaf5ff..a491dfdf9d5 100644
+--- a/intern/cycles/render/colorspace.cpp
++++ b/intern/cycles/render/colorspace.cpp
+@@ -25,7 +25,7 @@
+ #include "util/util_vector.h"
+ 
+ #ifdef WITH_OCIO
+-#  include <OpenColorIO/OpenColorIO.h>
++#  include <OpenColorIO1/OpenColorIO.h>
+ namespace OCIO = OCIO_NAMESPACE;
+ #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
+