summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorhowetuft2022-01-30 15:26:14 +0100
committerbartoszek2022-02-10 10:45:54 +0100
commitc1c3e5892cb674f991a2ac2dab4e62a58bba35df (patch)
tree77b3f725247b02b77b953d485154453195179bcd
parent1c78a51240d22c58ac2e99c0bb87e577c8dc81f4 (diff)
downloadaur-c1c3e5892cb674f991a2ac2dab4e62a58bba35df.tar.gz
Version 2.6
Diffstat
-rw-r--r--.SRCINFO52
-rw-r--r--01-glfw.patch (renamed from glfw.patch)0
-rw-r--r--02-boost107400.patch (renamed from boost107400.patch)0
-rw-r--r--03-python.patch (renamed from python.patch)32
-rw-r--r--04-cpplib.patch (renamed from cpplib.patch)0
-rw-r--r--05-clang-isnan-isinf.patch28
-rw-r--r--06-openexr3.patch (renamed from openexr3.patch)646
-rw-r--r--07-silence-compiler-warnings.patch24
-rw-r--r--08-silence-preprocessing.patch25
-rw-r--r--09-openvdb.patch149
-rw-r--r--10-spdlog.patch25
-rw-r--r--PKGBUILD50
-rw-r--r--clang.patch16
-rw-r--r--fix_isnan_isinf.patch226
-rw-r--r--oidn124.patch16
15 files changed, 684 insertions, 605 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 25396199691c..47ac62478e74 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = luxcorerender
pkgdesc = Physically correct, unbiased rendering engine.
- pkgver = 2.5
+ pkgver = 2.6
pkgrel = 2
epoch = 2
url = https://www.luxcorerender.org/
@@ -22,35 +22,43 @@ pkgbase = luxcorerender
depends = gtk3
depends = openimagedenoise
depends = openimageio
+ depends = openvdb
+ depends = openmp
optdepends = opencl-driver: for gpu acceleration
optdepends = pyside2: for pyluxcoretools gui
provides = luxrays
- source = https://github.com/LuxCoreRender/LuxCore/archive/luxcorerender_v2.5.tar.gz
- source = python.patch
- source = glfw.patch
- source = oidn124.patch
- source = boost107400.patch
- source = cpplib.patch
- source = clang.patch
- source = fix_isnan_isinf.patch
- source = openexr3.patch
- sha256sums = f0d7000ee155eb30f0008ddf3a4e5eaf71b37e5aed94922a5d8131873778eb77
- sha256sums = f639fb7e31056b6c7214e303c90fe06665572ffafc11e545f7c05128a8d85dc4
+ 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
+ sha256sums = b844989b8229bf02f3c8aa6845be6a587aa5ae55a45861591119ad0e1a195867
sha256sums = 4e04c3eb653f00d2389aff8e7fda2d244e258cbca3a22e32c13388a3984e4bb1
- sha256sums = aec4cb388ed25944ef64abc8bd1dbcaa2da989ac0cf06acc026c1f82a817fa92
sha256sums = 8a8a681cce3a3ff39536cb0cbfefed8ed61887665ce1f4b101b3a222a1da50f6
+ sha256sums = 7c2cf9dd881fb738e468599a4babc445cfb0a5146d3b74519449b4a1a9602c07
sha256sums = 7203f773f94d632923a992824c66741a64f07a07fad932f5623ac9a257aa73a5
- sha256sums = ea4b15887c12931f34f01079ec3e0ff4c14d70b73b42dbc81140e7e19776bcc7
- sha256sums = 46ce376e155236acbf5f737df5e1ea50b0c7b1f18ae2398d0381d6fdbbc76fec
- sha256sums = 60c2e0a9d21cc45d72e2be3b80bfca2432552b65033fa67b69b0f94ac5abf5de
- b2sums = 3f28029cd7d2c49437b4e5b6ba5adc201f2e4bcf409450bb2a104d970c9dad5f300e81954ea10f13774a74a7fc1a08516832614674594e3078173b53609eda82
- b2sums = 348fa445b9ac7f738461543f8adadbb9a93dc2f75d96d0d26acbf7168290a0621224d6f11b3af77a6c6e492ae089e57770fc02a987af0748f5bb3e73b8d90f54
+ sha256sums = 763b41b8fd401c584efd147616d0b4eb4d30c76a7e9072a6c6a03189147530ad
+ sha256sums = 96d2bf957f7a0dfa3c25bd9345d7ca18d4fd89f7a6d3cae946eaf0d623917171
+ sha256sums = 8b7083d8aeedb2adecf078e06da028120c2f8354280c7ec7424b304ab3fd29bd
+ sha256sums = f81448ae200a3bd549dd551fd6f5db9bff4bd07270bb91e57672d2b1275e938b
+ sha256sums = 33bde7ca00b08ce568d07d70bf324104abe0b38f22e81531de459e98723828b4
+ sha256sums = 10375ea78ab9c1454211992179368a9fa84b79700a4a2ef2b47cb2f1c908699b
+ b2sums = ead966b0df7bb72ac9aa2aefb1e5f2dd020156a8e66f67aeff75d29606072ea7b147ddc4d6effea687baf4653e670bd3ad93fc9c7b0e7cac340cb1d5976adb14
b2sums = 2903992389c61fc4720cde8a011d0b637de647a7c9e701609968c01a8ab904277dfb27a90179d4cfcf98382973542e59d1384580236c25f6568aaa7b6ba90528
- b2sums = 67cf563120070fc675618bdc4da8b8b224bea42c50ac8aabbd3d6b254b4189f330d0f93678f02cd96748a1bb1560f5275ed4fb0c9b2066f67761027343da86ec
b2sums = 04d1e78d044666720a9a099a9b95426ea06fe076354698f642a1a24df25bc27a033e6823a56cbdc21b695cba0e71446f4278c9a1474dba2cfa6aa91945950266
+ b2sums = 8539531d52cbe02edd600ae02d179888a36ef0caac806c6951a7a68404bf5575e5afc451d1f6b250b6e3970d088a25396f26a442ef01e3af98ae338a9fd1dc76
b2sums = 1985ee3dbd596cf7ac4a3041b395792733d59c95de4226dc54ff33887db4ec4adc0ef877d294cf66da2926eb025166397fdf6ceb76bfd280932e3ecd9ae716ec
- b2sums = a11fa313592ce3fb3d0c59deb3bfcec4209697626e830e0b89a398a4f1a97e47c41c39ed29f164902f183dbace7232378641f3dd43e7a7bdf84e787d043c9590
- b2sums = 9a5fa2c8233e053bae4ad277e3c4677dbe8eee654f0fdbd7545e9ae98a36f084d00c47460a036ec1d58aac73564223bd0160ee47553eda19d49bac85c9274360
- b2sums = 7f4eab0d3f9c35ff63ca14ab5a23c863a9d940b925a0502d0ffc7ae2b3010f96b806162b1f6d885e1f8f12b39e2205ba6e57a483be2774fb8c2e4abb46b28a76
+ b2sums = a2aae60cee2911c1fa45bdaa670cd04b552fe34624f62eaafc2ceaf648e283ed62e4bb0567dacf9733b6ef05e657514bda7a98800d735f32a15cb8fd452e150b
+ b2sums = 58e2e5f6706f17040a7674f6ae81c49e4bdac586228c51374615e7821a70cad8f508bdbd1dbb9d53db98713e5cb456c9b065512199385becdcaf7cb9bd7c1f4b
+ b2sums = 7b15d54811fd1d8ef908963abd76fe552f6149ea32e6f83eaecc6f0636d5e58ece857f86828bf650a2f762a02ca58640ff60dd0f9268666033da67be6e5e7ae1
+ b2sums = 8e35b9a826592b1a2f2adaa7400cf6cae1c43f04edec7f6a84f2a7c67b56d762685d484863c8f5b49cf55ed6c91c2d3935e851a4446415cc420104707e06201a
+ b2sums = 0b93c67f7a5c7d1a8f3e62eb94f70a5b93b1c2f7cdbce99dd5444ac52f27aa7198ed9a3172efbea382dd7a7f8aeb97fe54acecafc41bb48ac34379952867724e
+ b2sums = 798b7e21d44f8c68022b5f212f0235ef1558629db2d7356128b23736a9f97009cc85f48c77e30f5908832da46204d54444f0221675e917d3e3f85c0027c547dd
pkgname = luxcorerender
diff --git a/glfw.patch b/01-glfw.patch
index 29c1e0fef7af..29c1e0fef7af 100644
--- a/glfw.patch
+++ b/01-glfw.patch
diff --git a/boost107400.patch b/02-boost107400.patch
index 7f7efccd5ca4..7f7efccd5ca4 100644
--- a/boost107400.patch
+++ b/02-boost107400.patch
diff --git a/python.patch b/03-python.patch
index ee6a94da8aa7..bcc15a27bc40 100644
--- a/python.patch
+++ b/03-python.patch
@@ -13,17 +13,18 @@ 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 be614b8e8..94918929e 100644
+index 96e09bc6a..cdb83231c 100644
--- a/samples/luxcoreconsole/CMakeLists.txt
+++ b/samples/luxcoreconsole/CMakeLists.txt
-@@ -28,4 +28,4 @@ set(LUXCORECONSOLE_SRCS
-
- add_executable(luxcoreconsole ${LUXCORECONSOLE_SRCS})
-
+@@ -31,5 +31,5 @@ add_executable(luxcoreconsole ${LUXCORECONSOLE_SRCS})
+ if(APPLE)
+ TARGET_LINK_LIBRARIES(luxcoreconsole expat "-framework Carbon" "-framework IOKit" ${LUXCORE_LIBRARY} ${Boost_LIBRARIES})
+ else()
-TARGET_LINK_LIBRARIES(luxcoreconsole ${LUXCORE_LIBRARY} ${Boost_LIBRARIES})
-\ No newline at end of file
+TARGET_LINK_LIBRARIES(luxcoreconsole ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
+ endif()
diff --git a/samples/luxcoredemo/CMakeLists.txt b/samples/luxcoredemo/CMakeLists.txt
index 194104caf..241dbd5f2 100644
--- a/samples/luxcoredemo/CMakeLists.txt
@@ -45,24 +46,27 @@ 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 c8b23001b..607f92b6a 100644
+index 8b74e0704..c6f9c88f1 100644
--- a/samples/luxcoreui/CMakeLists.txt
+++ b/samples/luxcoreui/CMakeLists.txt
-@@ -89,4 +92,5 @@ TARGET_LINK_LIBRARIES(luxcoreui
+@@ -100,7 +100,8 @@ TARGET_LINK_LIBRARIES(luxcoreui
+ glfw
+ ${GLFW_LIBRARIES}
${LUXCORE_LIBRARY}
${OPENGL_LIBRARIES}
${GTK3_LIBRARIES}
- ${Boost_LIBRARIES})
-+ ${Boost_LIBRARIES}
-+ ${PYTHON_LIBRARIES})
++ ${Boost_LIBRARIES}
++ ${PYTHON_LIBRARIES})
+ endif()
diff --git a/tests/luxcoreimplserializationdemo/CMakeLists.txt b/tests/luxcoreimplserializationdemo/CMakeLists.txt
-index edd6e6762..1875ee5cf 100644
+index bdd3445b8..a79c4a7b2 100644
--- a/tests/luxcoreimplserializationdemo/CMakeLists.txt
+++ b/tests/luxcoreimplserializationdemo/CMakeLists.txt
-@@ -30,4 +30,4 @@ include_directories(${LuxRays_SOURCE_DIR}/deps/bcd-1.1/include)
+@@ -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 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} ${PYTHON_LIBRARIES} ${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})
diff --git a/cpplib.patch b/04-cpplib.patch
index 1fb2e37a8376..1fb2e37a8376 100644
--- a/cpplib.patch
+++ b/04-cpplib.patch
diff --git a/05-clang-isnan-isinf.patch b/05-clang-isnan-isinf.patch
new file mode 100644
index 000000000000..caa11d354df9
--- /dev/null
+++ b/05-clang-isnan-isinf.patch
@@ -0,0 +1,28 @@
+From b232a8667d122064cdc24ee93d14139dedd42a48 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
+
+---
+ include/luxrays/utils/utils.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/include/luxrays/utils/utils.h b/include/luxrays/utils/utils.h
+index b6584b383..d48d7d93d 100644
+--- a/include/luxrays/utils/utils.h
++++ b/include/luxrays/utils/utils.h
+@@ -48,6 +48,11 @@ template <class T>
+ int isinf(T a) { return std::isinf(a); }
+ #endif
+
++#ifdef __clang__
++using std::isnan;
++using std::isinf;
++#endif
++
+ #if defined(__APPLE__)
+ #include <string>
+ #endif
+--
+2.34.1
+
diff --git a/openexr3.patch b/06-openexr3.patch
index 94e008b66f28..2dd77ff6b178 100644
--- a/openexr3.patch
+++ b/06-openexr3.patch
@@ -1,296 +1,364 @@
-diff --git a/cmake/Packages/FindOpenEXR.cmake b/cmake/Packages/FindOpenEXR.cmake
-index 02621d536..a2f7b4c62 100644
---- a/cmake/Packages/FindOpenEXR.cmake
-+++ b/cmake/Packages/FindOpenEXR.cmake
-@@ -1,123 +1,138 @@
--################################################################################
--# Copyright 1998-2020 by authors (see AUTHORS.txt)
-+# - Find OpenEXR library
-+# Find the native OpenEXR includes and library
-+# This module defines
-+# OPENEXR_INCLUDE_DIRS, where to find ImfXdr.h, etc. Set when
-+# OPENEXR_INCLUDE_DIR is found.
-+# OPENEXR_LIBRARIES, libraries to link against to use OpenEXR.
-+# OPENEXR_ROOT_DIR, The base directory to search for OpenEXR.
-+# This can also be an environment variable.
-+# OPENEXR_FOUND, If false, do not try to use OpenEXR.
- #
--# This file is part of LuxCoreRender.
-+# For individual library access these advanced settings are available
-+# OPENEXR_HALF_LIBRARY, Path to Half library
-+# OPENEXR_IEX_LIBRARY, Path to Half library
-+# OPENEXR_ILMIMF_LIBRARY, Path to Ilmimf library
-+# OPENEXR_ILMTHREAD_LIBRARY, Path to IlmThread library
-+# OPENEXR_IMATH_LIBRARY, Path to Imath library
- #
--# Licensed under the Apache License, Version 2.0 (the "License");
--# you may not use this file except in compliance with the License.
--# You may obtain a copy of the License at
--#
--# http://www.apache.org/licenses/LICENSE-2.0
--#
--# Unless required by applicable law or agreed to in writing, software
--# distributed under the License is distributed on an "AS IS" BASIS,
--# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--# See the License for the specific language governing permissions and
--# limitations under the License.
--################################################################################
--
--# - Try to find OpenEXR
--# Library is first searched for in OPENEXR_ROOT
--# Once done, this will define
-+# also defined, but not for general use are
-+# OPENEXR_LIBRARY, where to find the OpenEXR library.
-+
-+#=============================================================================
-+# Copyright 2011 Blender Foundation.
- #
--# OPENEXR_FOUND - system has OpenEXR
--# OPENEXR_INCLUDE_DIRS - the OpenEXR include directories
--# OPENEXR_LIBRARIES - link these to use OpenEXR
--
--# Lookup user specified path first
--SET(OpenEXR_TEST_HEADERS ImfXdr.h OpenEXRConfig.h IlmBaseConfig.h)
--SET(OpenEXR_INC_SUFFIXES include/OpenEXR include Include Headers)
--FIND_PATH(OPENEXR_INCLUDE_DIRS
-- NAMES ${OpenEXR_TEST_HEADERS}
-- PATHS "${OPENEXR_ROOT}"
-- PATH_SUFFIXES ${OpenEXR_INC_SUFFIXES}
-- NO_DEFAULT_PATH
-- DOC "The directory where IlmBaseConfig.h resides"
-+# Distributed under the OSI-approved BSD 3-Clause License,
-+# see accompanying file BSD-3-Clause-license.txt for details.
-+#=============================================================================
-+
-+# If OPENEXR_ROOT_DIR was defined in the environment, use it.
-+IF(NOT OPENEXR_ROOT_DIR AND NOT $ENV{OPENEXR_ROOT_DIR} STREQUAL "")
-+ SET(OPENEXR_ROOT_DIR $ENV{OPENEXR_ROOT_DIR})
-+ENDIF()
-+
-+# Old versions (before 2.0?) do not have any version string, just assuming this should be fine though.
-+SET(_openexr_libs_ver_init "2.0")
-+
-+SET(_openexr_FIND_COMPONENTS
-+ Iex
-+ Imath
-+ OpenEXR
-+ IlmThread
- )
--FIND_PATH(OPENEXR_INCLUDE_DIRS
-- NAMES ${OpenEXR_TEST_HEADERS}
-- PATHS /usr/local /usr /sw /opt/local /opt/csw /opt
-- PATH_SUFFIXES ${OpenEXR_INC_SUFFIXES}
-- DOC "The directory where IlmBaseConfig.h resides"
-+
-+SET(_openexr_SEARCH_DIRS
-+ ${OPENEXR_ROOT_DIR}
-+ /opt/lib/openexr
-+)
-+
-+FIND_PATH(OPENEXR_INCLUDE_DIR
-+ NAMES
-+ OpenEXR/ImfXdr.h
-+ HINTS
-+ ${_openexr_SEARCH_DIRS}
-+ PATH_SUFFIXES
-+ include
- )
+diff --git a/cmake/Packages/FindOpenEXR.cmake b/cmake/Packages/FindOpenEXR.cmake
+--- a/cmake/Packages/FindOpenEXR.cmake
++++ b/cmake/Packages/FindOpenEXR.cmake
+@@ -1,123 +1,138 @@
+-################################################################################
+-# Copyright 1998-2020 by authors (see AUTHORS.txt)
++# - Find OpenEXR library
++# Find the native OpenEXR includes and library
++# This module defines
++# OPENEXR_INCLUDE_DIRS, where to find ImfXdr.h, etc. Set when
++# OPENEXR_INCLUDE_DIR is found.
++# OPENEXR_LIBRARIES, libraries to link against to use OpenEXR.
++# OPENEXR_ROOT_DIR, The base directory to search for OpenEXR.
++# This can also be an environment variable.
++# OPENEXR_FOUND, If false, do not try to use OpenEXR.
+ #
+-# This file is part of LuxCoreRender.
++# For individual library access these advanced settings are available
++# OPENEXR_HALF_LIBRARY, Path to Half library
++# OPENEXR_IEX_LIBRARY, Path to Half library
++# OPENEXR_ILMIMF_LIBRARY, Path to Ilmimf library
++# OPENEXR_ILMTHREAD_LIBRARY, Path to IlmThread library
++# OPENEXR_IMATH_LIBRARY, Path to Imath library
+ #
+-# Licensed under the Apache License, Version 2.0 (the "License");
+-# you may not use this file except in compliance with the License.
+-# You may obtain a copy of the License at
+-#
+-# http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-################################################################################
+-
+-# - Try to find OpenEXR
+-# Library is first searched for in OPENEXR_ROOT
+-# Once done, this will define
++# also defined, but not for general use are
++# OPENEXR_LIBRARY, where to find the OpenEXR library.
++
++#=============================================================================
++# Copyright 2011 Blender Foundation.
+ #
+-# OPENEXR_FOUND - system has OpenEXR
+-# OPENEXR_INCLUDE_DIRS - the OpenEXR include directories
+-# OPENEXR_LIBRARIES - link these to use OpenEXR
+-
+-# Lookup user specified path first
+-SET(OpenEXR_TEST_HEADERS ImfXdr.h OpenEXRConfig.h IlmBaseConfig.h)
+-SET(OpenEXR_INC_SUFFIXES include/OpenEXR include Include Headers)
+-FIND_PATH(OPENEXR_INCLUDE_DIRS
+- NAMES ${OpenEXR_TEST_HEADERS}
+- PATHS "${OPENEXR_ROOT}"
+- PATH_SUFFIXES ${OpenEXR_INC_SUFFIXES}
+- NO_DEFAULT_PATH
+- DOC "The directory where IlmBaseConfig.h resides"
++# Distributed under the OSI-approved BSD 3-Clause License,
++# see accompanying file BSD-3-Clause-license.txt for details.
++#=============================================================================
++
++# If OPENEXR_ROOT_DIR was defined in the environment, use it.
++IF(NOT OPENEXR_ROOT_DIR AND NOT $ENV{OPENEXR_ROOT_DIR} STREQUAL "")
++ SET(OPENEXR_ROOT_DIR $ENV{OPENEXR_ROOT_DIR})
++ENDIF()
++
++# Old versions (before 2.0?) do not have any version string, just assuming this should be fine though.
++SET(_openexr_libs_ver_init "2.0")
++
++SET(_openexr_FIND_COMPONENTS
++ Iex
++ Imath
++ OpenEXR
++ IlmThread
+ )
+-FIND_PATH(OPENEXR_INCLUDE_DIRS
+- NAMES ${OpenEXR_TEST_HEADERS}
+- PATHS /usr/local /usr /sw /opt/local /opt/csw /opt
+- PATH_SUFFIXES ${OpenEXR_INC_SUFFIXES}
+- DOC "The directory where IlmBaseConfig.h resides"
++
++SET(_openexr_SEARCH_DIRS
++ ${OPENEXR_ROOT_DIR}
++ /opt/lib/openexr
++)
++
++FIND_PATH(OPENEXR_INCLUDE_DIR
++ NAMES
++ OpenEXR/ImfXdr.h
++ HINTS
++ ${_openexr_SEARCH_DIRS}
++ PATH_SUFFIXES
++ include
+ )
+
+-IF (OPENEXR_INCLUDE_DIRS)
+-# Lookup additional headers in case they are in subdirectories
+-SET(OpenEXR_MODULES Iex Imf half Imath IlmThread)
+-FOREACH(i ${OpenEXR_MODULES})
+- FIND_PATH(OpenEXR_${i}_INCLUDE_DIR
+- NAMES ${i}.h ${i}Header.h ${i}Math.h
+- PATHS "${OPENEXR_INCLUDE_DIRS}" "${OPENEXR_INCLUDE_DIRS}/${i}" "${OPENEXR_INCLUDE_DIRS}/Ilm${i}"
+- NO_DEFAULT_PATH
+- DOC "The directory where ${i}.h resides"
+- )
+-ENDFOREACH(i)
+-FOREACH(i ${OpenEXR_MODULES})
+- IF (NOT OpenEXR_${i}_INCLUDE_DIR)
+- SET(OpenEXR_${i}_INCLUDE_DIR "")
+- ENDIF (NOT OpenEXR_${i}_INCLUDE_DIR)
+- IF ("${OpenEXR_${i}_INCLUDE_DIR}" STREQUAL "${OPENEXR_INCLUDE_DIRS}")
+- SET(OpenEXR_${i}_INCLUDE_DIR "")
+- ENDIF ("${OpenEXR_${i}_INCLUDE_DIR}" STREQUAL "${OPENEXR_INCLUDE_DIRS}")
+-ENDFOREACH(i)
+-FOREACH(i ${OpenEXR_MODULES})
+- SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIRS} ${OpenEXR_${i}_INCLUDE_DIR})
+-ENDFOREACH(i)
+-ENDIF(OPENEXR_INCLUDE_DIRS)
+-
+-SET(OpenEXR_LIBRARY_MODULES Iex IlmImf Half Imath IlmThread)
+-SET(OpenEXR_LIB_SUFFIXES lib64 lib Lib lib/OpenEXR Libs x64/Release/lib)
+-SET(OpenEXR_LIB_SUFFIXES_REL)
+-SET(OpenEXR_LIB_SUFFIXES_DBG)
+-FOREACH(i ${OpenEXR_LIB_SUFFIXES})
+- SET(OpenEXR_LIB_SUFFIXES_REL ${OpenEXR_LIB_SUFFIXES_REL}
+- "${i}" "${i}/release" "${i}/relwithdebinfo" "${i}/minsizerel" "${i}/dist")
+- SET(OpenEXR_LIB_SUFFIXES_DBG ${OpenEXR_LIB_SUFFIXES_DBG}
+- "${i}" "${i}/debug" "${i}/dist")
+-ENDFOREACH(i)
+-SET(OPENEXR_LIBRARIES)
+-FOREACH(i ${OpenEXR_LIBRARY_MODULES})
+- FIND_LIBRARY(OpenEXR_${i}_LIBRARY_REL
+- NAMES ${i}
+- PATHS "${OPENEXR_ROOT}"
+- PATH_SUFFIXES ${OpenEXR_LIB_SUFFIXES_REL}
+- NO_DEFAULT_PATH
+- DOC "The ${i} release library"
+- )
+- FIND_LIBRARY(OpenEXR_${i}_LIBRARY_REL
+- NAMES ${i}
+- PATHS /usr/local /usr /sw /opt/local /opt/csw /opt
+- PATH_SUFFIXES ${OpenEXR_LIB_SUFFIXES_REL}
+- DOC "The ${i} release library"
+- )
+- FIND_LIBRARY(OpenEXR_${i}_LIBRARY_DBG
+- NAMES "${i}d" "${i}D" "${i}_d" "${i}_D" "${i}_debug"
+- PATHS "${OPENEXR_ROOT}"
+- PATH_SUFFIXES ${OpenEXR_LIB_SUFFIXES_DBG}
+- NO_DEFAULT_PATH
+- DOC "The ${i} debug library"
+- )
+- FIND_LIBRARY(OpenEXR_${i}_LIBRARY_DBG
+- NAMES "${i}d" "${i}D" "${i}_d" "${i}_D" "${i}_debug"
+- PATHS /usr/local /usr /sw /opt/local /opt/csw /opt
+- PATH_SUFFIXES ${OpenEXR_LIB_SUFFIXES_DBG}
+- DOC "The ${i} debug library"
+- )
+- IF (OpenEXR_${i}_LIBRARY_REL AND OpenEXR_${i}_LIBRARY_DBG)
+- SET(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES}
+- optimized ${OpenEXR_${i}_LIBRARY_REL}
+- debug ${OpenEXR_${i}_LIBRARY_DBG})
+- ELSEIF (OpenEXR_${i}_LIBRARY_REL)
+- SET(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES}
+- ${OpenEXR_${i}_LIBRARY_REL})
+- ELSEIF (OpenEXR_${i}_LIBRARY_DBG)
+- SET(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES}
+- ${OpenEXR_${i}_LIBRARY_DBG})
+- ENDIF (OpenEXR_${i}_LIBRARY_REL AND OpenEXR_${i}_LIBRARY_DBG)
+-ENDFOREACH (i)
++# If the headers were found, get the version from config file, if not already set.
++IF(OPENEXR_INCLUDE_DIR)
++ IF(NOT OPENEXR_VERSION)
++
++ FIND_FILE(_openexr_CONFIG
++ NAMES
++ OpenEXRConfig.h
++ PATHS
++ "${OPENEXR_INCLUDE_DIR}"
++ "${OPENEXR_INCLUDE_DIR}/OpenEXR"
++ NO_DEFAULT_PATH
++ )
++
++ IF(_openexr_CONFIG)
++ FILE(STRINGS "${_openexr_CONFIG}" OPENEXR_BUILD_SPECIFICATION
++ REGEX "^[ \t]*#define[ \t]+OPENEXR_VERSION_STRING[ \t]+\"[.0-9]+\".*$")
++ ELSE()
++ MESSAGE(WARNING "Could not find \"OpenEXRConfig.h\" in \"${OPENEXR_INCLUDE_DIR}\"")
++ ENDIF()
+
++ IF(OPENEXR_BUILD_SPECIFICATION)
++ MESSAGE(STATUS "${OPENEXR_BUILD_SPECIFICATION}")
++ STRING(REGEX REPLACE ".*#define[ \t]+OPENEXR_VERSION_STRING[ \t]+\"([.0-9]+)\".*"
++ "\\1" _openexr_libs_ver_init ${OPENEXR_BUILD_SPECIFICATION})
++ ELSE()
++ MESSAGE(WARNING "Could not determine ILMBase library version, assuming ${_openexr_libs_ver_init}.")
++ ENDIF()
++
++ UNSET(_openexr_CONFIG CACHE)
++
++ ENDIF()
++ENDIF()
++
++SET("OPENEXR_VERSION" ${_openexr_libs_ver_init} CACHE STRING "Version of OpenEXR lib")
++UNSET(_openexr_libs_ver_init)
++
++STRING(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver ${OPENEXR_VERSION})
++
++SET(_openexr_LIBRARIES)
++FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
++ STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
++
++ FIND_LIBRARY(OPENEXR_${UPPERCOMPONENT}_LIBRARY
++ NAMES
++ ${COMPONENT}-${_openexr_libs_ver} ${COMPONENT}
++ NAMES_PER_DIR
++ HINTS
++ ${_openexr_SEARCH_DIRS}
++ PATH_SUFFIXES
++ lib64 lib
++ )
++ LIST(APPEND _openexr_LIBRARIES "${OPENEXR_${UPPERCOMPONENT}_LIBRARY}")
++ENDFOREACH()
++
++UNSET(_openexr_libs_ver)
++
++# handle the QUIETLY and REQUIRED arguments and set OPENEXR_FOUND to TRUE if
++# all listed variables are TRUE
+ INCLUDE(FindPackageHandleStandardArgs)
+-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENEXR DEFAULT_MSG OPENEXR_LIBRARIES OPENEXR_INCLUDE_DIRS)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG
++ _openexr_LIBRARIES OPENEXR_INCLUDE_DIR)
+
+-MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIRS OPENEXR_LIBRARIES)
++IF(OPENEXR_FOUND)
++ SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES})
++ # Both include paths are needed because of dummy OSL headers mixing #include <OpenEXR/foo.h> and #include <foo.h> :(
++ SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR ${OPENEXR_INCLUDE_DIR}/Imath)
++ENDIF()
++
++MARK_AS_ADVANCED(
++ OPENEXR_INCLUDE_DIR
++ OPENEXR_VERSION
++)
++FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
++ STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
++ MARK_AS_ADVANCED(OPENEXR_${UPPERCOMPONENT}_LIBRARY)
++ENDFOREACH()
+
++UNSET(COMPONENT)
++UNSET(UPPERCOMPONENT)
++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
+--- a/deps/opencolorio-2.0.0/src/OpenColorIO/BitDepthUtils.h
++++ b/deps/opencolorio-2.0.0/src/OpenColorIO/BitDepthUtils.h
+@@ -7,7 +7,7 @@
--IF (OPENEXR_INCLUDE_DIRS)
--# Lookup additional headers in case they are in subdirectories
--SET(OpenEXR_MODULES Iex Imf half Imath IlmThread)
--FOREACH(i ${OpenEXR_MODULES})
-- FIND_PATH(OpenEXR_${i}_INCLUDE_DIR
-- NAMES ${i}.h ${i}Header.h ${i}Math.h
-- PATHS "${OPENEXR_INCLUDE_DIRS}" "${OPENEXR_INCLUDE_DIRS}/${i}" "${OPENEXR_INCLUDE_DIRS}/Ilm${i}"
-- NO_DEFAULT_PATH
-- DOC "The directory where ${i}.h resides"
-- )
--ENDFOREACH(i)
--FOREACH(i ${OpenEXR_MODULES})
-- IF (NOT OpenEXR_${i}_INCLUDE_DIR)
-- SET(OpenEXR_${i}_INCLUDE_DIR)
-- ENDIF (NOT OpenEXR_${i}_INCLUDE_DIR)
-- IF ("${OpenEXR_${i}_INCLUDE_DIR}" STREQUAL "${OPENEXR_INCLUDE_DIRS}")
-- SET(OpenEXR_${i}_INCLUDE_DIR "")
-- ENDIF ("${OpenEXR_${i}_INCLUDE_DIR}" STREQUAL "${OPENEXR_INCLUDE_DIRS}")
--ENDFOREACH(i)
--FOREACH(i ${OpenEXR_MODULES})
-- SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIRS} ${OpenEXR_${i}_INCLUDE_DIR})
--ENDFOREACH(i)
--ENDIF(OPENEXR_INCLUDE_DIRS)
--
--SET(OpenEXR_LIBRARY_MODULES Iex IlmImf Half Imath IlmThread)
--SET(OpenEXR_LIB_SUFFIXES lib64 lib Lib lib/OpenEXR Libs x64/Release/lib)
--SET(OpenEXR_LIB_SUFFIXES_REL)
--SET(OpenEXR_LIB_SUFFIXES_DBG)
--FOREACH(i ${OpenEXR_LIB_SUFFIXES})
-- SET(OpenEXR_LIB_SUFFIXES_REL ${OpenEXR_LIB_SUFFIXES_REL}
-- "${i}" "${i}/release" "${i}/relwithdebinfo" "${i}/minsizerel" "${i}/dist")
-- SET(OpenEXR_LIB_SUFFIXES_DBG ${OpenEXR_LIB_SUFFIXES_DBG}
-- "${i}" "${i}/debug" "${i}/dist")
--ENDFOREACH(i)
--SET(OPENEXR_LIBRARIES)
--FOREACH(i ${OpenEXR_LIBRARY_MODULES})
-- FIND_LIBRARY(OpenEXR_${i}_LIBRARY_REL
-- NAMES ${i}
-- PATHS "${OPENEXR_ROOT}"
-- PATH_SUFFIXES ${OpenEXR_LIB_SUFFIXES_REL}
-- NO_DEFAULT_PATH
-- DOC "The ${i} release library"
-- )
-- FIND_LIBRARY(OpenEXR_${i}_LIBRARY_REL
-- NAMES ${i}
-- PATHS /usr/local /usr /sw /opt/local /opt/csw /opt
-- PATH_SUFFIXES ${OpenEXR_LIB_SUFFIXES_REL}
-- DOC "The ${i} release library"
-- )
-- FIND_LIBRARY(OpenEXR_${i}_LIBRARY_DBG
-- NAMES "${i}d" "${i}D" "${i}_d" "${i}_D" "${i}_debug"
-- PATHS "${OPENEXR_ROOT}"
-- PATH_SUFFIXES ${OpenEXR_LIB_SUFFIXES_DBG}
-- NO_DEFAULT_PATH
-- DOC "The ${i} debug library"
-- )
-- FIND_LIBRARY(OpenEXR_${i}_LIBRARY_DBG
-- NAMES "${i}d" "${i}D" "${i}_d" "${i}_D" "${i}_debug"
-- PATHS /usr/local /usr /sw /opt/local /opt/csw /opt
-- PATH_SUFFIXES ${OpenEXR_LIB_SUFFIXES_DBG}
-- DOC "The ${i} debug library"
-- )
-- IF (OpenEXR_${i}_LIBRARY_REL AND OpenEXR_${i}_LIBRARY_DBG)
-- SET(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES}
-- optimized ${OpenEXR_${i}_LIBRARY_REL}
-- debug ${OpenEXR_${i}_LIBRARY_DBG})
-- ELSEIF (OpenEXR_${i}_LIBRARY_REL)
-- SET(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES}
-- ${OpenEXR_${i}_LIBRARY_REL})
-- ELSEIF (OpenEXR_${i}_LIBRARY_DBG)
-- SET(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES}
-- ${OpenEXR_${i}_LIBRARY_DBG})
-- ENDIF (OpenEXR_${i}_LIBRARY_REL AND OpenEXR_${i}_LIBRARY_DBG)
--ENDFOREACH (i)
-+# If the headers were found, get the version from config file, if not already set.
-+IF(OPENEXR_INCLUDE_DIR)
-+ IF(NOT OPENEXR_VERSION)
-+
-+ FIND_FILE(_openexr_CONFIG
-+ NAMES
-+ OpenEXRConfig.h
-+ PATHS
-+ "${OPENEXR_INCLUDE_DIR}"
-+ "${OPENEXR_INCLUDE_DIR}/OpenEXR"
-+ NO_DEFAULT_PATH
-+ )
-+
-+ IF(_openexr_CONFIG)
-+ FILE(STRINGS "${_openexr_CONFIG}" OPENEXR_BUILD_SPECIFICATION
-+ REGEX "^[ \t]*#define[ \t]+OPENEXR_VERSION_STRING[ \t]+\"[.0-9]+\".*$")
-+ ELSE()
-+ MESSAGE(WARNING "Could not find \"OpenEXRConfig.h\" in \"${OPENEXR_INCLUDE_DIR}\"")
-+ ENDIF()
+ #include <OpenColorIO/OpenColorIO.h>
-+ IF(OPENEXR_BUILD_SPECIFICATION)
-+ MESSAGE(STATUS "${OPENEXR_BUILD_SPECIFICATION}")
-+ STRING(REGEX REPLACE ".*#define[ \t]+OPENEXR_VERSION_STRING[ \t]+\"([.0-9]+)\".*"
-+ "\\1" _openexr_libs_ver_init ${OPENEXR_BUILD_SPECIFICATION})
-+ ELSE()
-+ MESSAGE(WARNING "Could not determine ILMBase library version, assuming ${_openexr_libs_ver_init}.")
-+ ENDIF()
-+
-+ UNSET(_openexr_CONFIG CACHE)
-+
-+ ENDIF()
-+ENDIF()
-+
-+SET("OPENEXR_VERSION" ${_openexr_libs_ver_init} CACHE STRING "Version of OpenEXR lib")
-+UNSET(_openexr_libs_ver_init)
-+
-+STRING(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver ${OPENEXR_VERSION})
-+
-+SET(_openexr_LIBRARIES)
-+FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
-+ STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-+
-+ FIND_LIBRARY(OPENEXR_${UPPERCOMPONENT}_LIBRARY
-+ NAMES
-+ ${COMPONENT}-${_openexr_libs_ver} ${COMPONENT}
-+ NAMES_PER_DIR
-+ HINTS
-+ ${_openexr_SEARCH_DIRS}
-+ PATH_SUFFIXES
-+ lib64 lib
-+ )
-+ LIST(APPEND _openexr_LIBRARIES "${OPENEXR_${UPPERCOMPONENT}_LIBRARY}")
-+ENDFOREACH()
-+
-+UNSET(_openexr_libs_ver)
-+
-+# handle the QUIETLY and REQUIRED arguments and set OPENEXR_FOUND to TRUE if
-+# all listed variables are TRUE
- INCLUDE(FindPackageHandleStandardArgs)
--FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENEXR DEFAULT_MSG OPENEXR_LIBRARIES OPENEXR_INCLUDE_DIRS)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG
-+ _openexr_LIBRARIES OPENEXR_INCLUDE_DIR)
+-#include "OpenEXR/half.h"
++#include "Imath/half.h"
--MARK_AS_ADVANCED(OPENEXR_INCLUDE_DIRS OPENEXR_LIBRARIES)
-+IF(OPENEXR_FOUND)
-+ SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES})
-+ # Both include paths are needed because of dummy OSL headers mixing #include <OpenEXR/foo.h> and #include <foo.h> :(
-+ SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR ${OPENEXR_INCLUDE_DIR}/Imath)
-+ENDIF()
-+
-+MARK_AS_ADVANCED(
-+ OPENEXR_INCLUDE_DIR
-+ OPENEXR_VERSION
-+)
-+FOREACH(COMPONENT ${_openexr_FIND_COMPONENTS})
-+ STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-+ MARK_AS_ADVANCED(OPENEXR_${UPPERCOMPONENT}_LIBRARY)
-+ENDFOREACH()
-+UNSET(COMPONENT)
-+UNSET(UPPERCOMPONENT)
-+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
-index e053ddeb2..10ad649c4 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
+ 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
+--- a/deps/opencolorio-2.0.0/src/OpenColorIO/MathUtils.h
++++ b/deps/opencolorio-2.0.0/src/OpenColorIO/MathUtils.h
+@@ -9,7 +9,7 @@
+
+ #include <OpenColorIO/OpenColorIO.h>
+
+-#include "OpenEXR/half.h"
++#include "Imath/half.h"
+
+ 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
+--- 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 @@
+ #include <OpenColorIO/OpenColorIO.h>
+
+ #include "GpuShaderUtils.h"
+-#include "OpenEXR/half.h"
++#include "Imath/half.h"
+ #include "HashUtils.h"
+ #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
+--- 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 @@
+
+ #include <OpenColorIO/OpenColorIO.h>
+
+-#include "OpenEXR/half.h"
++#include "Imath/half.h"
+ #include "ops/fixedfunction/FixedFunctionOp.h"
+ #include "ops/gradingrgbcurve/GradingRGBCurveOp.h"
+ #include "ops/log/LogOp.h"
+diff --git a/deps/opencolorio-2.0.0/src/OpenColorIO/transforms/builtins/OpHelpers.cpp b/deps/opencolorio-2.0.0/src/OpenColorIO/transforms/builtins/OpHelpers.cpp
+index 04b8fbd40..288ca5668 100644
+--- a/deps/opencolorio-2.0.0/src/OpenColorIO/transforms/builtins/OpHelpers.cpp
++++ b/deps/opencolorio-2.0.0/src/OpenColorIO/transforms/builtins/OpHelpers.cpp
+@@ -4,7 +4,7 @@
+
+ #include <OpenColorIO/OpenColorIO.h>
+
+-#include "OpenEXR/half.h"
++#include "Imath/half.h"
+ #include "ops/lut1d/Lut1DOp.h"
+ #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
+--- 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 @@
+ #include <OpenColorIO/OpenColorIO.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 "oiiohelpers.h"
+ #include "utils/StringUtils.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
-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/07-silence-compiler-warnings.patch b/07-silence-compiler-warnings.patch
new file mode 100644
index 000000000000..70634c305da0
--- /dev/null
+++ b/07-silence-compiler-warnings.patch
@@ -0,0 +1,24 @@
+From 1d8d704a0562a7d98036a6c08d647681d3d9fe7b 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
+
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 78316b671..74f5465ef 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,6 +45,7 @@ unset(CMAKE_CONFIGURATION_TYPES CACHE)
+ # This boots up the generator:
+ enable_language(C)
+ enable_language(CXX)
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
+
+ if (CMAKE_CONFIGURATION_TYPES)
+
+--
+2.34.1
+
diff --git a/08-silence-preprocessing.patch b/08-silence-preprocessing.patch
new file mode 100644
index 000000000000..b34955cb393f
--- /dev/null
+++ b/08-silence-preprocessing.patch
@@ -0,0 +1,25 @@
+From dc8e0bc7d6c630914c79506f9dc29d4e731a501d 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
+
+---
+ cmake/KernelPreprocess.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/KernelPreprocess.cmake b/cmake/KernelPreprocess.cmake
+index d877f0ef3..3d71d4a57 100644
+--- a/cmake/KernelPreprocess.cmake
++++ b/cmake/KernelPreprocess.cmake
+@@ -23,7 +23,7 @@
+ ################################################################################
+
+ FUNCTION(PreprocessOCLKernel NAMESPACE KERNEL SRC DST)
+- MESSAGE(STATUS "Preprocessing OpenCL kernel: " ${SRC} " => " ${DST} )
++ #MESSAGE(STATUS "Preprocessing OpenCL kernel: " ${SRC} " => " ${DST} )
+
+ add_custom_command(
+ OUTPUT ${DST}
+--
+2.34.1
+
diff --git a/09-openvdb.patch b/09-openvdb.patch
new file mode 100644
index 000000000000..c795b02421e7
--- /dev/null
+++ b/09-openvdb.patch
@@ -0,0 +1,149 @@
+From 2c647ad8d0c29dc85da0a1b9d62ddb39f776e669 Mon Sep 17 00:00:00 2001
+From: howetuft <howetuft@gmail.com>
+Date: Mon, 31 Jan 2022 21:43:01 +0100
+Subject: [PATCH] openvdb
+
+---
+ CMakeLists.txt | 12 +++++++++++-
+ samples/luxcoreconsole/CMakeLists.txt | 2 +-
+ samples/luxcoredemo/CMakeLists.txt | 2 +-
+ samples/luxcorescenedemo/CMakeLists.txt | 2 +-
+ samples/luxcoreui/CMakeLists.txt | 3 ++-
+ src/luxcore/CMakeLists.txt | 5 ++---
+ src/slg/CMakeLists.txt | 7 +------
+ tests/luxcoreimplserializationdemo/CMakeLists.txt | 2 +-
+ 8 files changed, 20 insertions(+), 15 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 74f5465ef..586ca9ece 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,6 +46,8 @@ unset(CMAKE_CONFIGURATION_TYPES CACHE)
+ enable_language(C)
+ enable_language(CXX)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
++set(CMAKE_CXX_STANDARD 14)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+ if (CMAKE_CONFIGURATION_TYPES)
+
+@@ -111,6 +113,14 @@ include_directories("${LuxRays_SOURCE_DIR}/deps/robin-hood-hashing-3.9.1/src/inc
+ # Find dependencies
+ include(Dependencies)
+
++SET(Boost_Save ${Boost_LIBRARIES})
++find_package(OpenVDB)
++LIST(APPEND Boost_LIBRARIES ${Boost_Save})
++
++if (NOT OpenVDB_FOUND)
++ MESSAGE(FATAL_ERROR "--> Could not locate required OpenVDB files - Please check ${OpenVDB_SEARCH_PATH}")
++endif()
++
+ if (NOT Boost_FOUND)
+ MESSAGE(FATAL_ERROR "--> Could not locate required Boost files - Please check ${BOOST_SEARCH_PATH}")
+ endif()
+@@ -174,7 +184,7 @@ if (BUILD_LUXCORE_DLL)
+ set(LUXCORE_LIBRARY luxcore)
+ ADD_DEFINITIONS("-DLUXCORE_DLL")
+ else()
+- set(LUXCORE_LIBRARY 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})
++ set(LUXCORE_LIBRARY luxcore slg-core slg-film slg-kernels luxrays bcd opensubdiv ${OPENVDB_LIBRARY} opencolorio ${BLOSC_LIBRARY} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
+ endif()
+
+ ################################################################################
+diff --git a/samples/luxcoreconsole/CMakeLists.txt b/samples/luxcoreconsole/CMakeLists.txt
+index cdb83231c..638bcd1da 100644
+--- a/samples/luxcoreconsole/CMakeLists.txt
++++ b/samples/luxcoreconsole/CMakeLists.txt
+@@ -31,5 +31,5 @@ add_executable(luxcoreconsole ${LUXCORECONSOLE_SRCS})
+ if(APPLE)
+ TARGET_LINK_LIBRARIES(luxcoreconsole expat "-framework Carbon" "-framework IOKit" ${LUXCORE_LIBRARY} ${Boost_LIBRARIES})
+ else()
+-TARGET_LINK_LIBRARIES(luxcoreconsole ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
++TARGET_LINK_LIBRARIES(luxcoreconsole opencolorio ${OpenVDB_LIBRARIES} ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
+ endif()
+diff --git a/samples/luxcoredemo/CMakeLists.txt b/samples/luxcoredemo/CMakeLists.txt
+index 241dbd5f2..c7ac7ac77 100644
+--- a/samples/luxcoredemo/CMakeLists.txt
++++ b/samples/luxcoredemo/CMakeLists.txt
+@@ -29,4 +29,4 @@ set(LUXCORELIBDEMO_SRCS
+ add_executable(luxcoredemo ${LUXCORELIBDEMO_SRCS})
+ add_definitions(${VISIBILITY_FLAGS})
+
+-TARGET_LINK_LIBRARIES(luxcoredemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${OPENCL_LIBRARIES} ${CUDA_ALL_LIBRARIES})
++TARGET_LINK_LIBRARIES(luxcoredemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${OPENCL_LIBRARIES} ${CUDA_ALL_LIBRARIES} ${OpenVDB_LIBRARIES})
+diff --git a/samples/luxcorescenedemo/CMakeLists.txt b/samples/luxcorescenedemo/CMakeLists.txt
+index 504739572..f428305ec 100644
+--- a/samples/luxcorescenedemo/CMakeLists.txt
++++ b/samples/luxcorescenedemo/CMakeLists.txt
+@@ -29,4 +29,4 @@ set(LUXCORESCENEDEMO_SRCS
+ add_executable(luxcorescenedemo ${LUXCORESCENEDEMO_SRCS})
+ add_definitions(${VISIBILITY_FLAGS})
+
+-TARGET_LINK_LIBRARIES(luxcorescenedemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
++TARGET_LINK_LIBRARIES(luxcorescenedemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${OpenVDB_LIBRARIES})
+diff --git a/samples/luxcoreui/CMakeLists.txt b/samples/luxcoreui/CMakeLists.txt
+index 80325af7e..92f1784f7 100644
+--- a/samples/luxcoreui/CMakeLists.txt
++++ b/samples/luxcoreui/CMakeLists.txt
+@@ -104,5 +104,6 @@ TARGET_LINK_LIBRARIES(luxcoreui
+ ${OPENGL_LIBRARIES}
+ ${GTK3_LIBRARIES}
+ ${Boost_LIBRARIES}
+- ${PYTHON_LIBRARIES})
++ ${PYTHON_LIBRARIES}
++ ${OpenVDB_LIBRARIES})
+ endif()
+diff --git a/src/luxcore/CMakeLists.txt b/src/luxcore/CMakeLists.txt
+index f96f5284e..a8df6d601 100644
+--- a/src/luxcore/CMakeLists.txt
++++ b/src/luxcore/CMakeLists.txt
+@@ -175,15 +175,14 @@ set(PYLUXCORE_SRCS
+
+ add_library(pyluxcore MODULE ${PYLUXCORE_SRCS} ${LUXCORE_LIB_SRCS} ${LUX_PARSER_SRC})
+
+-include_directories(${LuxRays_SOURCE_DIR}/deps/openvdb-7.0.0)
++include_directories(${OpenVDB_INCLUDE_DIRS})
+ include_directories(${LuxRays_SOURCE_DIR}/deps/opencolorio-2.0.0/include)
+
+-add_definitions(-DOPENVDB_STATICLIB ${VISIBILITY_FLAGS})
+ if(APPLE)
+ target_link_libraries(pyluxcore -Wl,-undefined -Wl,dynamic_lookup slg-core slg-film slg-kernels luxrays bcd opensubdiv openvdb opencolorio expat ${BLOSC_LIBRARY} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
+ SET_TARGET_PROPERTIES(pyluxcore PROPERTIES XCODE_ATTRIBUTE_DEPLOYMENT_POSTPROCESSING NO) # exclude pylux from strip, not possible
+ else()
+- target_link_libraries(pyluxcore PRIVATE 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})
++ target_link_libraries(pyluxcore PRIVATE slg-core slg-film slg-kernels luxrays bcd opensubdiv ${OpenVDB_LIBRARIES} opencolorio ${BLOSC_LIBRARY} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
+ endif()
+
+ set_target_properties(pyluxcore PROPERTIES PREFIX "")
+diff --git a/src/slg/CMakeLists.txt b/src/slg/CMakeLists.txt
+index 2f1bf79cc..9424b82bc 100644
+--- a/src/slg/CMakeLists.txt
++++ b/src/slg/CMakeLists.txt
+@@ -143,12 +143,7 @@ set(OPENVDB_SRCS
+
+ SOURCE_GROUP("Source Files\\OpenVDB Library" FILES ${OPENVDB_SRCS})
+
+-include_directories(${LuxRays_SOURCE_DIR}/deps/openvdb-7.0.0)
+-
+-# Required by OpenVDB to read ABI 3
+-#add_definitions("-D OPENVDB_USE_DEPRECATED_ABI -DOPENVDB_3_ABI_COMPATIBLE -DOPENVDB_STATICLIB -DOPENVDB_OPENEXR_STATICLIB")
+-add_definitions("-DOPENVDB_USE_BLOSC -DOPENVDB_STATICLIB -DOPENVDB_OPENEXR_STATICLIB")
+-add_library(openvdb STATIC ${OPENVDB_SRCS})
++include_directories(${OpenVDB_INCLUDE_DIRS})
+
+ ###########################################################################
+ #
+diff --git a/tests/luxcoreimplserializationdemo/CMakeLists.txt b/tests/luxcoreimplserializationdemo/CMakeLists.txt
+index e5bb5f083..8f458eda1 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})
+--
+2.34.1
+
diff --git a/10-spdlog.patch b/10-spdlog.patch
new file mode 100644
index 000000000000..cf41c3dc52aa
--- /dev/null
+++ b/10-spdlog.patch
@@ -0,0 +1,25 @@
+From ba61584912b0846607cfc82edf8157016a7da62f Mon Sep 17 00:00:00 2001
+From: howetuft <howetuft@gmail.com>
+Date: Mon, 31 Jan 2022 21:51:23 +0100
+Subject: [PATCH] spdlog
+
+---
+ deps/spdlog-1.8.0/include/spdlog/common-inl.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/deps/spdlog-1.8.0/include/spdlog/common-inl.h b/deps/spdlog-1.8.0/include/spdlog/common-inl.h
+index be0d8f8ea..4e5a09cb9 100644
+--- a/deps/spdlog-1.8.0/include/spdlog/common-inl.h
++++ b/deps/spdlog-1.8.0/include/spdlog/common-inl.h
+@@ -54,7 +54,7 @@ SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg)
+ SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno)
+ {
+ memory_buf_t outbuf;
+- fmt::format_system_error(outbuf, last_errno, msg);
++ fmt::format_system_error(outbuf, last_errno, msg.c_str());
+ msg_ = fmt::to_string(outbuf);
+ }
+
+--
+2.34.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 2d044f4c8796..fddf34ed735f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@
}
pkgname=luxcorerender
-pkgver=2.5
+pkgver=2.6
#_rel="rc1"
[ -n "${_rel}" ] && _pkgver=${pkgver}${_rel} && pkgver+=".${_rel}" || _pkgver=${pkgver}
_name=LuxCore-${pkgname}_v${_pkgver}
@@ -28,38 +28,44 @@ pkgdesc="Physically correct, unbiased rendering engine."
arch=('x86_64')
url="https://www.luxcorerender.org/"
license=('Apache')
-depends+=(blosc boost-libs embree glfw gtk3 openimagedenoise openimageio)
+depends+=(blosc boost-libs embree glfw gtk3 openimagedenoise openimageio openvdb openmp)
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"
- "python.patch"
- "glfw.patch"
- "oidn124.patch"
- "boost107400.patch"
- "cpplib.patch"
- "clang.patch"
- "fix_isnan_isinf.patch"
- "openexr3.patch"
+ "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"
)
-sha256sums=('f0d7000ee155eb30f0008ddf3a4e5eaf71b37e5aed94922a5d8131873778eb77'
- 'f639fb7e31056b6c7214e303c90fe06665572ffafc11e545f7c05128a8d85dc4'
+sha256sums=('b844989b8229bf02f3c8aa6845be6a587aa5ae55a45861591119ad0e1a195867'
'4e04c3eb653f00d2389aff8e7fda2d244e258cbca3a22e32c13388a3984e4bb1'
- 'aec4cb388ed25944ef64abc8bd1dbcaa2da989ac0cf06acc026c1f82a817fa92'
'8a8a681cce3a3ff39536cb0cbfefed8ed61887665ce1f4b101b3a222a1da50f6'
+ '7c2cf9dd881fb738e468599a4babc445cfb0a5146d3b74519449b4a1a9602c07'
'7203f773f94d632923a992824c66741a64f07a07fad932f5623ac9a257aa73a5'
- 'ea4b15887c12931f34f01079ec3e0ff4c14d70b73b42dbc81140e7e19776bcc7'
- '46ce376e155236acbf5f737df5e1ea50b0c7b1f18ae2398d0381d6fdbbc76fec'
- '60c2e0a9d21cc45d72e2be3b80bfca2432552b65033fa67b69b0f94ac5abf5de')
-b2sums=('3f28029cd7d2c49437b4e5b6ba5adc201f2e4bcf409450bb2a104d970c9dad5f300e81954ea10f13774a74a7fc1a08516832614674594e3078173b53609eda82'
- '348fa445b9ac7f738461543f8adadbb9a93dc2f75d96d0d26acbf7168290a0621224d6f11b3af77a6c6e492ae089e57770fc02a987af0748f5bb3e73b8d90f54'
+ '763b41b8fd401c584efd147616d0b4eb4d30c76a7e9072a6c6a03189147530ad'
+ '96d2bf957f7a0dfa3c25bd9345d7ca18d4fd89f7a6d3cae946eaf0d623917171'
+ '8b7083d8aeedb2adecf078e06da028120c2f8354280c7ec7424b304ab3fd29bd'
+ 'f81448ae200a3bd549dd551fd6f5db9bff4bd07270bb91e57672d2b1275e938b'
+ '33bde7ca00b08ce568d07d70bf324104abe0b38f22e81531de459e98723828b4'
+ '10375ea78ab9c1454211992179368a9fa84b79700a4a2ef2b47cb2f1c908699b')
+b2sums=('ead966b0df7bb72ac9aa2aefb1e5f2dd020156a8e66f67aeff75d29606072ea7b147ddc4d6effea687baf4653e670bd3ad93fc9c7b0e7cac340cb1d5976adb14'
'2903992389c61fc4720cde8a011d0b637de647a7c9e701609968c01a8ab904277dfb27a90179d4cfcf98382973542e59d1384580236c25f6568aaa7b6ba90528'
- '67cf563120070fc675618bdc4da8b8b224bea42c50ac8aabbd3d6b254b4189f330d0f93678f02cd96748a1bb1560f5275ed4fb0c9b2066f67761027343da86ec'
'04d1e78d044666720a9a099a9b95426ea06fe076354698f642a1a24df25bc27a033e6823a56cbdc21b695cba0e71446f4278c9a1474dba2cfa6aa91945950266'
+ '8539531d52cbe02edd600ae02d179888a36ef0caac806c6951a7a68404bf5575e5afc451d1f6b250b6e3970d088a25396f26a442ef01e3af98ae338a9fd1dc76'
'1985ee3dbd596cf7ac4a3041b395792733d59c95de4226dc54ff33887db4ec4adc0ef877d294cf66da2926eb025166397fdf6ceb76bfd280932e3ecd9ae716ec'
- 'a11fa313592ce3fb3d0c59deb3bfcec4209697626e830e0b89a398a4f1a97e47c41c39ed29f164902f183dbace7232378641f3dd43e7a7bdf84e787d043c9590'
- '9a5fa2c8233e053bae4ad277e3c4677dbe8eee654f0fdbd7545e9ae98a36f084d00c47460a036ec1d58aac73564223bd0160ee47553eda19d49bac85c9274360'
- '7f4eab0d3f9c35ff63ca14ab5a23c863a9d940b925a0502d0ffc7ae2b3010f96b806162b1f6d885e1f8f12b39e2205ba6e57a483be2774fb8c2e4abb46b28a76')
+ 'a2aae60cee2911c1fa45bdaa670cd04b552fe34624f62eaafc2ceaf648e283ed62e4bb0567dacf9733b6ef05e657514bda7a98800d735f32a15cb8fd452e150b'
+ '58e2e5f6706f17040a7674f6ae81c49e4bdac586228c51374615e7821a70cad8f508bdbd1dbb9d53db98713e5cb456c9b065512199385becdcaf7cb9bd7c1f4b'
+ '7b15d54811fd1d8ef908963abd76fe552f6149ea32e6f83eaecc6f0636d5e58ece857f86828bf650a2f762a02ca58640ff60dd0f9268666033da67be6e5e7ae1'
+ '8e35b9a826592b1a2f2adaa7400cf6cae1c43f04edec7f6a84f2a7c67b56d762685d484863c8f5b49cf55ed6c91c2d3935e851a4446415cc420104707e06201a'
+ '0b93c67f7a5c7d1a8f3e62eb94f70a5b93b1c2f7cdbce99dd5444ac52f27aa7198ed9a3172efbea382dd7a7f8aeb97fe54acecafc41bb48ac34379952867724e'
+ '798b7e21d44f8c68022b5f212f0235ef1558629db2d7356128b23736a9f97009cc85f48c77e30f5908832da46204d54444f0221675e917d3e3f85c0027c547dd')
prepare() {
for patch in "${srcdir}"/*.patch; do
diff --git a/clang.patch b/clang.patch
deleted file mode 100644
index f44fb76230c0..000000000000
--- a/clang.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/cmake/PlatformSpecific.cmake b/cmake/PlatformSpecific.cmake
-index 102e4eb..e099be8 100644
---- a/cmake/PlatformSpecific.cmake
-+++ b/cmake/PlatformSpecific.cmake
-@@ -257,7 +257,7 @@ ENDIF(APPLE)
- #
- ###########################################################################
-
--IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-+IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
- # Update if necessary
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wno-long-long -pedantic")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -msse3 -mssse3")
---
-2.30.0
-
diff --git a/fix_isnan_isinf.patch b/fix_isnan_isinf.patch
deleted file mode 100644
index c6ec99db72d3..000000000000
--- a/fix_isnan_isinf.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-From d7c2e0522d8b7de457e63c69ba239d11893603df Mon Sep 17 00:00:00 2001
-From: howetuft <howetuft@gmail.com>
-Date: Sun, 28 Feb 2021 11:41:33 +0100
-Subject: [PATCH 1/3] Include OIIO headers before project headers
-
-Otherwise, in OIIO latest version, it introduces a conflict related to
-project's macro 'isinf(f)' (defined in include/luxrays/utils/utils.h)
----
- src/slg/imagemap/imagemap.cpp | 7 ++++---
- src/slg/lights/visibility/envlightvisibilitycache.cpp | 6 +++---
- src/slg/slg.cpp | 4 ++--
- src/slg/textures/texture.cpp | 4 ++--
- 4 files changed, 11 insertions(+), 10 deletions(-)
-
-diff --git a/src/slg/imagemap/imagemap.cpp b/src/slg/imagemap/imagemap.cpp
-index 3acd8739a..009d992bb 100644
---- a/src/slg/imagemap/imagemap.cpp
-+++ b/src/slg/imagemap/imagemap.cpp
-@@ -1,4 +1,5 @@
- /***************************************************************************
-+ *
- * Copyright 1998-2020 by authors (see AUTHORS.txt) *
- * *
- * This file is part of LuxCoreRender. *
-@@ -24,13 +25,13 @@
- #include <boost/foreach.hpp>
- #include <boost/filesystem.hpp>
-
--#include "luxrays/utils/properties.h"
--#include "slg/core/sdl.h"
--
- #include <OpenImageIO/imagebufalgo.h>
- #include <OpenImageIO/imagebuf.h>
- #include <OpenImageIO/dassert.h>
-
-+#include "luxrays/utils/properties.h"
-+#include "slg/core/sdl.h"
-+
- #include "slg/imagemap/imagemap.h"
- #include "slg/imagemap/imagemapcache.h"
- #include "slg/utils/filenameresolver.h"
-diff --git a/src/slg/lights/visibility/envlightvisibilitycache.cpp b/src/slg/lights/visibility/envlightvisibilitycache.cpp
-index 8cb1fc0bd..0af405b78 100644
---- a/src/slg/lights/visibility/envlightvisibilitycache.cpp
-+++ b/src/slg/lights/visibility/envlightvisibilitycache.cpp
-@@ -25,13 +25,13 @@
- #include <boost/thread.hpp>
- #include <boost/chrono.hpp>
-
-+#include <OpenImageIO/imageio.h>
-+#include <OpenImageIO/imagebuf.h>
-+
- #include "luxrays/core/bvh/bvhbuild.h"
- #include "luxrays/utils/atomic.h"
- #include "luxrays/utils/safesave.h"
-
--#include <OpenImageIO/imageio.h>
--#include <OpenImageIO/imagebuf.h>
--
- #include "slg/samplers/metropolis.h"
- #include "slg/lights/visibility/envlightvisibilitycache.h"
- #include "slg/film/imagepipeline/plugins/gaussianblur3x3.h"
-diff --git a/src/slg/slg.cpp b/src/slg/slg.cpp
-index 6c886107c..3e1b122da 100644
---- a/src/slg/slg.cpp
-+++ b/src/slg/slg.cpp
-@@ -18,12 +18,12 @@
-
- #include <openvdb/openvdb.h>
-
-+#include <OpenImageIO/imageio.h>
-+
- #include "luxrays/luxrays.h"
- #include "slg/slg.h"
- #include "slg/utils/filenameresolver.h"
-
--#include <OpenImageIO/imageio.h>
--
- using namespace std;
- using namespace luxrays;
- using namespace slg;
-diff --git a/src/slg/textures/texture.cpp b/src/slg/textures/texture.cpp
-index a66d25ba4..7498296ac 100644
---- a/src/slg/textures/texture.cpp
-+++ b/src/slg/textures/texture.cpp
-@@ -23,12 +23,12 @@
- #include <boost/foreach.hpp>
- #include <boost/filesystem.hpp>
-
--#include "slg/core/sdl.h"
--
- #include <OpenImageIO/imagebufalgo.h>
- #include <OpenImageIO/imagebuf.h>
- #include <OpenImageIO/dassert.h>
-
-+#include "slg/core/sdl.h"
-+
- #include "slg/bsdf/bsdf.h"
- #include "slg/textures/texture.h"
- #include "slg/textures/blender_texture.h"
-
-From 56ce80a04babf440e05c673dd529ec30d949b1f4 Mon Sep 17 00:00:00 2001
-From: howetuft <howetuft@gmail.com>
-Date: Sun, 28 Feb 2021 15:31:40 +0100
-Subject: [PATCH 2/3] Revert "Include OIIO headers before project headers"
-
-This reverts commit ce9b6827d5c26b03cd776d4c37182267804a098e.
----
- src/slg/imagemap/imagemap.cpp | 7 +++----
- src/slg/lights/visibility/envlightvisibilitycache.cpp | 6 +++---
- src/slg/slg.cpp | 4 ++--
- src/slg/textures/texture.cpp | 4 ++--
- 4 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/src/slg/imagemap/imagemap.cpp b/src/slg/imagemap/imagemap.cpp
-index 009d992bb..3acd8739a 100644
---- a/src/slg/imagemap/imagemap.cpp
-+++ b/src/slg/imagemap/imagemap.cpp
-@@ -1,5 +1,4 @@
- /***************************************************************************
-- *
- * Copyright 1998-2020 by authors (see AUTHORS.txt) *
- * *
- * This file is part of LuxCoreRender. *
-@@ -25,13 +24,13 @@
- #include <boost/foreach.hpp>
- #include <boost/filesystem.hpp>
-
-+#include "luxrays/utils/properties.h"
-+#include "slg/core/sdl.h"
-+
- #include <OpenImageIO/imagebufalgo.h>
- #include <OpenImageIO/imagebuf.h>
- #include <OpenImageIO/dassert.h>
-
--#include "luxrays/utils/properties.h"
--#include "slg/core/sdl.h"
--
- #include "slg/imagemap/imagemap.h"
- #include "slg/imagemap/imagemapcache.h"
- #include "slg/utils/filenameresolver.h"
-diff --git a/src/slg/lights/visibility/envlightvisibilitycache.cpp b/src/slg/lights/visibility/envlightvisibilitycache.cpp
-index 0af405b78..8cb1fc0bd 100644
---- a/src/slg/lights/visibility/envlightvisibilitycache.cpp
-+++ b/src/slg/lights/visibility/envlightvisibilitycache.cpp
-@@ -25,13 +25,13 @@
- #include <boost/thread.hpp>
- #include <boost/chrono.hpp>
-
--#include <OpenImageIO/imageio.h>
--#include <OpenImageIO/imagebuf.h>
--
- #include "luxrays/core/bvh/bvhbuild.h"
- #include "luxrays/utils/atomic.h"
- #include "luxrays/utils/safesave.h"
-
-+#include <OpenImageIO/imageio.h>
-+#include <OpenImageIO/imagebuf.h>
-+
- #include "slg/samplers/metropolis.h"
- #include "slg/lights/visibility/envlightvisibilitycache.h"
- #include "slg/film/imagepipeline/plugins/gaussianblur3x3.h"
-diff --git a/src/slg/slg.cpp b/src/slg/slg.cpp
-index 3e1b122da..6c886107c 100644
---- a/src/slg/slg.cpp
-+++ b/src/slg/slg.cpp
-@@ -18,12 +18,12 @@
-
- #include <openvdb/openvdb.h>
-
--#include <OpenImageIO/imageio.h>
--
- #include "luxrays/luxrays.h"
- #include "slg/slg.h"
- #include "slg/utils/filenameresolver.h"
-
-+#include <OpenImageIO/imageio.h>
-+
- using namespace std;
- using namespace luxrays;
- using namespace slg;
-diff --git a/src/slg/textures/texture.cpp b/src/slg/textures/texture.cpp
-index 7498296ac..a66d25ba4 100644
---- a/src/slg/textures/texture.cpp
-+++ b/src/slg/textures/texture.cpp
-@@ -23,12 +23,12 @@
- #include <boost/foreach.hpp>
- #include <boost/filesystem.hpp>
-
-+#include "slg/core/sdl.h"
-+
- #include <OpenImageIO/imagebufalgo.h>
- #include <OpenImageIO/imagebuf.h>
- #include <OpenImageIO/dassert.h>
-
--#include "slg/core/sdl.h"
--
- #include "slg/bsdf/bsdf.h"
- #include "slg/textures/texture.h"
- #include "slg/textures/blender_texture.h"
-
-From de6eea0f5e792d2034d479a2403aa1136d09180f Mon Sep 17 00:00:00 2001
-From: howetuft <howetuft@gmail.com>
-Date: Sun, 28 Feb 2021 15:50:45 +0100
-Subject: [PATCH 3/3] Declare isnan and isinf by 'using' statement rather than
- macro
-
----
- include/luxrays/utils/utils.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/luxrays/utils/utils.h b/include/luxrays/utils/utils.h
-index 1a49d5465..af52bbdc5 100644
---- a/include/luxrays/utils/utils.h
-+++ b/include/luxrays/utils/utils.h
-@@ -36,8 +36,8 @@
- #define isnan(a) _isnan(a)
- #define isinf(f) (!_finite((f)))
- #else
--#define isnan(a) std::isnan(a)
--#define isinf(f) std::isinf(f)
-+using std::isnan;
-+using std::isinf;
- #endif
-
- #if defined(WIN32)
diff --git a/oidn124.patch b/oidn124.patch
deleted file mode 100644
index 533524d79dcf..000000000000
--- a/oidn124.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur LuxCore-luxcorerender_v2.5beta1-new/cmake/Packages/FindOidn.cmake LuxCore-luxcorerender_v2.5beta1/cmake/Packages/FindOidn.cmake
---- LuxCore-luxcorerender_v2.5beta1-new/cmake/Packages/FindOidn.cmake 2020-12-11 15:27:02.273125334 +0100
-+++ LuxCore-luxcorerender_v2.5beta1/cmake/Packages/FindOidn.cmake 2020-11-15 11:42:41.000000000 +0100
-@@ -14,10 +14,10 @@
- ## limitations under the License. ##
- ## ======================================================================== ##
-
--FIND_PATH(OIDN_INCLUDE_PATH NAMES OpenImageDenoise/version.h PATHS
-+FIND_PATH(OIDN_INCLUDE_PATH NAMES OpenImageDenoise/config.h PATHS
- ${OIDN_ROOT}/include)
- IF (NOT OIDN_INCLUDE_PATH)
-- FIND_PATH(OIDN_INCLUDE_PATH NAMES OpenImageDenoise/version.h PATHS
-+ FIND_PATH(OIDN_INCLUDE_PATH NAMES OpenImageDenoise/config.h PATHS
- /usr/include
- /usr/local/include
- /opt/local/include)