Fixes

16 files changed, 346 insertions, 224 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7ce58a29da0a..b171a7a604ef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = luxcorerender
 	pkgdesc = Physically correct, unbiased rendering engine.
 	pkgver = 2.6
-	pkgrel = 3
+	pkgrel = 4
 	epoch = 2
 	url = https://www.luxcorerender.org/
 	arch = x86_64
@@ -28,40 +28,43 @@ pkgbase = luxcorerender
 	optdepends = pyside2: for pyluxcoretools gui
 	provides = luxrays
 	source = https://github.com/LuxCoreRender/LuxCore/archive/luxcorerender_v2.6.tar.gz
-	source = 01-glfw.patch
-	source = 02-boost107400.patch
-	source = 03-python.patch
-	source = 04-cpplib.patch
-	source = 05-clang-isnan-isinf.patch
-	source = 06-openexr3.patch
-	source = 07-silence-compiler-warnings.patch
-	source = 08-silence-preprocessing.patch
-	source = 09-openvdb.patch
-	source = 10-spdlog.patch
-	source = 11-openimageio.patch
+	source = 0001-glfw.patch
+	source = 0002-boost107400.patch
+	source = 0003-python.patch
+	source = 0004-cpplib.patch
+	source = 0005-clang-isnan-isinf.patch
+	source = 0006-openexr3.patch
+	source = 0007-silence-compiler-warnings.patch
+	source = 0008-silence-preprocessing.patch
+	source = 0009-openvdb.patch
+	source = 0010-spdlog.patch
+	source = 0011-openimageio.patch
+	source = 0012-opencolorio.patch
 	sha256sums = b844989b8229bf02f3c8aa6845be6a587aa5ae55a45861591119ad0e1a195867
-	sha256sums = 4e04c3eb653f00d2389aff8e7fda2d244e258cbca3a22e32c13388a3984e4bb1
-	sha256sums = 8a8a681cce3a3ff39536cb0cbfefed8ed61887665ce1f4b101b3a222a1da50f6
-	sha256sums = 7c2cf9dd881fb738e468599a4babc445cfb0a5146d3b74519449b4a1a9602c07
-	sha256sums = 7203f773f94d632923a992824c66741a64f07a07fad932f5623ac9a257aa73a5
-	sha256sums = 763b41b8fd401c584efd147616d0b4eb4d30c76a7e9072a6c6a03189147530ad
-	sha256sums = 96d2bf957f7a0dfa3c25bd9345d7ca18d4fd89f7a6d3cae946eaf0d623917171
-	sha256sums = 8b7083d8aeedb2adecf078e06da028120c2f8354280c7ec7424b304ab3fd29bd
-	sha256sums = f81448ae200a3bd549dd551fd6f5db9bff4bd07270bb91e57672d2b1275e938b
-	sha256sums = 33bde7ca00b08ce568d07d70bf324104abe0b38f22e81531de459e98723828b4
-	sha256sums = 10375ea78ab9c1454211992179368a9fa84b79700a4a2ef2b47cb2f1c908699b
-	sha256sums = bdf0e8167a4e26cc251846b4b8a8827571f8ac9478f7a2400f6776bfe6b99375
+	sha256sums = 844bd21fde9b8922df10a2eae35f7cd1b52670e9fbe82e65b0860f91793eb16b
+	sha256sums = 208504a682188825f153abd6bfc6954dcd5c9ddf41d5685d4e1962c78a78e5e3
+	sha256sums = 225f680681e5c48d39d25861312f56e09468f00fce86e42ec34317d2141007b4
+	sha256sums = 9e4e0c2c4893a2c5b0c639dc303b38427038e473cf8ffc6f8f57bb90b19410e3
+	sha256sums = b04cbc01919853d9a4a9b776691e7e8e0cb0e10cc0bf18278d8889d8fa0f95f0
+	sha256sums = ad2bc28399315a87ad63a167f4edd6581765ba64a31046a6d169edba6dd50dee
+	sha256sums = 0958971643fd36c56e9ecbf8b1542035af7cf64e657937df8a159fa6b27bb4b0
+	sha256sums = 01beadfc9571c133f423736520ffb5d808de9be2271cd879028a88fd2be50b83
+	sha256sums = 3699cd2e7ac266acec780ebd6481f5faa53b14d4b22fff1cdd7519d9b830f410
+	sha256sums = 09a127677aa7154a2b1147ef685ec5e8a426ef743c5af7efcf929e3591ba001b
+	sha256sums = 75362c66901937fa2af038a9cea5494299284e2caaffedbd0d82ce9556b0ecd7
+	sha256sums = 406dc6c28541f701e47f2b71766ce255f9af1633fe175f0580d33f78156bb526
 	b2sums = ead966b0df7bb72ac9aa2aefb1e5f2dd020156a8e66f67aeff75d29606072ea7b147ddc4d6effea687baf4653e670bd3ad93fc9c7b0e7cac340cb1d5976adb14
-	b2sums = 2903992389c61fc4720cde8a011d0b637de647a7c9e701609968c01a8ab904277dfb27a90179d4cfcf98382973542e59d1384580236c25f6568aaa7b6ba90528
-	b2sums = 04d1e78d044666720a9a099a9b95426ea06fe076354698f642a1a24df25bc27a033e6823a56cbdc21b695cba0e71446f4278c9a1474dba2cfa6aa91945950266
-	b2sums = 8539531d52cbe02edd600ae02d179888a36ef0caac806c6951a7a68404bf5575e5afc451d1f6b250b6e3970d088a25396f26a442ef01e3af98ae338a9fd1dc76
-	b2sums = 1985ee3dbd596cf7ac4a3041b395792733d59c95de4226dc54ff33887db4ec4adc0ef877d294cf66da2926eb025166397fdf6ceb76bfd280932e3ecd9ae716ec
-	b2sums = a2aae60cee2911c1fa45bdaa670cd04b552fe34624f62eaafc2ceaf648e283ed62e4bb0567dacf9733b6ef05e657514bda7a98800d735f32a15cb8fd452e150b
-	b2sums = 58e2e5f6706f17040a7674f6ae81c49e4bdac586228c51374615e7821a70cad8f508bdbd1dbb9d53db98713e5cb456c9b065512199385becdcaf7cb9bd7c1f4b
-	b2sums = 7b15d54811fd1d8ef908963abd76fe552f6149ea32e6f83eaecc6f0636d5e58ece857f86828bf650a2f762a02ca58640ff60dd0f9268666033da67be6e5e7ae1
-	b2sums = 8e35b9a826592b1a2f2adaa7400cf6cae1c43f04edec7f6a84f2a7c67b56d762685d484863c8f5b49cf55ed6c91c2d3935e851a4446415cc420104707e06201a
-	b2sums = 0b93c67f7a5c7d1a8f3e62eb94f70a5b93b1c2f7cdbce99dd5444ac52f27aa7198ed9a3172efbea382dd7a7f8aeb97fe54acecafc41bb48ac34379952867724e
-	b2sums = 798b7e21d44f8c68022b5f212f0235ef1558629db2d7356128b23736a9f97009cc85f48c77e30f5908832da46204d54444f0221675e917d3e3f85c0027c547dd
-	b2sums = 537301a740c8cbbb45905d28d8fb58069e3839020208e911515a4c0e7aba39bf3d5d53699ee54b42efead2d499b30f1fb77e5dde3aa7faadd0ac9bd45445f8dd
+	b2sums = 50d6416bf4e66438d92bfe23505114c55940e8b4411b4ac01adb7c30a200701d01a4f40519e9f29a57414cd9f28a6410353439caa83aab2fc09191b820c1a9d1
+	b2sums = db7b8450f032276ba49e1510fb7ee33bd64f1249661bfb66ecf6107baaf691c474c0d213256e6307831c6157a67192cd1e9d4483f24306ccf3a9a6c4f82b3a08
+	b2sums = 57db881f3217b5247030c48e542b504d33909467f81f72ed45951c0a09074b06f54ebdd39fa73f40863ab9f808e80b928f51c720ec1a90eb036ab1684199b1da
+	b2sums = a5589bc99841646223faaf2ff82c63e5eb9ff67ed218e2e7f06076ef6cf3c981954fc4a0f1fc8a1c391114916dde1e1903333fd18969dc7ec5f105f10eb42698
+	b2sums = 98391453940571cf68a31378a7c36c12a107de418c1ee0971ed62c665bc34558c52ce333b2fdf854d44bc1f833183518d7fb0ae8b21984f4a15416a7e085a96d
+	b2sums = 6658015968bcb040e8dea19c415737e66b3d8bceaf504d0b7990226cbe5210b5858262e928d0666691c2ce220905f22eea1a6989ac1e90505c029c4e86f714f1
+	b2sums = b99c2c4e46533b1f7c72d6beb36cf0e7aef070141fb03c544731f1dbaee03f746f0cfb5888301ab39594482b86516a177d301e85a365b3db9e4bccfc62adca79
+	b2sums = 4dda3fd00f391003f600c73f8ac0812b44800e9c4b239ab58339e2b990e519439414951e71679b6faa95b5c7ff7abb9033ce936c1e792a1245e106a89b6f00d6
+	b2sums = 486a69b96da727b8a0185f2d5665b3b75187a91043d640eae431a576c9604d4f478f92a5624b78b1e1edc870827bb12d02a8b1b5433dfd89ade81e8c9208f602
+	b2sums = 73d0ba48c5d242dd3ba58119b1bdc4669bdaa58abe945eddd7f8180dc4510e2dc4fcdc32c55f562fa6282e00d6a8d23b378b51c28e99e1c6dcc5584c3e5133c9
+	b2sums = 7dbc862cf58454143f62511d843df380dd51ded785143cba60a7d7f8af603e104e19c49891ee1326a700ef07d7ce882e63fe7b4d87f5c056c61222f9f1f36fef
+	b2sums = fd1ebf116a1d79c5faacb9b9b38751897ec76f427a1a872bb746430cbc5aa2e3a84a60adc66fc64ca63286b64b512500034c1ba819b58175f9cc2e7ff90deb67
 
 pkgname = luxcorerender
diff --git a/01-glfw.patch b/0001-glfw.patch
index 29c1e0fef7af..65a2ee7c05a0 100644
--- a/01-glfw.patch
+++ b/0001-glfw.patch
@@ -1,5 +1,14 @@
+From fdf20c2ce2ea87663031b322ca38644b0babf1ec Mon Sep 17 00:00:00 2001
+From: howetuft <howetuft@gmail.com>
+Date: Sat, 21 May 2022 18:16:28 +0200
+Subject: [PATCH 01/12] glfw
+
+---
+ samples/luxcoreui/CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
 diff --git a/samples/luxcoreui/CMakeLists.txt b/samples/luxcoreui/CMakeLists.txt
-index 33b50b3d0..ba1982a42 100644
+index 8b74e0704..d2e823874 100644
 --- a/samples/luxcoreui/CMakeLists.txt
 +++ b/samples/luxcoreui/CMakeLists.txt
 @@ -22,7 +22,10 @@
@@ -14,3 +23,6 @@ index 33b50b3d0..ba1982a42 100644
  include_directories(deps/glfw-3.1.1/include)
  include_directories(deps/nfd/include)
  
+-- 
+2.36.1
+
diff --git a/0002-boost107400.patch b/0002-boost107400.patch
new file mode 100644
index 000000000000..9db947a8760c
--- /dev/null
+++ b/0002-boost107400.patch
@@ -0,0 +1,66 @@
+From 2e84475cf47832d7d1b6b9416b8a0884381c8cf8 Mon Sep 17 00:00:00 2001
+From: howetuft <howetuft@gmail.com>
+Date: Sat, 21 May 2022 18:17:09 +0200
+Subject: [PATCH 02/12] boost107400
+
+---
+ src/slg/engines/bakecpu/bakecputhread.cpp         | 2 ++
+ src/slg/engines/pathocl/pathoclopenclthread.cpp   | 2 ++
+ src/slg/engines/tilepathocl/tilepathoclthread.cpp | 2 ++
+ src/slg/film/filmserialize.cpp                    | 1 +
+ 4 files changed, 7 insertions(+)
+
+diff --git a/src/slg/engines/bakecpu/bakecputhread.cpp b/src/slg/engines/bakecpu/bakecputhread.cpp
+index ca0284271..7eb9e97b1 100644
+--- a/src/slg/engines/bakecpu/bakecputhread.cpp
++++ b/src/slg/engines/bakecpu/bakecputhread.cpp
+@@ -23,6 +23,8 @@
+ #include "slg/utils/varianceclamping.h"
+ #include "slg/film/imagepipeline/plugins/bakemapmargin.h"
+ 
++#include <boost/bind.hpp>
++
+ using namespace std;
+ using namespace luxrays;
+ using namespace slg;
+diff --git a/src/slg/engines/pathocl/pathoclopenclthread.cpp b/src/slg/engines/pathocl/pathoclopenclthread.cpp
+index 5d17f8ff4..0cbef9349 100644
+--- a/src/slg/engines/pathocl/pathoclopenclthread.cpp
++++ b/src/slg/engines/pathocl/pathoclopenclthread.cpp
+@@ -31,6 +31,8 @@
+ #include "slg/renderconfig.h"
+ #include "slg/engines/pathocl/pathocl.h"
+ 
++#include <boost/bind.hpp>
++
+ using namespace std;
+ using namespace luxrays;
+ using namespace slg;
+diff --git a/src/slg/engines/tilepathocl/tilepathoclthread.cpp b/src/slg/engines/tilepathocl/tilepathoclthread.cpp
+index f8e3fa2d1..4a44d13c8 100644
+--- a/src/slg/engines/tilepathocl/tilepathoclthread.cpp
++++ b/src/slg/engines/tilepathocl/tilepathoclthread.cpp
+@@ -24,6 +24,8 @@
+ #include "slg/kernels/kernels.h"
+ #include "slg/engines/tilepathocl/tilepathocl.h"
+ 
++#include <boost/bind.hpp>
++
+ using namespace std;
+ using namespace luxrays;
+ using namespace slg;
+diff --git a/src/slg/film/filmserialize.cpp b/src/slg/film/filmserialize.cpp
+index 6cd3aee46..120eb8cb5 100644
+--- a/src/slg/film/filmserialize.cpp
++++ b/src/slg/film/filmserialize.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <boost/lexical_cast.hpp>
+ #include <boost/foreach.hpp>
++#include <boost/serialization/library_version_type.hpp>
+ #include <boost/serialization/unordered_set.hpp>
+ 
+ #include "slg/film/film.h"
+-- 
+2.36.1
+
diff --git a/03-python.patch b/0003-python.patch
index bcc15a27bc40..8e9fbecc97f7 100644
--- a/03-python.patch
+++ b/0003-python.patch
@@ -1,5 +1,19 @@
+From 59246af1699c3234a5e24b4af5e187acc621e324 Mon Sep 17 00:00:00 2001
+From: howetuft <howetuft@gmail.com>
+Date: Sat, 21 May 2022 18:17:31 +0200
+Subject: [PATCH 03/12] python
+
+---
+ CMakeLists.txt                                    | 4 ++++
+ samples/luxcoreconsole/CMakeLists.txt             | 2 +-
+ samples/luxcoredemo/CMakeLists.txt                | 2 +-
+ samples/luxcorescenedemo/CMakeLists.txt           | 2 +-
+ samples/luxcoreui/CMakeLists.txt                  | 3 ++-
+ tests/luxcoreimplserializationdemo/CMakeLists.txt | 2 +-
+ 6 files changed, 10 insertions(+), 5 deletions(-)
+
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7dda21b7d..fe41ec5d8 100644
+index 72c1996ac..78316b671 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -28,6 +28,10 @@ MESSAGE(STATUS "CMake version " ${CMAKE_VERSION} " detected")
@@ -13,7 +27,6 @@ index 7dda21b7d..fe41ec5d8 100644
  # Remove the following when the version check is at least 2.8.4
  SET(CMAKE_LEGACY_CYGWIN_WIN32 0)
  
-
 diff --git a/samples/luxcoreconsole/CMakeLists.txt b/samples/luxcoreconsole/CMakeLists.txt
 index 96e09bc6a..cdb83231c 100644
 --- a/samples/luxcoreconsole/CMakeLists.txt
@@ -36,7 +49,7 @@ index 194104caf..241dbd5f2 100644
 -TARGET_LINK_LIBRARIES(luxcoredemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${OPENCL_LIBRARIES} ${CUDA_ALL_LIBRARIES})
 +TARGET_LINK_LIBRARIES(luxcoredemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${OPENCL_LIBRARIES} ${CUDA_ALL_LIBRARIES})
 diff --git a/samples/luxcorescenedemo/CMakeLists.txt b/samples/luxcorescenedemo/CMakeLists.txt
-index 3acb27bfa..b52d3ec81 100644
+index 1840a0e42..504739572 100644
 --- a/samples/luxcorescenedemo/CMakeLists.txt
 +++ b/samples/luxcorescenedemo/CMakeLists.txt
 @@ -29,4 +29,4 @@ set(LUXCORESCENEDEMO_SRCS
@@ -46,12 +59,10 @@ index 3acb27bfa..b52d3ec81 100644
 -TARGET_LINK_LIBRARIES(luxcorescenedemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES})
 +TARGET_LINK_LIBRARIES(luxcorescenedemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
 diff --git a/samples/luxcoreui/CMakeLists.txt b/samples/luxcoreui/CMakeLists.txt
-index 8b74e0704..c6f9c88f1 100644
+index d2e823874..80325af7e 100644
 --- a/samples/luxcoreui/CMakeLists.txt
 +++ b/samples/luxcoreui/CMakeLists.txt
-@@ -100,7 +100,8 @@ TARGET_LINK_LIBRARIES(luxcoreui
- 	glfw
- 	${GLFW_LIBRARIES}
+@@ -103,5 +103,6 @@ TARGET_LINK_LIBRARIES(luxcoreui
  	${LUXCORE_LIBRARY}
  	${OPENGL_LIBRARIES}
  	${GTK3_LIBRARIES}
@@ -60,7 +71,7 @@ index 8b74e0704..c6f9c88f1 100644
 +        ${PYTHON_LIBRARIES})
  endif()
 diff --git a/tests/luxcoreimplserializationdemo/CMakeLists.txt b/tests/luxcoreimplserializationdemo/CMakeLists.txt
-index bdd3445b8..a79c4a7b2 100644
+index bdd3445b8..baa52f622 100644
 --- a/tests/luxcoreimplserializationdemo/CMakeLists.txt
 +++ b/tests/luxcoreimplserializationdemo/CMakeLists.txt
 @@ -31,4 +31,4 @@ include_directories(${LuxRays_SOURCE_DIR}/deps/opencolorio-2.0.0/include)
@@ -69,4 +80,7 @@ index bdd3445b8..a79c4a7b2 100644
  
 -TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays bcd opensubdiv openvdb opencolorio ${BLOSC_LIBRARY} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
 \ No newline at end of file
-+TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays bcd opensubdiv openvdb ${BLOSC_LIBRARY} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
++TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays bcd opensubdiv openvdb ${BLOSC_LIBRARY} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${PYTHON_LIBRARIES})
+-- 
+2.36.1
+
diff --git a/0004-cpplib.patch b/0004-cpplib.patch
new file mode 100644
index 000000000000..9842772c077a
--- /dev/null
+++ b/0004-cpplib.patch
@@ -0,0 +1,53 @@
+From 5f90e5915e2d24068495371df15f579367a45aa8 Mon Sep 17 00:00:00 2001
+From: howetuft <howetuft@gmail.com>
+Date: Sat, 21 May 2022 18:17:51 +0200
+Subject: [PATCH 04/12] cpplib
+
+---
+ src/slg/scene/parsematerials.cpp | 2 ++
+ src/slg/scene/parseobjects.cpp   | 2 ++
+ src/slg/scene/parsevolumes.cpp   | 2 ++
+ 3 files changed, 6 insertions(+)
+
+diff --git a/src/slg/scene/parsematerials.cpp b/src/slg/scene/parsematerials.cpp
+index 592c10e81..0288d7c5d 100644
+--- a/src/slg/scene/parsematerials.cpp
++++ b/src/slg/scene/parsematerials.cpp
+@@ -52,6 +52,8 @@
+ 
+ #include "slg/utils/filenameresolver.h"
+ 
++#include <atomic>
++
+ using namespace std;
+ using namespace luxrays;
+ using namespace slg;
+diff --git a/src/slg/scene/parseobjects.cpp b/src/slg/scene/parseobjects.cpp
+index ddabedfae..3cb8712ba 100644
+--- a/src/slg/scene/parseobjects.cpp
++++ b/src/slg/scene/parseobjects.cpp
+@@ -19,6 +19,8 @@
+ #include "slg/scene/scene.h"
+ #include "slg/utils/filenameresolver.h"
+ 
++#include <atomic>
++
+ using namespace std;
+ using namespace luxrays;
+ using namespace slg;
+diff --git a/src/slg/scene/parsevolumes.cpp b/src/slg/scene/parsevolumes.cpp
+index c9798c2ec..8101b5742 100644
+--- a/src/slg/scene/parsevolumes.cpp
++++ b/src/slg/scene/parsevolumes.cpp
+@@ -32,6 +32,8 @@
+ #include "slg/volumes/heterogenous.h"
+ #include "slg/volumes/homogenous.h"
+ 
++#include <atomic>
++
+ using namespace std;
+ using namespace luxrays;
+ using namespace slg;
+-- 
+2.36.1
+
diff --git a/05-clang-isnan-isinf.patch b/0005-clang-isnan-isinf.patch
index caa11d354df9..b382c11828a5 100644
--- a/05-clang-isnan-isinf.patch
+++ b/0005-clang-isnan-isinf.patch
@@ -1,7 +1,7 @@
-From b232a8667d122064cdc24ee93d14139dedd42a48 Mon Sep 17 00:00:00 2001
+From f98a18521525ebfcc3d481a6c2a6e81c4569fc0f Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
-Date: Fri, 28 Jan 2022 07:39:52 +0100
-Subject: [PATCH] clang-isnan-isinf
+Date: Sat, 21 May 2022 18:18:23 +0200
+Subject: [PATCH 05/12] clang-isnan-isinf
 
 ---
  include/luxrays/utils/utils.h | 5 +++++
@@ -24,5 +24,5 @@ index b6584b383..d48d7d93d 100644
  #include <string>
  #endif
 -- 
-2.34.1
+2.36.1
 
diff --git a/06-openexr3.patch b/0006-openexr3.patch
index 2dd77ff6b178..38103e233d8b 100644
--- a/06-openexr3.patch
+++ b/0006-openexr3.patch
@@ -1,4 +1,23 @@
+From e2f76bd9aaa4111eaf1b23d907367a982de9d5ff Mon Sep 17 00:00:00 2001
+From: howetuft <howetuft@gmail.com>
+Date: Sat, 21 May 2022 18:18:50 +0200
+Subject: [PATCH 06/12] openexr3
+
+---
+ cmake/Packages/FindOpenEXR.cmake              | 241 ++++++++++--------
+ .../src/OpenColorIO/BitDepthUtils.h           |   2 +-
+ .../src/OpenColorIO/MathUtils.h               |   2 +-
+ .../src/OpenColorIO/ops/range/RangeOp.cpp     |   2 +-
+ .../OpenColorIO/transforms/builtins/ACES.cpp  |   2 +-
+ .../transforms/builtins/OpHelpers.cpp         |   2 +-
+ .../src/libutils/oiiohelpers/oiiohelpers.cpp  |   2 +-
+ deps/openvdb-7.0.0/openvdb/Types.h            |   2 +-
+ include/slg/imagemap/imagemap.h               |   2 +-
+ include/slg/utils/halfserialization.h         |   2 +-
+ 10 files changed, 137 insertions(+), 122 deletions(-)
+
 diff --git a/cmake/Packages/FindOpenEXR.cmake b/cmake/Packages/FindOpenEXR.cmake
+index dfe517b34..a2f7b4c62 100644
 --- a/cmake/Packages/FindOpenEXR.cmake
 +++ b/cmake/Packages/FindOpenEXR.cmake
 @@ -1,123 +1,138 @@
@@ -253,43 +272,8 @@ diff --git a/cmake/Packages/FindOpenEXR.cmake b/cmake/Packages/FindOpenEXR.cmake
 +UNSET(_openexr_FIND_COMPONENTS)
 +UNSET(_openexr_LIBRARIES)
 +UNSET(_openexr_SEARCH_DIRS)
-diff --git a/include/slg/imagemap/imagemap.h b/include/slg/imagemap/imagemap.h
---- a/include/slg/imagemap/imagemap.h
-+++ b/include/slg/imagemap/imagemap.h
-@@ -19,7 +19,7 @@
- #ifndef _SLG_IMAGEMAP_H
- #define	_SLG_IMAGEMAP_H
- 
--#include <OpenEXR/half.h>
-+#include <Imath/half.h>
- 
- #include <string>
- #include <limits>
-diff --git a/include/slg/utils/halfserialization.h b/include/slg/utils/halfserialization.h
---- a/include/slg/utils/halfserialization.h
-+++ b/include/slg/utils/halfserialization.h
-@@ -19,7 +19,7 @@
- #ifndef _SLG_HALFSERIALIZATION_H
- #define	_SLG_HALFSERIALIZATION_H
- 
--#include <OpenEXR/half.h>
-+#include <Imath/half.h>
- 
- #include "luxrays/utils/utils.h"
- #include "luxrays/utils/serializationutils.h"
-diff --git a/deps/openvdb-7.0.0/openvdb/Types.h b/deps/openvdb-7.0.0/openvdb/Types.h
---- a/deps/openvdb-7.0.0/openvdb/Types.h
-+++ b/deps/openvdb-7.0.0/openvdb/Types.h
-@@ -6,7 +6,7 @@
- 
- #include "version.h"
- #include "Platform.h"
--#include <OpenEXR/half.h>
-+#include <Imath/half.h>
- #include <openvdb/math/Math.h>
- #include <openvdb/math/BBox.h>
- #include <openvdb/math/Quat.h>
 diff --git a/deps/opencolorio-2.0.0/src/OpenColorIO/BitDepthUtils.h b/deps/opencolorio-2.0.0/src/OpenColorIO/BitDepthUtils.h
+index a8b3cbd94..bb0163bff 100644
 --- a/deps/opencolorio-2.0.0/src/OpenColorIO/BitDepthUtils.h
 +++ b/deps/opencolorio-2.0.0/src/OpenColorIO/BitDepthUtils.h
 @@ -7,7 +7,7 @@
@@ -302,6 +286,7 @@ diff --git a/deps/opencolorio-2.0.0/src/OpenColorIO/BitDepthUtils.h b/deps/openc
  

  namespace OCIO_NAMESPACE

 diff --git a/deps/opencolorio-2.0.0/src/OpenColorIO/MathUtils.h b/deps/opencolorio-2.0.0/src/OpenColorIO/MathUtils.h
+index 309c6244f..0873d4908 100644
 --- a/deps/opencolorio-2.0.0/src/OpenColorIO/MathUtils.h
 +++ b/deps/opencolorio-2.0.0/src/OpenColorIO/MathUtils.h
 @@ -9,7 +9,7 @@
@@ -314,6 +299,7 @@ diff --git a/deps/opencolorio-2.0.0/src/OpenColorIO/MathUtils.h b/deps/opencolor
  namespace OCIO_NAMESPACE
  {
 diff --git a/deps/opencolorio-2.0.0/src/OpenColorIO/ops/range/RangeOp.cpp b/deps/opencolorio-2.0.0/src/OpenColorIO/ops/range/RangeOp.cpp
+index b6fb6d9e7..e7389203c 100644
 --- a/deps/opencolorio-2.0.0/src/OpenColorIO/ops/range/RangeOp.cpp
 +++ b/deps/opencolorio-2.0.0/src/OpenColorIO/ops/range/RangeOp.cpp
 @@ -7,7 +7,7 @@
@@ -326,6 +312,7 @@ diff --git a/deps/opencolorio-2.0.0/src/OpenColorIO/ops/range/RangeOp.cpp b/deps
  #include "MathUtils.h"
  #include "ops/lut1d/Lut1DOpData.h"
 diff --git a/deps/opencolorio-2.0.0/src/OpenColorIO/transforms/builtins/ACES.cpp b/deps/opencolorio-2.0.0/src/OpenColorIO/transforms/builtins/ACES.cpp
+index 20968c0da..9ee2ac27a 100644
 --- a/deps/opencolorio-2.0.0/src/OpenColorIO/transforms/builtins/ACES.cpp
 +++ b/deps/opencolorio-2.0.0/src/OpenColorIO/transforms/builtins/ACES.cpp
 @@ -6,7 +6,7 @@
@@ -351,6 +338,7 @@ index 04b8fbd40..288ca5668 100644
  #include "transforms/builtins/OpHelpers.h"
  
 diff --git a/deps/opencolorio-2.0.0/src/libutils/oiiohelpers/oiiohelpers.cpp b/deps/opencolorio-2.0.0/src/libutils/oiiohelpers/oiiohelpers.cpp
+index 3228644ad..11478daff 100644
 --- a/deps/opencolorio-2.0.0/src/libutils/oiiohelpers/oiiohelpers.cpp
 +++ b/deps/opencolorio-2.0.0/src/libutils/oiiohelpers/oiiohelpers.cpp
 @@ -5,7 +5,7 @@
@@ -362,3 +350,45 @@ diff --git a/deps/opencolorio-2.0.0/src/libutils/oiiohelpers/oiiohelpers.cpp b/d
  #include "oiiohelpers.h"

  #include "utils/StringUtils.h"

  

+diff --git a/deps/openvdb-7.0.0/openvdb/Types.h b/deps/openvdb-7.0.0/openvdb/Types.h
+index 70269cf07..0d9906828 100644
+--- a/deps/openvdb-7.0.0/openvdb/Types.h
++++ b/deps/openvdb-7.0.0/openvdb/Types.h
+@@ -6,7 +6,7 @@
+ 
+ #include "version.h"
+ #include "Platform.h"
+-#include <OpenEXR/half.h>
++#include <Imath/half.h>
+ #include <openvdb/math/Math.h>
+ #include <openvdb/math/BBox.h>
+ #include <openvdb/math/Quat.h>
+diff --git a/include/slg/imagemap/imagemap.h b/include/slg/imagemap/imagemap.h
+index 0260456ce..46d2c2241 100644
+--- a/include/slg/imagemap/imagemap.h
++++ b/include/slg/imagemap/imagemap.h
+@@ -19,7 +19,7 @@
+ #ifndef _SLG_IMAGEMAP_H
+ #define	_SLG_IMAGEMAP_H
+ 
+-#include <OpenEXR/half.h>
++#include <Imath/half.h>
+ 
+ #include <string>
+ #include <limits>
+diff --git a/include/slg/utils/halfserialization.h b/include/slg/utils/halfserialization.h
+index 551789888..2624f118c 100644
+--- a/include/slg/utils/halfserialization.h
++++ b/include/slg/utils/halfserialization.h
+@@ -19,7 +19,7 @@
+ #ifndef _SLG_HALFSERIALIZATION_H
+ #define	_SLG_HALFSERIALIZATION_H
+ 
+-#include <OpenEXR/half.h>
++#include <Imath/half.h>
+ 
+ #include "luxrays/utils/utils.h"
+ #include "luxrays/utils/serializationutils.h"
+-- 
+2.36.1
+
diff --git a/07-silence-compiler-warnings.patch b/0007-silence-compiler-warnings.patch
index 70634c305da0..a056a7d4474b 100644
--- a/07-silence-compiler-warnings.patch
+++ b/0007-silence-compiler-warnings.patch
@@ -1,7 +1,7 @@
-From 1d8d704a0562a7d98036a6c08d647681d3d9fe7b Mon Sep 17 00:00:00 2001
+From 905c132fe054804cea3897d33c222a33bc41142d Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
-Date: Mon, 31 Jan 2022 19:47:16 +0100
-Subject: [PATCH] Silence C++ warnings
+Date: Sat, 21 May 2022 18:19:13 +0200
+Subject: [PATCH 07/12] silence-compiler-warnings
 
 ---
  CMakeLists.txt | 1 +
@@ -20,5 +20,5 @@ index 78316b671..74f5465ef 100644
  if (CMAKE_CONFIGURATION_TYPES)
  
 -- 
-2.34.1
+2.36.1
 
diff --git a/08-silence-preprocessing.patch b/0008-silence-preprocessing.patch
index b34955cb393f..e27862f53cde 100644
--- a/08-silence-preprocessing.patch
+++ b/0008-silence-preprocessing.patch
@@ -1,7 +1,7 @@
-From dc8e0bc7d6c630914c79506f9dc29d4e731a501d Mon Sep 17 00:00:00 2001
+From 449ef842927c0540d3f4c71b994e7d58fe16b199 Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
-Date: Sat, 29 Jan 2022 16:30:11 +0100
-Subject: [PATCH] Silence preprocessing
+Date: Sat, 21 May 2022 18:19:34 +0200
+Subject: [PATCH 08/12] silence-preprocessing
 
 ---
  cmake/KernelPreprocess.cmake | 2 +-
@@ -21,5 +21,5 @@ index d877f0ef3..3d71d4a57 100644
  	add_custom_command(
  		OUTPUT ${DST}
 -- 
-2.34.1
+2.36.1
 
diff --git a/09-openvdb.patch b/0009-openvdb.patch
index c795b02421e7..55cf26c725d1 100644
--- a/09-openvdb.patch
+++ b/0009-openvdb.patch
@@ -1,7 +1,7 @@
-From 2c647ad8d0c29dc85da0a1b9d62ddb39f776e669 Mon Sep 17 00:00:00 2001
+From 21ca16138a8f08b48f40c3c0d42d7d188a42fae7 Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
-Date: Mon, 31 Jan 2022 21:43:01 +0100
-Subject: [PATCH] openvdb
+Date: Sat, 21 May 2022 18:19:59 +0200
+Subject: [PATCH 09/12] openvdb
 
 ---
  CMakeLists.txt                                    | 12 +++++++++++-
@@ -135,15 +135,15 @@ index 2f1bf79cc..9424b82bc 100644
  ###########################################################################
  #
 diff --git a/tests/luxcoreimplserializationdemo/CMakeLists.txt b/tests/luxcoreimplserializationdemo/CMakeLists.txt
-index e5bb5f083..8f458eda1 100644
+index baa52f622..2bfad6bf1 100644
 --- a/tests/luxcoreimplserializationdemo/CMakeLists.txt
 +++ b/tests/luxcoreimplserializationdemo/CMakeLists.txt
 @@ -31,4 +31,4 @@ include_directories(${LuxRays_SOURCE_DIR}/deps/opencolorio-2.0.0/include)
  
  add_executable(luxcoreimplserializationdemo ${LUXCOREIMPL_SERIALIZATIONDEMO_SRCS})
  
--TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays bcd opensubdiv openvdb ${BLOSC_LIBRARY} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
-+TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays bcd opensubdiv opencolorio ${OpenVDB_LIBRARIES} ${BLOSC_LIBRARY} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
+-TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays bcd opensubdiv openvdb ${BLOSC_LIBRARY} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${PYTHON_LIBRARIES})
++TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays bcd opensubdiv opencolorio ${OpenVDB_LIBRARIES} ${BLOSC_LIBRARY} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${PYTHON_LIBRARIES})
 -- 
-2.34.1
+2.36.1
 
diff --git a/10-spdlog.patch b/0010-spdlog.patch
index cf41c3dc52aa..5c677fdba5fa 100644
--- a/10-spdlog.patch
+++ b/0010-spdlog.patch
@@ -1,7 +1,7 @@
-From ba61584912b0846607cfc82edf8157016a7da62f Mon Sep 17 00:00:00 2001
+From a9b12df0695e228bbfab9ade17e02614d7f0cf84 Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
-Date: Mon, 31 Jan 2022 21:51:23 +0100
-Subject: [PATCH] spdlog
+Date: Sat, 21 May 2022 18:20:14 +0200
+Subject: [PATCH 10/12] spdlog
 
 ---
  deps/spdlog-1.8.0/include/spdlog/common-inl.h | 2 +-
@@ -21,5 +21,5 @@ index be0d8f8ea..4e5a09cb9 100644
  }
  
 -- 
-2.34.1
+2.36.1
 
diff --git a/11-openimageio.patch b/0011-openimageio.patch
index 5c6935bd9b2e..f4d5845ca7ad 100644
--- a/11-openimageio.patch
+++ b/0011-openimageio.patch
@@ -1,7 +1,7 @@
-From 4ebe35970cdfaf04a962716f298c6320f720792e Mon Sep 17 00:00:00 2001
+From 81d27a09836fb5deae2466ebbf4a72ad668642b5 Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
-Date: Sun, 13 Mar 2022 17:15:43 +0100
-Subject: [PATCH] OpenImageIO v2.3
+Date: Sat, 21 May 2022 18:20:33 +0200
+Subject: [PATCH 11/12] openimageio
 
 ---
  cmake/Packages/FindOpenImageIO.cmake | 11 ++++++++++-
@@ -37,5 +37,5 @@ index 66bf54966..49eb82372 100644
  ENDIF(OPENIMAGEIO_FOUND)
  
 -- 
-2.35.1
+2.36.1
 
diff --git a/0012-opencolorio.patch b/0012-opencolorio.patch
new file mode 100644
index 000000000000..1d5345af7878
--- /dev/null
+++ b/0012-opencolorio.patch
@@ -0,0 +1,24 @@
+From 5c4853293e69f4ec321175b1f891ffd84d994c1a Mon Sep 17 00:00:00 2001
+From: howetuft <howetuft@gmail.com>
+Date: Sat, 21 May 2022 18:21:33 +0200
+Subject: [PATCH 12/12] opencolorio
+
+---
+ deps/opencolorio-2.0.0/src/OpenColorIO/FileRules.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/deps/opencolorio-2.0.0/src/OpenColorIO/FileRules.cpp b/deps/opencolorio-2.0.0/src/OpenColorIO/FileRules.cpp
+index 329f54f50..f22926b35 100644
+--- a/deps/opencolorio-2.0.0/src/OpenColorIO/FileRules.cpp
++++ b/deps/opencolorio-2.0.0/src/OpenColorIO/FileRules.cpp
+@@ -6,6 +6,7 @@
+ #include <map>
+ #include <regex>
+ #include <sstream>
++#include <cstring>
+ 
+ #include <OpenColorIO/OpenColorIO.h>
+ 
+-- 
+2.36.1
+
diff --git a/02-boost107400.patch b/02-boost107400.patch
deleted file mode 100644
index 7f7efccd5ca4..000000000000
--- a/02-boost107400.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Naur LuxCore-luxcorerender_v2.5beta1/src/slg/film/filmserialize.cpp LuxCore-luxcorerender_v2.5beta1-new/src/slg/film/filmserialize.cpp
---- LuxCore-luxcorerender_v2.5beta1/src/slg/film/filmserialize.cpp	2020-11-15 11:42:41.000000000 +0100
-+++ LuxCore-luxcorerender_v2.5beta1-new/src/slg/film/filmserialize.cpp	2020-12-11 15:40:07.712190410 +0100
-@@ -21,6 +21,7 @@
- #include <boost/lexical_cast.hpp>
- #include <boost/foreach.hpp>
-+#include <boost/serialization/library_version_type.hpp>
- #include <boost/serialization/unordered_set.hpp>
- 
- #include "slg/film/film.h"
- #include "slg/film/imagepipeline/imagepipeline.h"
-diff -Naur LuxCore-luxcorerender_v2.5beta1/src/slg/engines/bakecpu/bakecputhread.cpp LuxCore-luxcorerender_v2.5beta1-new/src/slg/engines/bakecpu/bakecputhread.cpp
---- LuxCore-luxcorerender_v2.5beta1/src/slg/engines/bakecpu/bakecputhread.cpp	2020-11-15 11:42:41.000000000 +0100
-+++ LuxCore-luxcorerender_v2.5beta1-new/src/slg/engines/bakecpu/bakecputhread.cpp	2020-12-11 15:59:46.150726376 +0100
-@@ -23,6 +23,8 @@
- #include "slg/utils/varianceclamping.h"
- #include "slg/film/imagepipeline/plugins/bakemapmargin.h"
- 
-+#include <boost/bind.hpp>
-+
- using namespace std;
- using namespace luxrays;
- using namespace slg;
-diff -Naur LuxCore-luxcorerender_v2.5beta1/src/slg/engines/pathocl/pathoclopenclthread.cpp LuxCore-luxcorerender_v2.5beta1-new/src/slg/engines/pathocl/pathoclopenclthread.cpp
---- LuxCore-luxcorerender_v2.5beta1/src/slg/engines/pathocl/pathoclopenclthread.cpp	2020-11-15 11:42:41.000000000 +0100
-+++ LuxCore-luxcorerender_v2.5beta1-new/src/slg/engines/pathocl/pathoclopenclthread.cpp	2020-12-11 15:59:38.660798941 +0100
-@@ -31,6 +31,8 @@
- #include "slg/renderconfig.h"
- #include "slg/engines/pathocl/pathocl.h"
- 
-+#include <boost/bind.hpp>
-+
- using namespace std;
- using namespace luxrays;
- using namespace slg;
-diff -Naur LuxCore-luxcorerender_v2.5beta1/src/slg/engines/tilepathocl/tilepathoclthread.cpp LuxCore-luxcorerender_v2.5beta1-new/src/slg/engines/tilepathocl/tilepathoclthread.cpp
---- LuxCore-luxcorerender_v2.5beta1/src/slg/engines/tilepathocl/tilepathoclthread.cpp	2020-11-15 11:42:41.000000000 +0100
-+++ LuxCore-luxcorerender_v2.5beta1-new/src/slg/engines/tilepathocl/tilepathoclthread.cpp	2020-12-11 15:59:08.011095932 +0100
-@@ -24,6 +24,8 @@
- #include "slg/kernels/kernels.h"
- #include "slg/engines/tilepathocl/tilepathocl.h"
- 
-+#include <boost/bind.hpp>
-+
- using namespace std;
- using namespace luxrays;
- using namespace slg;
diff --git a/04-cpplib.patch b/04-cpplib.patch
deleted file mode 100644
index 1fb2e37a8376..000000000000
--- a/04-cpplib.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur LuxCore-luxcorerender_v2.5beta1/src/slg/scene/parsematerials.cpp LuxCore-luxcorerender_v2.5beta1-new/src/slg/scene/parsematerials.cpp
---- LuxCore-luxcorerender_v2.5beta1/src/slg/scene/parsematerials.cpp	2020-11-15 11:42:41.000000000 +0100
-+++ LuxCore-luxcorerender_v2.5beta1-new/src/slg/scene/parsematerials.cpp	2020-12-11 16:25:46.032356584 +0100
-@@ -52,6 +52,8 @@
- 
- #include "slg/utils/filenameresolver.h"
- 
-+#include <atomic>
-+
- using namespace std;
- using namespace luxrays;
- using namespace slg;
-diff -Naur LuxCore-luxcorerender_v2.5beta1/src/slg/scene/parsevolumes.cpp LuxCore-luxcorerender_v2.5beta1-new/src/slg/scene/parsevolumes.cpp
---- LuxCore-luxcorerender_v2.5beta1/src/slg/scene/parsevolumes.cpp	2020-11-15 11:42:41.000000000 +0100
-+++ LuxCore-luxcorerender_v2.5beta1-new/src/slg/scene/parsevolumes.cpp	2020-12-11 16:25:58.548903384 +0100
-@@ -32,6 +32,8 @@
- #include "slg/volumes/heterogenous.h"
- #include "slg/volumes/homogenous.h"
- 
-+#include <atomic>
-+
- using namespace std;
- using namespace luxrays;
- using namespace slg;
-diff -Naur LuxCore-luxcorerender_v2.5beta1/src/slg/scene/parseobjects.cpp LuxCore-luxcorerender_v2.5beta1-new/src/slg/scene/parseobjects.cpp
---- LuxCore-luxcorerender_v2.5beta1/src/slg/scene/parseobjects.cpp	2020-11-15 11:42:41.000000000 +0100
-+++ LuxCore-luxcorerender_v2.5beta1-new/src/slg/scene/parseobjects.cpp	2020-12-11 16:31:37.835655891 +0100
-@@ -19,6 +19,8 @@
- #include "slg/scene/scene.h"
- #include "slg/utils/filenameresolver.h"
- 
-+#include <atomic>
-+
- using namespace std;
- using namespace luxrays;
- using namespace slg;
diff --git a/PKGBUILD b/PKGBUILD
index 3d5c38729ad9..8004af9c350d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,7 +23,7 @@ pkgver=2.6
 [ -n "${_rel}" ] && _pkgver=${pkgver}${_rel} && pkgver+=".${_rel}" || _pkgver=${pkgver}
 _name=LuxCore-${pkgname}_v${_pkgver}
 epoch=2
-pkgrel=3
+pkgrel=4
 pkgdesc="Physically correct, unbiased rendering engine."
 arch=('x86_64')
 url="https://www.luxcorerender.org/"
@@ -33,42 +33,45 @@ optdepends+=("pyside2: for pyluxcoretools gui")
 makedepends+=(boost cmake doxygen git ninja pyside2-tools)
 provides=(luxrays)
 source=("https://github.com/LuxCoreRender/LuxCore/archive/${pkgname}_v${_pkgver}.tar.gz"
-        "01-glfw.patch"
-        "02-boost107400.patch"
-        "03-python.patch"
-        "04-cpplib.patch"
-        "05-clang-isnan-isinf.patch"
-        "06-openexr3.patch"
-        "07-silence-compiler-warnings.patch"
-        "08-silence-preprocessing.patch"
-        "09-openvdb.patch"
-        "10-spdlog.patch"
-        "11-openimageio.patch"
+        "0001-glfw.patch"
+        "0002-boost107400.patch"
+        "0003-python.patch"
+        "0004-cpplib.patch"
+        "0005-clang-isnan-isinf.patch"
+        "0006-openexr3.patch"
+        "0007-silence-compiler-warnings.patch"
+        "0008-silence-preprocessing.patch"
+        "0009-openvdb.patch"
+        "0010-spdlog.patch"
+        "0011-openimageio.patch"
+        "0012-opencolorio.patch"
         )
 sha256sums=('b844989b8229bf02f3c8aa6845be6a587aa5ae55a45861591119ad0e1a195867'
-            '4e04c3eb653f00d2389aff8e7fda2d244e258cbca3a22e32c13388a3984e4bb1'
-            '8a8a681cce3a3ff39536cb0cbfefed8ed61887665ce1f4b101b3a222a1da50f6'
-            '7c2cf9dd881fb738e468599a4babc445cfb0a5146d3b74519449b4a1a9602c07'
-            '7203f773f94d632923a992824c66741a64f07a07fad932f5623ac9a257aa73a5'
-            '763b41b8fd401c584efd147616d0b4eb4d30c76a7e9072a6c6a03189147530ad'
-            '96d2bf957f7a0dfa3c25bd9345d7ca18d4fd89f7a6d3cae946eaf0d623917171'
-            '8b7083d8aeedb2adecf078e06da028120c2f8354280c7ec7424b304ab3fd29bd'
-            'f81448ae200a3bd549dd551fd6f5db9bff4bd07270bb91e57672d2b1275e938b'
-            '33bde7ca00b08ce568d07d70bf324104abe0b38f22e81531de459e98723828b4'
-            '10375ea78ab9c1454211992179368a9fa84b79700a4a2ef2b47cb2f1c908699b'
-            'bdf0e8167a4e26cc251846b4b8a8827571f8ac9478f7a2400f6776bfe6b99375')
+            '844bd21fde9b8922df10a2eae35f7cd1b52670e9fbe82e65b0860f91793eb16b'
+            '208504a682188825f153abd6bfc6954dcd5c9ddf41d5685d4e1962c78a78e5e3'
+            '225f680681e5c48d39d25861312f56e09468f00fce86e42ec34317d2141007b4'
+            '9e4e0c2c4893a2c5b0c639dc303b38427038e473cf8ffc6f8f57bb90b19410e3'
+            'b04cbc01919853d9a4a9b776691e7e8e0cb0e10cc0bf18278d8889d8fa0f95f0'
+            'ad2bc28399315a87ad63a167f4edd6581765ba64a31046a6d169edba6dd50dee'
+            '0958971643fd36c56e9ecbf8b1542035af7cf64e657937df8a159fa6b27bb4b0'
+            '01beadfc9571c133f423736520ffb5d808de9be2271cd879028a88fd2be50b83'
+            '3699cd2e7ac266acec780ebd6481f5faa53b14d4b22fff1cdd7519d9b830f410'
+            '09a127677aa7154a2b1147ef685ec5e8a426ef743c5af7efcf929e3591ba001b'
+            '75362c66901937fa2af038a9cea5494299284e2caaffedbd0d82ce9556b0ecd7'
+            '406dc6c28541f701e47f2b71766ce255f9af1633fe175f0580d33f78156bb526')
 b2sums=('ead966b0df7bb72ac9aa2aefb1e5f2dd020156a8e66f67aeff75d29606072ea7b147ddc4d6effea687baf4653e670bd3ad93fc9c7b0e7cac340cb1d5976adb14'
-        '2903992389c61fc4720cde8a011d0b637de647a7c9e701609968c01a8ab904277dfb27a90179d4cfcf98382973542e59d1384580236c25f6568aaa7b6ba90528'
-        '04d1e78d044666720a9a099a9b95426ea06fe076354698f642a1a24df25bc27a033e6823a56cbdc21b695cba0e71446f4278c9a1474dba2cfa6aa91945950266'
-        '8539531d52cbe02edd600ae02d179888a36ef0caac806c6951a7a68404bf5575e5afc451d1f6b250b6e3970d088a25396f26a442ef01e3af98ae338a9fd1dc76'
-        '1985ee3dbd596cf7ac4a3041b395792733d59c95de4226dc54ff33887db4ec4adc0ef877d294cf66da2926eb025166397fdf6ceb76bfd280932e3ecd9ae716ec'
-        'a2aae60cee2911c1fa45bdaa670cd04b552fe34624f62eaafc2ceaf648e283ed62e4bb0567dacf9733b6ef05e657514bda7a98800d735f32a15cb8fd452e150b'
-        '58e2e5f6706f17040a7674f6ae81c49e4bdac586228c51374615e7821a70cad8f508bdbd1dbb9d53db98713e5cb456c9b065512199385becdcaf7cb9bd7c1f4b'
-        '7b15d54811fd1d8ef908963abd76fe552f6149ea32e6f83eaecc6f0636d5e58ece857f86828bf650a2f762a02ca58640ff60dd0f9268666033da67be6e5e7ae1'
-        '8e35b9a826592b1a2f2adaa7400cf6cae1c43f04edec7f6a84f2a7c67b56d762685d484863c8f5b49cf55ed6c91c2d3935e851a4446415cc420104707e06201a'
-        '0b93c67f7a5c7d1a8f3e62eb94f70a5b93b1c2f7cdbce99dd5444ac52f27aa7198ed9a3172efbea382dd7a7f8aeb97fe54acecafc41bb48ac34379952867724e'
-        '798b7e21d44f8c68022b5f212f0235ef1558629db2d7356128b23736a9f97009cc85f48c77e30f5908832da46204d54444f0221675e917d3e3f85c0027c547dd'
-        '537301a740c8cbbb45905d28d8fb58069e3839020208e911515a4c0e7aba39bf3d5d53699ee54b42efead2d499b30f1fb77e5dde3aa7faadd0ac9bd45445f8dd')
+        '50d6416bf4e66438d92bfe23505114c55940e8b4411b4ac01adb7c30a200701d01a4f40519e9f29a57414cd9f28a6410353439caa83aab2fc09191b820c1a9d1'
+        'db7b8450f032276ba49e1510fb7ee33bd64f1249661bfb66ecf6107baaf691c474c0d213256e6307831c6157a67192cd1e9d4483f24306ccf3a9a6c4f82b3a08'
+        '57db881f3217b5247030c48e542b504d33909467f81f72ed45951c0a09074b06f54ebdd39fa73f40863ab9f808e80b928f51c720ec1a90eb036ab1684199b1da'
+        'a5589bc99841646223faaf2ff82c63e5eb9ff67ed218e2e7f06076ef6cf3c981954fc4a0f1fc8a1c391114916dde1e1903333fd18969dc7ec5f105f10eb42698'
+        '98391453940571cf68a31378a7c36c12a107de418c1ee0971ed62c665bc34558c52ce333b2fdf854d44bc1f833183518d7fb0ae8b21984f4a15416a7e085a96d'
+        '6658015968bcb040e8dea19c415737e66b3d8bceaf504d0b7990226cbe5210b5858262e928d0666691c2ce220905f22eea1a6989ac1e90505c029c4e86f714f1'
+        'b99c2c4e46533b1f7c72d6beb36cf0e7aef070141fb03c544731f1dbaee03f746f0cfb5888301ab39594482b86516a177d301e85a365b3db9e4bccfc62adca79'
+        '4dda3fd00f391003f600c73f8ac0812b44800e9c4b239ab58339e2b990e519439414951e71679b6faa95b5c7ff7abb9033ce936c1e792a1245e106a89b6f00d6'
+        '486a69b96da727b8a0185f2d5665b3b75187a91043d640eae431a576c9604d4f478f92a5624b78b1e1edc870827bb12d02a8b1b5433dfd89ade81e8c9208f602'
+        '73d0ba48c5d242dd3ba58119b1bdc4669bdaa58abe945eddd7f8180dc4510e2dc4fcdc32c55f562fa6282e00d6a8d23b378b51c28e99e1c6dcc5584c3e5133c9'
+        '7dbc862cf58454143f62511d843df380dd51ded785143cba60a7d7f8af603e104e19c49891ee1326a700ef07d7ce882e63fe7b4d87f5c056c61222f9f1f36fef'
+        'fd1ebf116a1d79c5faacb9b9b38751897ec76f427a1a872bb746430cbc5aa2e3a84a60adc66fc64ca63286b64b512500034c1ba819b58175f9cc2e7ff90deb67')
 
 prepare() {
   for patch in "${srcdir}"/*.patch; do