Pin opencolorio:1

3 files changed, 86 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 68c4b21aaaff..c9d16758a636 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -18,7 +18,7 @@ pkgbase = appleseed
 	depends = boost-libs
 	depends = boost-python2-libs
 	depends = openexr
-	depends = opencolorio
+	depends = opencolorio1
 	depends = openimageio
 	depends = openshadinglanguage
 	depends = xerces-c
@@ -32,6 +32,7 @@ pkgbase = appleseed
 	source = python39.patch
 	source = oiio_cxx_std_14.patch
 	source = openexr3.patch
+	source = opencolorio1.patch
 	sha256sums = 5f8599c64a9c1dbdf0d8ee13a4d395b03e9bcba17fec731526109437ab760898
 	sha256sums = 87b987f006e45d11cc4dfec2bd37fd2b760fd2bdbf06f48e7d467cbca9b2b301
 	sha256sums = 0171eaa9ec499ecf74ac8878dbacfb28f81094e9a7bed46819314613e6ae7133
@@ -39,6 +40,7 @@ pkgbase = appleseed
 	sha256sums = 5e0bffb5a1c1a877abf75c55a5485b2bf6220caa9886ba073e7513cbf4245886
 	sha256sums = 2e619021829cebfa5e5a805c6a38d7946c370e3a1666aab1cacccab8f78f26bc
 	sha256sums = b6ed6ca0034a2ec81ecf8f44e11dba7b3469130a3106fcca58318174003e2642
+	sha256sums = 5265a5918e753c6d9fca38ceae6722ef53e01e23dc3412ee678b6b46b9758d41
 	b2sums = 67005025f46c8fa8ac236e56e8fc3f447bd2e2a9862f8db37015cafeaf4d67536dc01aace81f2683586eced54221284e6cc7d697399f873c4e53de5b0fd59ae0
 	b2sums = 85d278ea12672e44657fbfe8695744508db88cea54dbc93410632b05175c94a5e29e28dfb739ba88ec10a2449ff499484854ba177db03f5e41b24d2b8e6b9328
 	b2sums = cc21c08931d4e5060bbf9b8d2732e68eb28edc923e952db09665e2f63a0918e24f6d35f39a2ea2048a6b5ad67833df08bc9a5e1fea065e1df975ca5e40d414f0
@@ -46,5 +48,6 @@ pkgbase = appleseed
 	b2sums = 115d48a3b570f9b7c1bbd5b38f1b5bdb8ded6b21ccb9c83ccbb305fad00942336b2cfd7ec3674a80a94edec0512d14c9d7ada4eed57a08f8d78ab23b7e636600
 	b2sums = 05909887108da2e7247697048dee9da2a6e50fcabaa55917ea855d31101680f07284274ed85d4a9a2937255d816560fb6cfb77297f4f7f002b25cfd3197a0784
 	b2sums = 9499c09e99fba96958861f1da7833728850c5581cf371a8f6994012288445d8fd24ec3cfe4f9e22a5860c930d91e710ffed9b33ba3cf2d8385ffa1cda4909528
+	b2sums = 84f8ebf2698c1118cd75290570f55a6868bc4e5771be1c97dcf48341cbb6b2c56e55bd96761af0aa4d16acb2c44aca9296e862298ba4c483131a784b1c47deb5
 
 pkgname = appleseed
diff --git a/PKGBUILD b/PKGBUILD
index 657c4372eb94..f7e89dfbc5da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ url="https://appleseedhq.net"
 license=('MIT')
 provides=('appleseed')
 conflicts=('appleseed')
-depends=(python2 python embree qt5-base seexpr-qt5 boost{,-python2}-libs openexr opencolorio openimageio openshadinglanguage xerces-c zlib)
+depends=(python2 python embree qt5-base seexpr-qt5 boost{,-python2}-libs openexr opencolorio1 openimageio openshadinglanguage xerces-c zlib)
 makedepends=(boost{,-python2} cmake ninja)
 options=()
 _github="https://github.com/${pkgname}hq/${pkgname}"
@@ -22,6 +22,7 @@ source=(appleseed_${_pkgver}.tgz::"${_github}/archive/${_pkgver}.tar.gz"
         "python39.patch"
         "oiio_cxx_std_14.patch"
         "openexr3.patch"
+        "opencolorio1.patch"
         )
 sha256sums=('5f8599c64a9c1dbdf0d8ee13a4d395b03e9bcba17fec731526109437ab760898'
             '87b987f006e45d11cc4dfec2bd37fd2b760fd2bdbf06f48e7d467cbca9b2b301'
@@ -29,14 +30,16 @@ sha256sums=('5f8599c64a9c1dbdf0d8ee13a4d395b03e9bcba17fec731526109437ab760898'
             '125d5191b52122434984ccc11a6f2677697a4fee3b9f4571ee0d3742a43a74a4'
             '5e0bffb5a1c1a877abf75c55a5485b2bf6220caa9886ba073e7513cbf4245886'
             '2e619021829cebfa5e5a805c6a38d7946c370e3a1666aab1cacccab8f78f26bc'
-            'b6ed6ca0034a2ec81ecf8f44e11dba7b3469130a3106fcca58318174003e2642')
+            'b6ed6ca0034a2ec81ecf8f44e11dba7b3469130a3106fcca58318174003e2642'
+            '5265a5918e753c6d9fca38ceae6722ef53e01e23dc3412ee678b6b46b9758d41')
 b2sums=('67005025f46c8fa8ac236e56e8fc3f447bd2e2a9862f8db37015cafeaf4d67536dc01aace81f2683586eced54221284e6cc7d697399f873c4e53de5b0fd59ae0'
         '85d278ea12672e44657fbfe8695744508db88cea54dbc93410632b05175c94a5e29e28dfb739ba88ec10a2449ff499484854ba177db03f5e41b24d2b8e6b9328'
         'cc21c08931d4e5060bbf9b8d2732e68eb28edc923e952db09665e2f63a0918e24f6d35f39a2ea2048a6b5ad67833df08bc9a5e1fea065e1df975ca5e40d414f0'
         '74ee6d8ef1d26155ec3775bf9c8793a760939835e8b09d574d0c152ecca90b78e31e8c1de3b576cf13c640131d5ce757c8488ab902439decd5f80b8d511f6251'
         '115d48a3b570f9b7c1bbd5b38f1b5bdb8ded6b21ccb9c83ccbb305fad00942336b2cfd7ec3674a80a94edec0512d14c9d7ada4eed57a08f8d78ab23b7e636600'
         '05909887108da2e7247697048dee9da2a6e50fcabaa55917ea855d31101680f07284274ed85d4a9a2937255d816560fb6cfb77297f4f7f002b25cfd3197a0784'
-        '9499c09e99fba96958861f1da7833728850c5581cf371a8f6994012288445d8fd24ec3cfe4f9e22a5860c930d91e710ffed9b33ba3cf2d8385ffa1cda4909528')
+        '9499c09e99fba96958861f1da7833728850c5581cf371a8f6994012288445d8fd24ec3cfe4f9e22a5860c930d91e710ffed9b33ba3cf2d8385ffa1cda4909528'
+        '84f8ebf2698c1118cd75290570f55a6868bc4e5771be1c97dcf48341cbb6b2c56e55bd96761af0aa4d16acb2c44aca9296e862298ba4c483131a784b1c47deb5')
 
 prepare() {
   for patch in "${srcdir}"/*.patch; do
diff --git a/opencolorio1.patch b/opencolorio1.patch
new file mode 100644
index 000000000000..f48b8f3bf49b
--- /dev/null
+++ b/opencolorio1.patch
@@ -0,0 +1,76 @@
+diff -Naur appleseed-2.1.0-beta/cmake/modules/FindOpenColorIO.cmake appleseed-2.1.0-beta.new/cmake/modules/FindOpenColorIO.cmake
+--- appleseed-2.1.0-beta/cmake/modules/FindOpenColorIO.cmake	2019-08-31 17:49:01.000000000 +0200
++++ appleseed-2.1.0-beta.new/cmake/modules/FindOpenColorIO.cmake	2021-07-12 16:36:39.238864505 +0200
+@@ -35,10 +35,10 @@
+ #  OPENCOLORIO_FOUND        - True if OpenColorIO found.
+ 
+ # Look for the header file.
+-find_path (OPENCOLORIO_INCLUDE_DIR NAMES OpenColorIO/OpenColorIO.h)
++find_path (OPENCOLORIO_INCLUDE_DIR NAMES OpenColorIO1/OpenColorIO.h)
+ 
+ # Look for the library.
+-find_library (OPENCOLORIO_LIBRARY NAMES OpenColorIO)
++find_library (OPENCOLORIO_LIBRARY NAMES OpenColorIO1)
+ 
+ # handle the QUIETLY and REQUIRED arguments and set OPENCOLORIO_FOUND to TRUE if all listed variables are TRUE
+ include (FindPackageHandleStandardArgs)
+diff -Naur appleseed-2.1.0-beta/src/appleseed/foundation/core/thirdparties.cpp appleseed-2.1.0-beta.new/src/appleseed/foundation/core/thirdparties.cpp
+--- appleseed-2.1.0-beta/src/appleseed/foundation/core/thirdparties.cpp	2019-08-31 17:49:01.000000000 +0200
++++ appleseed-2.1.0-beta.new/src/appleseed/foundation/core/thirdparties.cpp	2021-07-12 16:35:36.282710230 +0200
+@@ -49,7 +49,7 @@
+ #include <lz4.h>
+ 
+ // OpenColorIO headers.
+-#include <OpenColorIO/OpenColorABI.h>
++#include <OpenColorIO1/OpenColorABI.h>
+ 
+ // OpenEXR headers.
+ #include "foundation/platform/_beginexrheaders.h"
+diff -Naur appleseed-2.1.0-beta/src/appleseed.studio/mainwindow/mainwindow.h appleseed-2.1.0-beta.new/src/appleseed.studio/mainwindow/mainwindow.h
+--- appleseed-2.1.0-beta/src/appleseed.studio/mainwindow/mainwindow.h	2019-08-31 17:49:01.000000000 +0200
++++ appleseed-2.1.0-beta.new/src/appleseed.studio/mainwindow/mainwindow.h	2021-07-12 16:35:41.269336290 +0200
+@@ -49,7 +49,7 @@
+ #include <QObject>
+ 
+ // OpenColorIO headers.
+-#include <OpenColorIO/OpenColorIO.h>
++#include <OpenColorIO1/OpenColorIO.h>
+ namespace OCIO = OCIO_NAMESPACE;
+ 
+ // Standard headers.
+diff -Naur appleseed-2.1.0-beta/src/appleseed.studio/mainwindow/rendering/rendertab.cpp appleseed-2.1.0-beta.new/src/appleseed.studio/mainwindow/rendering/rendertab.cpp
+--- appleseed-2.1.0-beta/src/appleseed.studio/mainwindow/rendering/rendertab.cpp	2019-08-31 17:49:01.000000000 +0200
++++ appleseed-2.1.0-beta.new/src/appleseed.studio/mainwindow/rendering/rendertab.cpp	2021-07-12 16:35:46.219295996 +0200
+@@ -44,7 +44,7 @@
+ #include "foundation/image/image.h"
+ 
+ // OpenColorIO headers.
+-#include <OpenColorIO/OpenColorIO.h>
++#include <OpenColorIO1/OpenColorIO.h>
+ 
+ // Qt headers.
+ #include <QComboBox>
+diff -Naur appleseed-2.1.0-beta/src/appleseed.studio/mainwindow/rendering/rendertab.h appleseed-2.1.0-beta.new/src/appleseed.studio/mainwindow/rendering/rendertab.h
+--- appleseed-2.1.0-beta/src/appleseed.studio/mainwindow/rendering/rendertab.h	2019-08-31 17:49:01.000000000 +0200
++++ appleseed-2.1.0-beta.new/src/appleseed.studio/mainwindow/rendering/rendertab.h	2021-07-12 16:35:53.395904233 +0200
+@@ -42,7 +42,7 @@
+ #include "utility/widgetzoomhandler.h"
+ 
+ // OpenColorIO headers.
+-#include <OpenColorIO/OpenColorIO.h>
++#include <OpenColorIO1/OpenColorIO.h>
+ namespace OCIO = OCIO_NAMESPACE;
+ 
+ // Qt headers.
+diff -Naur appleseed-2.1.0-beta/src/appleseed.studio/mainwindow/rendering/renderwidget.h appleseed-2.1.0-beta.new/src/appleseed.studio/mainwindow/rendering/renderwidget.h
+--- appleseed-2.1.0-beta/src/appleseed.studio/mainwindow/rendering/renderwidget.h	2019-08-31 17:49:01.000000000 +0200
++++ appleseed-2.1.0-beta.new/src/appleseed.studio/mainwindow/rendering/renderwidget.h	2021-07-12 16:35:58.052532997 +0200
+@@ -38,7 +38,7 @@
+ #include "foundation/math/vector.h"
+ 
+ // OpenColorIO headers.
+-#include <OpenColorIO/OpenColorIO.h>
++#include <OpenColorIO1/OpenColorIO.h>
+ namespace OCIO = OCIO_NAMESPACE;
+ 
+ // Qt headers.