Pin opencolorio1

Fix #4

3 files changed, 56 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index abdd74e04dcc..afcfa88b256d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -23,7 +23,7 @@ pkgbase = blender-fracture_modifier-git
 	depends = freetype2
 	depends = libxi
 	depends = openimageio
-	depends = opencolorio
+	depends = opencolorio1
 	depends = openvdb
 	depends = opencollada
 	depends = opensubdiv
@@ -54,6 +54,7 @@ pkgbase = blender-fracture_modifier-git
 	source = openvdb7.patch
 	source = openvdb8.patch
 	source = openexr3.patch
+	source = opencolorio1.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -75,6 +76,6 @@ pkgbase = blender-fracture_modifier-git
 	sha256sums = c4079c4c142516d9cd476f5a3cafddf4068f0950c3c11ea4da9cf999c5ccc1f9
 	sha256sums = edfd784f8497417660c0b9fdc97893fd0d77764d0bc10f4cb92a9082f41bae75
 	sha256sums = 8e28b28679c67ce589558468d5d912321b345dbbe46c80b359a1a38417ba2ed2
+	sha256sums = b998efa375b868e3beeba54fe070fa73256663f23a86668a04f34ceb626c65ac
 
 pkgname = blender-fracture_modifier-git
-
diff --git a/PKGBUILD b/PKGBUILD
index a64a9c1991be..2d888f4b3ae1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ pkgdesc="Development version of Blenders ${_branch} branch"
 arch=('i686' 'x86_64')
 url="https://blender.org/"
 depends+=('alembic' 'libgl' 'python' 'python-numpy' 'openjpeg2'
-         'ffmpeg' 'fftw' 'openal' 'freetype2' 'libxi' 'openimageio' 'opencolorio'
+         'ffmpeg' 'fftw' 'openal' 'freetype2' 'libxi' 'openimageio' 'opencolorio1'
          'openvdb' 'opencollada' 'opensubdiv' 'openshadinglanguage' 'libtiff' 'libpng')
 makedepends+=('git' 'cmake' 'boost' 'mesa' 'llvm')
 provides=("blender-${_suffix}")
@@ -54,6 +54,7 @@ source=("git://git.blender.org/blender.git${_fragment}"
         openvdb7.patch
         openvdb8.patch # ::https://git.blender.org/gitweb/gitweb.cgi/blender.git/patch/37889011070ff2ec52159690f652238d2b325185
         openexr3.patch
+        opencolorio1.patch
         )
 sha256sums=('SKIP'
             'SKIP'
@@ -75,7 +76,8 @@ sha256sums=('SKIP'
             'b2a2bc5de8d3b730e49d1f50cb025c1dfdbcb66c58ead573322585b6a887d3a7'
             'c4079c4c142516d9cd476f5a3cafddf4068f0950c3c11ea4da9cf999c5ccc1f9'
             'edfd784f8497417660c0b9fdc97893fd0d77764d0bc10f4cb92a9082f41bae75'
-            '8e28b28679c67ce589558468d5d912321b345dbbe46c80b359a1a38417ba2ed2')
+            '8e28b28679c67ce589558468d5d912321b345dbbe46c80b359a1a38417ba2ed2'
+            'b998efa375b868e3beeba54fe070fa73256663f23a86668a04f34ceb626c65ac')
 
 pkgver() {
   blender_version=$(grep -Po "BLENDER_VERSION\s+\K[0-9]{3}" "$srcdir"/blender/source/blender/blenkernel/BKE_blender_version.h)
@@ -96,7 +98,7 @@ prepare() {
   if [[ -v _suffix ]]; then
     git apply -v <(sed "s/@@_suffix@@/${_suffix}/g" "${srcdir}/addon_path.patch")
   fi
-  git -C "$srcdir/blender" apply -v "${srcdir}"/{gcc{8,9},ffmpeg,openvdb{,7,8},collada1668,oiio-2.0,Cleanup-use-PyImport_GetModuleDict,openexr3}.patch
+  git -C "$srcdir/blender" apply -v "${srcdir}"/{gcc{8,9},ffmpeg,openvdb{,7,8},collada1668,oiio-2.0,Cleanup-use-PyImport_GetModuleDict,open{exr3,colorio1}}.patch
   git -C "$srcdir/blender" apply -v "${srcdir}"/python3.{8,9,9_2}.patch
 }
 
diff --git a/opencolorio1.patch b/opencolorio1.patch
new file mode 100644
index 000000000000..676f531b10a4
--- /dev/null
+++ b/opencolorio1.patch
@@ -0,0 +1,48 @@
+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