Merge pull request #2 from howetuft/master

OpenImageIO v2.3

3 files changed, 59 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 80caefa2774e..8c7a5f6f3609 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = appleseed-git
 	pkgdesc = Physically-based global illumination rendering engine primarily designed for animation and visual effects (development vesion).
-	pkgver = 2.1.0.beta.r282.g1ba62025b
-	pkgrel = 2
+	pkgver = 2.1.0.beta.r283.g8c894f29d
+	pkgrel = 3
 	epoch = 1
 	url = https://appleseedhq.net
 	arch = i686
@@ -33,6 +33,7 @@ pkgbase = appleseed-git
 	source = oiio_cxx_std_14.patch
 	source = openexr3.patch
 	source = opencolorio1.patch
+	source = openimageio.patch
 	sha256sums = SKIP
 	sha256sums = 8e7d453ced2a58b162b6e8e2ace09916755b70821837b2c7502a3417f03a25a3
 	sha256sums = 87b987f006e45d11cc4dfec2bd37fd2b760fd2bdbf06f48e7d467cbca9b2b301
@@ -40,6 +41,7 @@ pkgbase = appleseed-git
 	sha256sums = 194902d8c32f23155dddd4205ce3744852e0b86fc22e74739ce5ab7bf97924a7
 	sha256sums = b6ed6ca0034a2ec81ecf8f44e11dba7b3469130a3106fcca58318174003e2642
 	sha256sums = 881b53983e24ade13480d2be2cfe10990890286cd9910c14e83284da427a1713
+	sha256sums = e0c1730745e756a85d633ab1dd50c39b1f744b173b50ca38595d4ee9325b5670
 	b2sums = SKIP
 	b2sums = 8461888dc541113700f377379b0e688bdbc6a5b79bfda4c1b061c2e3811a03c43583272862d6b084f092c6bb372c15b31d2a25849b9e2d89d1e3ed657f680846
 	b2sums = 85d278ea12672e44657fbfe8695744508db88cea54dbc93410632b05175c94a5e29e28dfb739ba88ec10a2449ff499484854ba177db03f5e41b24d2b8e6b9328
@@ -47,5 +49,6 @@ pkgbase = appleseed-git
 	b2sums = e999b4aaf4efcb3671de7f197d9ab92fd90cee34aaf879d30f959c88cea55416b0715ce85ce0452203484e4b336aed453ecff9166e12b9da9170101a3118138c
 	b2sums = 9499c09e99fba96958861f1da7833728850c5581cf371a8f6994012288445d8fd24ec3cfe4f9e22a5860c930d91e710ffed9b33ba3cf2d8385ffa1cda4909528
 	b2sums = 6a92e81297d3bdc8c8b77034d9dac1864dd59b106503b6c711fbdd04122ef8374b908054844ec2999ba6a845363afebf566b2769cf306843c8bc017453e54de1
+	b2sums = 316300d0540c16c3bcaf1ea37ee470957c35ff995129dafc28249db4526f07a22b67058fd4abbc685691604716048fef039661ba06f5515fff858f7c16d2906e
 
 pkgname = appleseed-git
diff --git a/PKGBUILD b/PKGBUILD
index 317b52f82c0a..42d6130cc87c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 #_fragment="#branch=2.0.5-beta-maintenance"
 
 pkgname=appleseed-git
-pkgver=2.1.0.beta.r282.g1ba62025b
-pkgrel=2
+pkgver=2.1.0.beta.r283.g8c894f29d
+pkgrel=3
 epoch=1
 pkgdesc="Physically-based global illumination rendering engine primarily designed for animation and visual effects (development vesion)."
 arch=(i686 x86_64)
@@ -23,6 +23,7 @@ source=("${pkgname}::git+https://github.com/appleseedhq/appleseed.git${_fragment
         "oiio_cxx_std_14.patch"
         "openexr3.patch"
         "opencolorio1.patch"
+        "openimageio.patch"
         )
 sha256sums=('SKIP'
             '8e7d453ced2a58b162b6e8e2ace09916755b70821837b2c7502a3417f03a25a3'
@@ -30,21 +31,23 @@ sha256sums=('SKIP'
             '0171eaa9ec499ecf74ac8878dbacfb28f81094e9a7bed46819314613e6ae7133'
             '194902d8c32f23155dddd4205ce3744852e0b86fc22e74739ce5ab7bf97924a7'
             'b6ed6ca0034a2ec81ecf8f44e11dba7b3469130a3106fcca58318174003e2642'
-            '881b53983e24ade13480d2be2cfe10990890286cd9910c14e83284da427a1713')
+            '881b53983e24ade13480d2be2cfe10990890286cd9910c14e83284da427a1713'
+            'e0c1730745e756a85d633ab1dd50c39b1f744b173b50ca38595d4ee9325b5670')
 b2sums=('SKIP'
         '8461888dc541113700f377379b0e688bdbc6a5b79bfda4c1b061c2e3811a03c43583272862d6b084f092c6bb372c15b31d2a25849b9e2d89d1e3ed657f680846'
         '85d278ea12672e44657fbfe8695744508db88cea54dbc93410632b05175c94a5e29e28dfb739ba88ec10a2449ff499484854ba177db03f5e41b24d2b8e6b9328'
         'cc21c08931d4e5060bbf9b8d2732e68eb28edc923e952db09665e2f63a0918e24f6d35f39a2ea2048a6b5ad67833df08bc9a5e1fea065e1df975ca5e40d414f0'
         'e999b4aaf4efcb3671de7f197d9ab92fd90cee34aaf879d30f959c88cea55416b0715ce85ce0452203484e4b336aed453ecff9166e12b9da9170101a3118138c'
         '9499c09e99fba96958861f1da7833728850c5581cf371a8f6994012288445d8fd24ec3cfe4f9e22a5860c930d91e710ffed9b33ba3cf2d8385ffa1cda4909528'
-        '6a92e81297d3bdc8c8b77034d9dac1864dd59b106503b6c711fbdd04122ef8374b908054844ec2999ba6a845363afebf566b2769cf306843c8bc017453e54de1')
+        '6a92e81297d3bdc8c8b77034d9dac1864dd59b106503b6c711fbdd04122ef8374b908054844ec2999ba6a845363afebf566b2769cf306843c8bc017453e54de1'
+        '316300d0540c16c3bcaf1ea37ee470957c35ff995129dafc28249db4526f07a22b67058fd4abbc685691604716048fef039661ba06f5515fff858f7c16d2906e')
 
 pkgver() {
   git -C "${srcdir}/${pkgname}" describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-  git -C "${srcdir}/${pkgname}" apply -v "${srcdir}"/{boost_107400,cmake.extra.install.dirs.remove,osl_1.11.8,oiio_cxx_std_14,open{exr3,colorio1}}.patch
+  git -C "${srcdir}/${pkgname}" apply -v "${srcdir}"/{boost_107400,cmake.extra.install.dirs.remove,osl_1.11.8,oiio_cxx_std_14,open{exr3,colorio1,imageio}}.patch
   sed '/python37/s/37/310/' -i "${srcdir}/${pkgname}"/src/appleseed.python/CMakeLists.txt
 }
 
diff --git a/openimageio.patch b/openimageio.patch
new file mode 100644
index 000000000000..db61057d932f
--- /dev/null
+++ b/openimageio.patch
@@ -0,0 +1,46 @@
+From f90de3f01f7872c754f815287b6eaebd8e4c7fa1 Mon Sep 17 00:00:00 2001
+From: howetuft <howetuft@gmail.com>
+Date: Sun, 13 Mar 2022 19:52:17 +0100
+Subject: [PATCH] OpenImageIO v2.3
+
+---
+ cmake/modules/FindOpenImageIO.cmake                            | 3 ++-
+ .../kernel/rendering/final/texturecontrolledpixelrenderer.cpp  | 1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindOpenImageIO.cmake b/cmake/modules/FindOpenImageIO.cmake
+index 64f6dc48d..0538b89b2 100644
+--- a/cmake/modules/FindOpenImageIO.cmake
++++ b/cmake/modules/FindOpenImageIO.cmake
+@@ -42,6 +42,7 @@ include (FindPackageHandleStandardArgs)
+ find_path (OPENIMAGEIO_INCLUDE_DIR NAMES OpenImageIO/imageio.h)
+ 
+ find_library (OPENIMAGEIO_LIBRARY NAMES OpenImageIO)
++find_library (OPENIMAGEIO_UTIL_LIBRARY NAMES OpenImageIO_Util)
+ 
+ find_program (OPENIMAGEIO_OIIOTOOL NAMES oiiotool)
+ find_program (OPENIMAGEIO_IDIFF NAMES idiff)
+@@ -57,7 +58,7 @@ find_package_handle_standard_args (OPENIMAGEIO DEFAULT_MSG
+ # Set the output variables.
+ if (OPENIMAGEIO_FOUND)
+     set (OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR})
+-    set (OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY})
++    set (OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY} ${OPENIMAGEIO_UTIL_LIBRARY})
+ else ()
+     set (OPENIMAGEIO_INCLUDE_DIRS)
+     set (OPENIMAGEIO_LIBRARIES)
+diff --git a/src/appleseed/renderer/kernel/rendering/final/texturecontrolledpixelrenderer.cpp b/src/appleseed/renderer/kernel/rendering/final/texturecontrolledpixelrenderer.cpp
+index f30fcc911..389b3d909 100644
+--- a/src/appleseed/renderer/kernel/rendering/final/texturecontrolledpixelrenderer.cpp
++++ b/src/appleseed/renderer/kernel/rendering/final/texturecontrolledpixelrenderer.cpp
+@@ -61,6 +61,7 @@
+ #include "foundation/platform/_beginoiioheaders.h"
+ #include "OpenImageIO/imagebufalgo.h"
+ #include "OpenImageIO/typedesc.h"
++#include "OpenImageIO/imagecache.h"
+ #include "foundation/platform/_endoiioheaders.h"
+ 
+ // Standard headers.
+-- 
+2.35.1
+