OpenImageIO v2.3

Starting from v2.3, OpenColorIO is distributed in 2 libraries. Build has to be adapted accordingly.
author: howetuft 2022-03-20 10:17:53 +0100
committer: howetuft 2022-03-20 10:17:53 +0100
commit: 19ad00d808cecb53f64ab762efca3ebede648a7c (patch)
tree: f1f9af874120442fdd8c9f0595ceffb9ebcf1118
parent: 762b3eb18b20adc7a6c8ed83b946f1f952838a69 (diff)
download: aur-19ad00d808cecb53f64ab762efca3ebede648a7c.tar.gz
12 files changed, 362 insertions, 115 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c943025da208..87250ec0a173 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = luxcorerender-git
 	pkgdesc = Physically correct, unbiased rendering engine.
-	pkgver = 2.6.r16.g7ce21392d
+	pkgver = 2.6.r27.g8a048104b
 	pkgrel = 1
 	epoch = 2
 	url = https://www.luxcorerender.org/
 	arch = x86_64
 	license = Apache
 	makedepends = opencl-headers
+	makedepends = cuda
 	makedepends = boost
 	makedepends = cmake
 	makedepends = doxygen
@@ -29,22 +30,37 @@ pkgbase = luxcorerender-git
 	conflicts = luxcorerender
 	options = !buildflags
 	source = luxcorerender::git+https://github.com/LuxCoreRender/LuxCore.git#branch=master
-	source = python.patch
-	source = glfw.patch
-	source = boost107400.patch::https://github.com/LuxCoreRender/LuxCore/pull/483.patch
-	source = openexr3.patch
-	source = openvdb.patch
+	source = 01-glfw.patch
+	source = 02-boost107400.patch::https://github.com/LuxCoreRender/LuxCore/pull/483.patch
+	source = 03-python.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
 	sha256sums = SKIP
-	sha256sums = 1395fbb98c989c101c66350d228af05c20abf20ada55f179ca563094c1b642ca
 	sha256sums = 4e04c3eb653f00d2389aff8e7fda2d244e258cbca3a22e32c13388a3984e4bb1
 	sha256sums = f5fc0bbeb09c95750da6ca668ea2f26b84998c57c9abb8ac0a3d96131017f66d
-	sha256sums = 0ab21f055753155b3f46b6c773ef4509c69b86852cc474fcaa336ff8497dcaa9
-	sha256sums = bc8d7f2cb0fd562f80ebdc93847d9db57b674ac25ce37d266c0582b7a0bd859d
+	sha256sums = 7c2cf9dd881fb738e468599a4babc445cfb0a5146d3b74519449b4a1a9602c07
+	sha256sums = 763b41b8fd401c584efd147616d0b4eb4d30c76a7e9072a6c6a03189147530ad
+	sha256sums = 96d2bf957f7a0dfa3c25bd9345d7ca18d4fd89f7a6d3cae946eaf0d623917171
+	sha256sums = 8b7083d8aeedb2adecf078e06da028120c2f8354280c7ec7424b304ab3fd29bd
+	sha256sums = f81448ae200a3bd549dd551fd6f5db9bff4bd07270bb91e57672d2b1275e938b
+	sha256sums = 33bde7ca00b08ce568d07d70bf324104abe0b38f22e81531de459e98723828b4
+	sha256sums = 10375ea78ab9c1454211992179368a9fa84b79700a4a2ef2b47cb2f1c908699b
+	sha256sums = bdf0e8167a4e26cc251846b4b8a8827571f8ac9478f7a2400f6776bfe6b99375
 	b2sums = SKIP
-	b2sums = 9e6f2eeaa87d3c75dbdcc91adf1a21c5b4edefab7984229e60ba639b34baf4c38b287b67a7be9954f22535375a179dfc9c8afdfab4bdea381d749047b00df781
 	b2sums = 2903992389c61fc4720cde8a011d0b637de647a7c9e701609968c01a8ab904277dfb27a90179d4cfcf98382973542e59d1384580236c25f6568aaa7b6ba90528
 	b2sums = 3057084619ac9067883b820d6ca4cb896155b587a09b689aa2a0dd1139478577164cfe90d5165d84cb88850b35fc5721ad76568764f555bd5c05b8e394c95b48
-	b2sums = e42842f8ac778f617261e10e78aa805d8ab47c53e762f2153e5acb18e0f69f5eda735205cdaa9fe4b2ac93ae3e16ca4a5599ac8b2d4617e12e3b821cb99e5e2b
-	b2sums = 3c35212e111ff1eab9704bb1bc30fec1b306d5857c59d8c714c156e36583db78e26e861354fbc279f30b90c80150c3b502a8e1f86d775c8d2f9fcdda37d703d4
+	b2sums = 8539531d52cbe02edd600ae02d179888a36ef0caac806c6951a7a68404bf5575e5afc451d1f6b250b6e3970d088a25396f26a442ef01e3af98ae338a9fd1dc76
+	b2sums = a2aae60cee2911c1fa45bdaa670cd04b552fe34624f62eaafc2ceaf648e283ed62e4bb0567dacf9733b6ef05e657514bda7a98800d735f32a15cb8fd452e150b
+	b2sums = 58e2e5f6706f17040a7674f6ae81c49e4bdac586228c51374615e7821a70cad8f508bdbd1dbb9d53db98713e5cb456c9b065512199385becdcaf7cb9bd7c1f4b
+	b2sums = 7b15d54811fd1d8ef908963abd76fe552f6149ea32e6f83eaecc6f0636d5e58ece857f86828bf650a2f762a02ca58640ff60dd0f9268666033da67be6e5e7ae1
+	b2sums = 8e35b9a826592b1a2f2adaa7400cf6cae1c43f04edec7f6a84f2a7c67b56d762685d484863c8f5b49cf55ed6c91c2d3935e851a4446415cc420104707e06201a
+	b2sums = 0b93c67f7a5c7d1a8f3e62eb94f70a5b93b1c2f7cdbce99dd5444ac52f27aa7198ed9a3172efbea382dd7a7f8aeb97fe54acecafc41bb48ac34379952867724e
+	b2sums = 798b7e21d44f8c68022b5f212f0235ef1558629db2d7356128b23736a9f97009cc85f48c77e30f5908832da46204d54444f0221675e917d3e3f85c0027c547dd
+	b2sums = 537301a740c8cbbb45905d28d8fb58069e3839020208e911515a4c0e7aba39bf3d5d53699ee54b42efead2d499b30f1fb77e5dde3aa7faadd0ac9bd45445f8dd
 
 pkgname = luxcorerender-git
diff --git a/glfw.patch b/01-glfw.patch
index 29c1e0fef7af..29c1e0fef7af 100644
--- a/glfw.patch
+++ b/01-glfw.patch
diff --git a/python.patch b/03-python.patch
index 7e24e1f91db7..bcc15a27bc40 100644
--- a/python.patch
+++ b/03-python.patch
@@ -13,6 +13,7 @@ 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
@@ -45,25 +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 c7fc8196c..35c472af2 100644
+index 8b74e0704..c6f9c88f1 100644
 --- a/samples/luxcoreui/CMakeLists.txt
 +++ b/samples/luxcoreui/CMakeLists.txt
-@@ -102,5 +105,6 @@ 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 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 opencolorio ${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/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 1119e4b951c8..2dd77ff6b178 100644
--- a/openexr3.patch
+++ b/06-openexr3.patch
@@ -1,5 +1,4 @@
 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 @@
@@ -255,7 +254,6 @@ index 02621d536..a2f7b4c62 100644
 +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 @@
@@ -268,7 +266,6 @@ index e053ddeb2..10ad649c4 100644
  #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 @@
@@ -281,7 +278,6 @@ index 551789888..2624f118c 100644
  #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 @@
@@ -294,7 +290,6 @@ index 70269cf07..0d9906828 100644
  #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 @@
@@ -307,7 +302,6 @@ index a8b3cbd94..bb0163bff 100644
  
  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 @@
@@ -320,7 +314,6 @@ index 309c6244f..0873d4908 100644
  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 @@
@@ -333,7 +326,6 @@ index b6fb6d9e7..e7389203c 100644
  #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 @@
@@ -359,7 +351,6 @@ 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 @@
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/11-openimageio.patch b/11-openimageio.patch
new file mode 100644
index 000000000000..5c6935bd9b2e
--- /dev/null
+++ b/11-openimageio.patch
@@ -0,0 +1,41 @@
+From 4ebe35970cdfaf04a962716f298c6320f720792e 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
+
+---
+ cmake/Packages/FindOpenImageIO.cmake | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/Packages/FindOpenImageIO.cmake b/cmake/Packages/FindOpenImageIO.cmake
+index 66bf54966..49eb82372 100644
+--- a/cmake/Packages/FindOpenImageIO.cmake
++++ b/cmake/Packages/FindOpenImageIO.cmake
+@@ -55,6 +55,15 @@ FIND_LIBRARY(OPENIMAGEIO_LIBRARY
+     lib64 lib x64/Release/lib
+   )
+ 
++FIND_LIBRARY(OPENIMAGEIO_UTIL_LIBRARY
++  NAMES
++    OpenImageIO_Util
++  HINTS
++    ${_openimageio_SEARCH_DIRS}
++  PATH_SUFFIXES
++    lib64 lib x64/Release/lib
++  )
++
+ # handle the QUIETLY and REQUIRED arguments and set OPENIMAGEIO_FOUND to TRUE if 
+ # all listed variables are TRUE
+ INCLUDE(FindPackageHandleStandardArgs)
+@@ -62,7 +71,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenImageIO DEFAULT_MSG
+     OPENIMAGEIO_LIBRARY OPENIMAGEIO_INCLUDE_DIR)
+ 
+ IF(OPENIMAGEIO_FOUND)
+-  SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY})
++  SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY} ${OPENIMAGEIO_UTIL_LIBRARY})
+   SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR})
+ ENDIF(OPENIMAGEIO_FOUND)
+ 
+-- 
+2.35.1
+
diff --git a/PKGBUILD b/PKGBUILD
index b8fcb88050a6..d0ee5649441a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ _fragment=${FRAGMENT:-#branch=master}
 
 _name="luxcorerender"
 pkgname=${_name}-git
-pkgver=2.6.r16.g7ce21392d
+pkgver=2.6.r27.g8a048104b
 epoch=2
 pkgrel=1
 pkgdesc="Physically correct, unbiased rendering engine."
@@ -34,24 +34,39 @@ conflicts=(luxcorerender)
 provides=(luxrays "luxcorerender=${pkgver%.r*}")
 options=('!buildflags')
 source=("${_name}::git+https://github.com/LuxCoreRender/LuxCore.git${_fragment}"
-        "python.patch"
-        "glfw.patch"
-        "boost107400.patch::https://github.com/LuxCoreRender/LuxCore/pull/483.patch"
-        "openexr3.patch"
-        "openvdb.patch"
+        "01-glfw.patch"
+        "02-boost107400.patch::https://github.com/LuxCoreRender/LuxCore/pull/483.patch"
+        "03-python.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"
         )
 sha256sums=('SKIP'
-            '1395fbb98c989c101c66350d228af05c20abf20ada55f179ca563094c1b642ca'
             '4e04c3eb653f00d2389aff8e7fda2d244e258cbca3a22e32c13388a3984e4bb1'
             'f5fc0bbeb09c95750da6ca668ea2f26b84998c57c9abb8ac0a3d96131017f66d'
-            '0ab21f055753155b3f46b6c773ef4509c69b86852cc474fcaa336ff8497dcaa9'
-            'bc8d7f2cb0fd562f80ebdc93847d9db57b674ac25ce37d266c0582b7a0bd859d')
+            '7c2cf9dd881fb738e468599a4babc445cfb0a5146d3b74519449b4a1a9602c07'
+            '763b41b8fd401c584efd147616d0b4eb4d30c76a7e9072a6c6a03189147530ad'
+            '96d2bf957f7a0dfa3c25bd9345d7ca18d4fd89f7a6d3cae946eaf0d623917171'
+            '8b7083d8aeedb2adecf078e06da028120c2f8354280c7ec7424b304ab3fd29bd'
+            'f81448ae200a3bd549dd551fd6f5db9bff4bd07270bb91e57672d2b1275e938b'
+            '33bde7ca00b08ce568d07d70bf324104abe0b38f22e81531de459e98723828b4'
+            '10375ea78ab9c1454211992179368a9fa84b79700a4a2ef2b47cb2f1c908699b'
+            'bdf0e8167a4e26cc251846b4b8a8827571f8ac9478f7a2400f6776bfe6b99375')
 b2sums=('SKIP'
-        '9e6f2eeaa87d3c75dbdcc91adf1a21c5b4edefab7984229e60ba639b34baf4c38b287b67a7be9954f22535375a179dfc9c8afdfab4bdea381d749047b00df781'
         '2903992389c61fc4720cde8a011d0b637de647a7c9e701609968c01a8ab904277dfb27a90179d4cfcf98382973542e59d1384580236c25f6568aaa7b6ba90528'
         '3057084619ac9067883b820d6ca4cb896155b587a09b689aa2a0dd1139478577164cfe90d5165d84cb88850b35fc5721ad76568764f555bd5c05b8e394c95b48'
-        'e42842f8ac778f617261e10e78aa805d8ab47c53e762f2153e5acb18e0f69f5eda735205cdaa9fe4b2ac93ae3e16ca4a5599ac8b2d4617e12e3b821cb99e5e2b'
-        '3c35212e111ff1eab9704bb1bc30fec1b306d5857c59d8c714c156e36583db78e26e861354fbc279f30b90c80150c3b502a8e1f86d775c8d2f9fcdda37d703d4')
+        '8539531d52cbe02edd600ae02d179888a36ef0caac806c6951a7a68404bf5575e5afc451d1f6b250b6e3970d088a25396f26a442ef01e3af98ae338a9fd1dc76'
+        'a2aae60cee2911c1fa45bdaa670cd04b552fe34624f62eaafc2ceaf648e283ed62e4bb0567dacf9733b6ef05e657514bda7a98800d735f32a15cb8fd452e150b'
+        '58e2e5f6706f17040a7674f6ae81c49e4bdac586228c51374615e7821a70cad8f508bdbd1dbb9d53db98713e5cb456c9b065512199385becdcaf7cb9bd7c1f4b'
+        '7b15d54811fd1d8ef908963abd76fe552f6149ea32e6f83eaecc6f0636d5e58ece857f86828bf650a2f762a02ca58640ff60dd0f9268666033da67be6e5e7ae1'
+        '8e35b9a826592b1a2f2adaa7400cf6cae1c43f04edec7f6a84f2a7c67b56d762685d484863c8f5b49cf55ed6c91c2d3935e851a4446415cc420104707e06201a'
+        '0b93c67f7a5c7d1a8f3e62eb94f70a5b93b1c2f7cdbce99dd5444ac52f27aa7198ed9a3172efbea382dd7a7f8aeb97fe54acecafc41bb48ac34379952867724e'
+        '798b7e21d44f8c68022b5f212f0235ef1558629db2d7356128b23736a9f97009cc85f48c77e30f5908832da46204d54444f0221675e917d3e3f85c0027c547dd'
+        '537301a740c8cbbb45905d28d8fb58069e3839020208e911515a4c0e7aba39bf3d5d53699ee54b42efead2d499b30f1fb77e5dde3aa7faadd0ac9bd45445f8dd')
 
 pkgver() {
 # shellcheck disable=SC2164
@@ -62,10 +77,11 @@ pkgver() {
 
 
 prepare() {
-  git -C "${srcdir}/${_name}" revert --no-commit 5d963d0b32a30d76ac193e8198647b74cd9a2e12
-  git -C "${srcdir}/${_name}" apply -v "${srcdir}"/*.patch
-  #fix build against fmt 8.0
-  sed '/format_system_error/s/msg/msg.c_str()/' -i "${srcdir}/${_name}"/deps/spdlog-1.8.0/include/spdlog/common-inl.h
+  #git -C "${srcdir}/${_name}" revert --no-commit 5d963d0b32a30d76ac193e8198647b74cd9a2e12
+  for patch in "${srcdir}"/*.patch; do
+    msg2  "apply $patch..."
+    patch -Np1 -d "${srcdir}"/${_name} -i "$patch"
+  done
 }
 
 build() {
diff --git a/openvdb.patch b/openvdb.patch
deleted file mode 100644
index c379853d721b..000000000000
--- a/openvdb.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 63816ba1e9715a2c3c5cd22469d0ca2cbba8469b Mon Sep 17 00:00:00 2001
-From: bartus <szczepaniak.bartek+github@gmail.com>
-Date: Tue, 14 Dec 2021 12:11:33 +0100
-Subject: [PATCH] Allow external openvdb
-
----
- cmake/Dependencies.cmake   |  7 +++++++
- src/luxcore/CMakeLists.txt |  1 -
- src/slg/CMakeLists.txt     | 13 ++++++++++---
- 3 files changed, 17 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
-index 5bd992b0d..ec7e74bff 100644
---- a/cmake/Dependencies.cmake
-+++ b/cmake/Dependencies.cmake
-@@ -160,3 +160,13 @@ ENDIF (NOT BISON_NOT_AVAILABLE)
- IF (NOT FLEX_NOT_AVAILABLE)
- 	find_package(FLEX)
- ENDIF (NOT FLEX_NOT_AVAILABLE)
-+
-+# Find OpenVDB
-+if(NOT USE_BUNDLE_OPENVDB)
-+	set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
-+# preserve Boost_LIBRARIES variable
-+	set(save_Boost_LIBRARIES ${Boost_LIBRARIES})
-+	find_package(OpenVDB REQUIRED)
-+	set(Boost_LIBRARIES ${save_Boost_LIBRARIES})
-+	set(CMAKE_FIND_PACKAGE_PREFER_CONFIG FALSE)
-+endif()
-diff --git a/src/luxcore/CMakeLists.txt b/src/luxcore/CMakeLists.txt
-index f876fa425..d0615b6e1 100644
---- a/src/luxcore/CMakeLists.txt
-+++ b/src/luxcore/CMakeLists.txt
-@@ -175,7 +175,6 @@ 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(${LuxRays_SOURCE_DIR}/deps/opencolorio-2.0.0/include)
- 
- add_definitions(-DOPENVDB_STATICLIB ${VISIBILITY_FLAGS})
-diff --git a/src/slg/CMakeLists.txt b/src/slg/CMakeLists.txt
-index 2f1bf79cc..c41b87e9f 100644
---- a/src/slg/CMakeLists.txt
-+++ b/src/slg/CMakeLists.txt
-@@ -143,12 +143,19 @@ 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})
-+if(USE_BUNDLE_OPENVDB)
-+	add_library(openvdb STATIC ${OPENVDB_SRCS})
-+	set_target_properties(openvdb INCLUDE_DIRECTORIES ${LuxRays_SOURCE_DIR}/deps/openvdb-7.0.0)
-+else()
-+	set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
-+	find_package(OpenVDB REQUIRED)
-+	set(CMAKE_FIND_PACKAGE_PREFER_CONFIG FALSE)
-+	add_library(openvdb INTERFACE)
-+	target_link_libraries(openvdb INTERFACE OpenVDB::openvdb)
-+endif()
- 
- ###########################################################################
- #
--- 
-2.34.1
-
author	howetuft	2022-03-20 10:17:53 +0100
committer	howetuft	2022-03-20 10:17:53 +0100
commit	19ad00d808cecb53f64ab762efca3ebede648a7c (patch)
tree	f1f9af874120442fdd8c9f0595ceffb9ebcf1118
parent	762b3eb18b20adc7a6c8ed83b946f1f952838a69 (diff)
download	aur-19ad00d808cecb53f64ab762efca3ebede648a7c.tar.gz