spdlog: rely on system implementation

16 files changed, 270 insertions, 107 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9c4d057ae7ff..d991893a21a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = luxcorerender
 	pkgdesc = Physically correct, unbiased rendering engine.
 	pkgver = 2.6
-	pkgrel = 5
+	pkgrel = 6
 	epoch = 2
 	url = https://www.luxcorerender.org/
 	arch = x86_64
@@ -23,7 +23,8 @@ pkgbase = luxcorerender
 	depends = openimagedenoise
 	depends = openimageio
 	depends = openvdb
-	depends = openmp
+	depends = fmt
+	depends = python
 	optdepends = opencl-driver: for gpu acceleration
 	optdepends = pyside2: for pyluxcoretools gui
 	provides = luxrays
@@ -37,37 +38,37 @@ pkgbase = luxcorerender
 	source = 0007-silence-compiler-warnings.patch
 	source = 0008-silence-preprocessing.patch
 	source = 0009-openvdb.patch
-	source = 0010-spdlog.patch
-	source = 0011-openimageio.patch
-	source = 0012-opencolorio.patch
-	source = 0013-boost179-fstream.patch
+	source = 0010-openimageio.patch
+	source = 0011-opencolorio.patch
+	source = 0012-boost179-fstream.patch
+	source = 0013-spdlog.patch
 	sha256sums = b844989b8229bf02f3c8aa6845be6a587aa5ae55a45861591119ad0e1a195867
-	sha256sums = d4f16fc1b21f2a5b9981db6157ebf64ceb6a9e0719cbbe2126d82c3013caa4ab
-	sha256sums = 8c9f3554252e4679e0d0a9fc4ad98a9e48846cea396e067466b4b809a945330c
-	sha256sums = 0b6c8328b4af7390061ba36fbc58eb444a17bce3ef169f5c046f51d2059833fe
-	sha256sums = d1b469b86d875757e57df9d9567fa7e242c56673b1158cc085e3ce7f846cdb78
-	sha256sums = 99cb5223b70a3c1be84ce8639e60b747245f0a81538ff859ecdc63a3f30ec5ef
-	sha256sums = 8a4f1811965f6dead9e3129f991a068b22585aaee1a25f51cfcc1155f8200060
-	sha256sums = 464afd2eeddb18bfcdbeda7b21bafe32aced4ca9e7f23145726914839918a2bf
-	sha256sums = 6c9aa23e19565166ea5fdac569129f245c8e066566bf6f64bc539016a8978ba9
-	sha256sums = 60873c7b7123fc586fa7f0b5ebb34bada035baab7f82bf2d2ccbc2b145ed3757
-	sha256sums = 29e673797cf8982434d9cff6adb47b6beb14ebc3062d767430ae51bf4bbae398
-	sha256sums = 3dbb879a1720faf02bead50a5645e1036ace4b5c561667a4cabf4f5e8134d1b9
-	sha256sums = 12ce172728510cdaa9fe8b550a9577befece9b013d78b4b5b6d2da5e415eea82
-	sha256sums = 48c4f8b73ec5fbcf5b5665fe4056554759e7691da4abe6e1169a17562e525b6d
+	sha256sums = 488e3bf2aac0c412643bbc91248de4fe83f13936cd4b8f963d0d782a52aa3301
+	sha256sums = 4f501087867efa1fbd7803f0620e39fb25b0e718f63596e1b4d832a58e746aae
+	sha256sums = 1bb10a3d9c7139699ffab0e11621addb65891b73121c3ba67cf782e609169e2a
+	sha256sums = 1a3d922a95f305077a33af3b7a3f1a7e8af1a21b8dfc78bcc039353a79e94411
+	sha256sums = 273ae005ba86f2df0750cc278ed64a8ec33bbaa7f32ffd2c4eb12bf2feb6da0c
+	sha256sums = 45c09e893d6fa31f5af77c1db5e99261a630a4b866ce6a6448f2644f0ff15f57
+	sha256sums = 73ac844cd78bf20d625f0250e5555ef59de3cd749efc8baaa23b0cb87052c226
+	sha256sums = c8f368a597cc657e42da19d275d7f86d85e718cc94a67e3db307cef51a8540ec
+	sha256sums = de3caaa28ccc56041eb8e048a9d6db4862a890fd26f01f5ba716e8b453627fc3
+	sha256sums = 5cce35bc5a2dddbe4576a1764545502528a1043ed46e22300f3ffd708e04514e
+	sha256sums = 403436261b647a43bf4e3f7c6bd10d414145197371b044b5ed41e11f33262f15
+	sha256sums = 98c63144e59a43ec20a3958406f104d5310cd9551e5a5c6563a845b5059a3bdb
+	sha256sums = 8d4d4233096d301e22f6611f8af90ac34be998a71e67673b3f548ba1079d6289
 	b2sums = ead966b0df7bb72ac9aa2aefb1e5f2dd020156a8e66f67aeff75d29606072ea7b147ddc4d6effea687baf4653e670bd3ad93fc9c7b0e7cac340cb1d5976adb14
-	b2sums = 6b9671a2d8d335a9a551b60f6e616210a56dd89ae20d7b5b41fb55fc96b97f09bee830b8fd23d832bf2dcd05eeafe16a421d69435032424a3796d719cc352bee
-	b2sums = e99e1d551235c0f11ca018136caf2fbb283cb2e03dd9f16c05b93ffb4f37fea45d95008c84d8cac174f225ae13aecf3d02d7639fe8c22e006de00e3189c0fc7e
-	b2sums = aaad4781bfcc07cb3c0a25449c7c52be541e9dfb9c907b8684876f8dd8fd8aec1ba900903d97d8e4e3b95c494acb7f7aaee4c1b1e7e8e3302c62bc3297abc83a
-	b2sums = d64e8e17e60b452f9b3e472293e08caa428937958ba3ae24f0a05b7d9e70a20e1b5d6ab60f901d508241d279905b7226c2ce4de3f378ed62bad88e03fdd5a0c0
-	b2sums = a90af82a64a4a005271931a19671c699dcbe9b7bef609190ca060b65124f85e2cefedd1e0e2d4983a8c231d20af485e3fca3fdbc9e5046ae84bf70919f6b0424
-	b2sums = 6c365150d2e63934f6de30e3f6d15260a54a3ca6c8aa5e0d1d56c3ee6f522df6eaeab81052cebf579df5be6c8750d6d606cf7dfad107316c84cfb3da31bd76c9
-	b2sums = b1be50e479cd8d452faccb614a9ce1ebebd0a87832055446c988578d57c03fb315be561eab09849bbb053f2ba0b1daf95c7d4bb430ea4ad23f825eb8519d4542
-	b2sums = 484629720dbd2313291428bf4f6996b5a2ccd8df79eae289b0fd766476bdbbe69a75b9628d00d7af89ea24f9cabee4cd4fd01ed30f520b1cbb253fd3e08e87bd
-	b2sums = 7a481ac8e1fd2e36f7dbb6297b48b2cc599e71c1752bc56c59179abe40c8ebe5c84319d79e41673f4516f42c56aa01df66d71a761773615e15f8d8ce1d01f56d
-	b2sums = 62e39a787c9bdb97999fcb38d97120f90d0895357757e36b8bdf3c4a5b57c67a982f37a905aec98904ca659accddfa47c64e7f5200aac4dc86e17adacfedd328
-	b2sums = 2457826edfa6de29da4423cb1473f6875255d6f9cbea1c3b39e66d94029fd9e782c911ff4a67a9ca975c77c5e6c1ad9d489253246c8a7543a7a4e8db4a859313
-	b2sums = c56661331a66a5ea4b3598ecf69dcfdb6fcd6e635f76aaa3eabcd3e0752327b64566458c2489e58db4f568d9066a9413bac98e2942d759091754873330b59b4d
-	b2sums = 828f40e954eeb2e47b10bc8b2173000308897042d31cc232d47f5c5883f38e6702c5d62a61446778467bdf398fe9bda0bebfeeea85a88e0bc914af35cd2d1201
+	b2sums = c79c24b2e73b13927b40ffd7ff114ffefc78fd2d6d0b2151f2b35d8784f07aa1b1f48370828ca127ff9ae77aa408363c19ef319dbb41db7fe5a81982466ea91a
+	b2sums = bb540e093ed3e714b703df48c2611953947d45b59683358c5254e3fceb8612103c05953a43cf4410189a6143d41bd829ba26f0df2bb7f0542be55611ac1c395b
+	b2sums = 15d0c8325bd130cd75d178c9e144340e9a1677fecb6fbd06d75d41d8a2838223707e33dc5fa1027c2b1be7a7c8f1e376c5613d7426a74115aed9bfe8bd1a6d08
+	b2sums = 284afde4f854c689fc1dabde8e0e6beba8ad896027aabc390ebf5811d97d7cc0022733698cdfbacfee496458fad006009a04d20080cacccba5b33a2c8a57564f
+	b2sums = 12344286fe26359f5a82073ce5d5507cc981c6d9661e2ace31f3a38ac91fd4458d9d739142695f5380b2e60b75651060693191bf6133fd7c8916827733e3679b
+	b2sums = 1b8d6097d9b35778b5ce6c706f6c98a42d5bd4c1f4045464412dfd3d4bd6b224b6e845d40425cc85c55a219303131c0d354f429d2ca1e62287f29c8d098392e0
+	b2sums = ce9185f920f0a94aaf88c1ff71f83f3433e79f065e2a8070028e7a3d4a2b1c535faa9fed452b2a4ae31fffeafe4de1aa346ac6d4f045379b709e90a8c31275ec
+	b2sums = 2af04224058508e7c51236eec752c400ac9ec602016f07fee5ec4cbe643a405bdf592ded7e55c8d4fc97aa5aa8ca40256da191f8fbbcffc5b089f0b37981d6bb
+	b2sums = ae6741724b805cfa23c8939148c49003fdd6cd2ecff58acb36d1a587ad6956ff417f652b42d9e2fd56c73de5cb6c6175a3a662d670ee7861500f1af0a68251d6
+	b2sums = cd8fee59875514a22391c0fa5cf85022a33a3dc017d638372c25b0b7f5a1b485f235e872c1d01f6c73277b3526406ead157b76a8d9fa76647e0997744436d0ff
+	b2sums = c18566140d5e85caeafbe443cee237d0a1e012742bbad47733de23ff38e64241b87e9fe961cbbe48997b8445804f36032da695596770abfcd5cda33e2a3fb335
+	b2sums = 0affefa29a68a719e307edb5307935b63805bd8e842b9a1db0dce807f64a576f8b3ba7feafea238adee3875b53d3d1ec997880e88707d1f973396060c6dae46d
+	b2sums = cabf93834f26e1585ca8a2003227483c1ed66f7a2edcfcc12d4ed9eaf85247d4f18e6e341c70ffb4305b2ae21a843390aa275faec0bc46e319a3c4d1a5d50e78
 
 pkgname = luxcorerender
diff --git a/0001-glfw.patch b/0001-glfw.patch
index 00ce888c0cb0..b983f4473980 100644
--- a/0001-glfw.patch
+++ b/0001-glfw.patch
@@ -24,5 +24,5 @@ index 8b74e0704..d2e823874 100644
  include_directories(deps/nfd/include)
  
 -- 
-2.37.0
+2.38.1
 
diff --git a/0002-boost107400.patch b/0002-boost107400.patch
index 8058f0158cf8..db18bae9f083 100644
--- a/0002-boost107400.patch
+++ b/0002-boost107400.patch
@@ -62,5 +62,5 @@ index 6cd3aee46..120eb8cb5 100644
  
  #include "slg/film/film.h"
 -- 
-2.37.0
+2.38.1
 
diff --git a/0003-python.patch b/0003-python.patch
index 8ad8a6a3bef4..c9c7f35f9db8 100644
--- a/0003-python.patch
+++ b/0003-python.patch
@@ -82,5 +82,5 @@ index bdd3445b8..baa52f622 100644
 \ No newline at end of file
 +TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays bcd opensubdiv openvdb ${BLOSC_LIBRARY} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${PYTHON_LIBRARIES})
 -- 
-2.37.0
+2.38.1
 
diff --git a/0004-cpplib.patch b/0004-cpplib.patch
index 5f5bea32e7b9..c57a5602b65a 100644
--- a/0004-cpplib.patch
+++ b/0004-cpplib.patch
@@ -49,5 +49,5 @@ index c9798c2ec..8101b5742 100644
  using namespace luxrays;
  using namespace slg;
 -- 
-2.37.0
+2.38.1
 
diff --git a/0005-clang-isnan-isinf.patch b/0005-clang-isnan-isinf.patch
index 112d8f95ff17..13e4620d78f2 100644
--- a/0005-clang-isnan-isinf.patch
+++ b/0005-clang-isnan-isinf.patch
@@ -24,5 +24,5 @@ index b6584b383..d48d7d93d 100644
  #include <string>
  #endif
 -- 
-2.37.0
+2.38.1
 
diff --git a/0006-openexr3.patch b/0006-openexr3.patch
index 43bebaf24aab..d71dda3d9bda 100644
--- a/0006-openexr3.patch
+++ b/0006-openexr3.patch
@@ -390,5 +390,5 @@ index 551789888..2624f118c 100644
  #include "luxrays/utils/utils.h"
  #include "luxrays/utils/serializationutils.h"
 -- 
-2.37.0
+2.38.1
 
diff --git a/0007-silence-compiler-warnings.patch b/0007-silence-compiler-warnings.patch
index ce34f4b443e3..d3de60a650d4 100644
--- a/0007-silence-compiler-warnings.patch
+++ b/0007-silence-compiler-warnings.patch
@@ -20,5 +20,5 @@ index 78316b671..74f5465ef 100644
  if (CMAKE_CONFIGURATION_TYPES)
  
 -- 
-2.37.0
+2.38.1
 
diff --git a/0008-silence-preprocessing.patch b/0008-silence-preprocessing.patch
index ead839a89947..939403dcaa1f 100644
--- a/0008-silence-preprocessing.patch
+++ b/0008-silence-preprocessing.patch
@@ -21,5 +21,5 @@ index d877f0ef3..3d71d4a57 100644
  	add_custom_command(
  		OUTPUT ${DST}
 -- 
-2.37.0
+2.38.1
 
diff --git a/0009-openvdb.patch b/0009-openvdb.patch
index 07f81d7aecfb..a7faeb23c23e 100644
--- a/0009-openvdb.patch
+++ b/0009-openvdb.patch
@@ -145,5 +145,5 @@ index baa52f622..2bfad6bf1 100644
 -TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays bcd opensubdiv openvdb ${BLOSC_LIBRARY} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${PYTHON_LIBRARIES})
 +TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays bcd opensubdiv opencolorio ${OpenVDB_LIBRARIES} ${BLOSC_LIBRARY} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${PYTHON_LIBRARIES})
 -- 
-2.37.0
+2.38.1
 
diff --git a/0011-openimageio.patch b/0010-openimageio.patch
index 140bd56df869..429c56f44038 100644
--- a/0011-openimageio.patch
+++ b/0010-openimageio.patch
@@ -1,7 +1,7 @@
-From 81d27a09836fb5deae2466ebbf4a72ad668642b5 Mon Sep 17 00:00:00 2001
+From 5cb832372c5e12481b922e59ace3878f90fbab72 Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
 Date: Sat, 21 May 2022 18:20:33 +0200
-Subject: [PATCH 11/13] openimageio
+Subject: [PATCH 10/13] openimageio
 
 ---
  cmake/Packages/FindOpenImageIO.cmake | 11 ++++++++++-
@@ -37,5 +37,5 @@ index 66bf54966..49eb82372 100644
  ENDIF(OPENIMAGEIO_FOUND)
  
 -- 
-2.37.0
+2.38.1
 
diff --git a/0010-spdlog.patch b/0010-spdlog.patch
deleted file mode 100644
index cdb3aa0bdbd0..000000000000
--- a/0010-spdlog.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a9b12df0695e228bbfab9ade17e02614d7f0cf84 Mon Sep 17 00:00:00 2001
-From: howetuft <howetuft@gmail.com>
-Date: Sat, 21 May 2022 18:20:14 +0200
-Subject: [PATCH 10/13] 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.37.0
-
diff --git a/0012-opencolorio.patch b/0011-opencolorio.patch
index 0212f7abb725..dc454d026cbb 100644
--- a/0012-opencolorio.patch
+++ b/0011-opencolorio.patch
@@ -1,7 +1,7 @@
-From 5c4853293e69f4ec321175b1f891ffd84d994c1a Mon Sep 17 00:00:00 2001
+From 2d1e68e45d69823c500447dbf7088ee662aac829 Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
 Date: Sat, 21 May 2022 18:21:33 +0200
-Subject: [PATCH 12/13] opencolorio
+Subject: [PATCH 11/13] opencolorio
 
 ---
  deps/opencolorio-2.0.0/src/OpenColorIO/FileRules.cpp | 1 +
@@ -20,5 +20,5 @@ index 329f54f50..f22926b35 100644
  #include <OpenColorIO/OpenColorIO.h>
  
 -- 
-2.37.0
+2.38.1
 
diff --git a/0013-boost179-fstream.patch b/0012-boost179-fstream.patch
index ed0544211f46..6e947ee912d3 100644
--- a/0013-boost179-fstream.patch
+++ b/0012-boost179-fstream.patch
@@ -1,7 +1,7 @@
-From b93dabf72af62b496c18b4f995a65e6050a0cf7f Mon Sep 17 00:00:00 2001
+From 25f332ac644a248be2d6d109dcc52c2a090cdfbb Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
 Date: Sun, 3 Jul 2022 20:02:31 +0200
-Subject: [PATCH 13/13] boost179 fstream
+Subject: [PATCH 12/13] boost179 fstream
 
 ---
  src/luxrays/utils/cuda.cpp | 1 +
@@ -33,5 +33,5 @@ index 785836cef..80b7a8f45 100644
  #include "luxrays/luxrays.h"
  #include "luxrays/utils/utils.h"
 -- 
-2.37.0
+2.38.1
 
diff --git a/0013-spdlog.patch b/0013-spdlog.patch
new file mode 100644
index 000000000000..71088c96d76d
--- /dev/null
+++ b/0013-spdlog.patch
@@ -0,0 +1,187 @@
+From eb0462759684405bc2f2855dac6bdf3a5fa4f30e Mon Sep 17 00:00:00 2001
+From: howetuft <howetuft@gmail.com>
+Date: Sat, 21 May 2022 18:20:14 +0200
+Subject: [PATCH 13/13] spdlog
+
+---
+ CMakeLists.txt                                    | 6 +++++-
+ deps/spdlog-1.8.0/include/spdlog/common-inl.h     | 2 +-
+ include/luxcore/luxcorelogger.h                   | 2 +-
+ include/luxcore/luxcoresink.h                     | 2 +-
+ samples/luxcoreconsole/CMakeLists.txt             | 3 ++-
+ samples/luxcoredemo/CMakeLists.txt                | 3 ++-
+ samples/luxcorescenedemo/CMakeLists.txt           | 3 ++-
+ samples/luxcoreui/CMakeLists.txt                  | 6 +++++-
+ src/luxcore/luxcore.cpp                           | 2 +-
+ src/luxcore/luxcoreinit.cpp                       | 6 +++---
+ tests/luxcoreimplserializationdemo/CMakeLists.txt | 3 ++-
+ 11 files changed, 25 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 586ca9ece..c0da2b5d5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -107,12 +107,16 @@ include_directories("${LuxRays_SOURCE_DIR}/deps/json-3.7.3/include")
+ include_directories("${LuxRays_SOURCE_DIR}/deps/cuew/include")
+ include_directories("${LuxRays_SOURCE_DIR}/deps/clew/include")
+ include_directories("${LuxRays_SOURCE_DIR}/deps/optix-7.1.0/include")
+-include_directories("${LuxRays_SOURCE_DIR}/deps/spdlog-1.8.0/include")
++#include_directories("${LuxRays_SOURCE_DIR}/deps/spdlog-1.8.0/include")
+ include_directories("${LuxRays_SOURCE_DIR}/deps/robin-hood-hashing-3.9.1/src/include")
+ 
+ # Find dependencies
+ include(Dependencies)
+ 
++add_definitions(-DSPDLOG_FMT_EXTERNAL=1)
++find_package(spdlog REQUIRED)
++include_directories(${SPDLOG_INCLUDE_DIRS})
++
+ SET(Boost_Save ${Boost_LIBRARIES})
+ find_package(OpenVDB)
+ LIST(APPEND Boost_LIBRARIES ${Boost_Save})
+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);
+ }
+ 
+diff --git a/include/luxcore/luxcorelogger.h b/include/luxcore/luxcorelogger.h
+index ecf979893..030f891f2 100644
+--- a/include/luxcore/luxcorelogger.h
++++ b/include/luxcore/luxcorelogger.h
+@@ -22,7 +22,7 @@
+ #include <memory>
+ #include <sstream>
+ 
+-#include "spdlog/spdlog.h"
++#include <spdlog/spdlog.h>
+ 
+ #include "luxrays/utils/strutils.h"
+ #include "luxrays/utils/properties.h"
+diff --git a/include/luxcore/luxcoresink.h b/include/luxcore/luxcoresink.h
+index a7207a027..0e8528dd8 100644
+--- a/include/luxcore/luxcoresink.h
++++ b/include/luxcore/luxcoresink.h
+@@ -21,7 +21,7 @@
+ 
+ #include <mutex>
+ 
+-#include "spdlog/sinks/rotating_file_sink.h"
++#include <spdlog/sinks/rotating_file_sink.h>
+ 
+ //------------------------------------------------------------------------------
+ // Our SpdLog sink for LuxCore call back handler
+diff --git a/samples/luxcoreconsole/CMakeLists.txt b/samples/luxcoreconsole/CMakeLists.txt
+index 638bcd1da..bd9a73651 100644
+--- a/samples/luxcoreconsole/CMakeLists.txt
++++ b/samples/luxcoreconsole/CMakeLists.txt
+@@ -27,9 +27,10 @@ set(LUXCORECONSOLE_SRCS
+ 	)
+ 
+ add_executable(luxcoreconsole ${LUXCORECONSOLE_SRCS})
++find_package(fmt REQUIRED)
+ 
+ if(APPLE)
+ TARGET_LINK_LIBRARIES(luxcoreconsole expat "-framework Carbon" "-framework IOKit" ${LUXCORE_LIBRARY} ${Boost_LIBRARIES})
+ else()
+-TARGET_LINK_LIBRARIES(luxcoreconsole opencolorio ${OpenVDB_LIBRARIES}  ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
++  TARGET_LINK_LIBRARIES(luxcoreconsole opencolorio ${OpenVDB_LIBRARIES}  ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} fmt::fmt)
+ endif()
+diff --git a/samples/luxcoredemo/CMakeLists.txt b/samples/luxcoredemo/CMakeLists.txt
+index c7ac7ac77..e2f5d114a 100644
+--- a/samples/luxcoredemo/CMakeLists.txt
++++ b/samples/luxcoredemo/CMakeLists.txt
+@@ -28,5 +28,6 @@ set(LUXCORELIBDEMO_SRCS
+ 
+ add_executable(luxcoredemo ${LUXCORELIBDEMO_SRCS})
+ add_definitions(${VISIBILITY_FLAGS})
++find_package(fmt REQUIRED)
+ 
+-TARGET_LINK_LIBRARIES(luxcoredemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${OPENCL_LIBRARIES} ${CUDA_ALL_LIBRARIES} ${OpenVDB_LIBRARIES})
++TARGET_LINK_LIBRARIES(luxcoredemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${OPENCL_LIBRARIES} ${CUDA_ALL_LIBRARIES} ${OpenVDB_LIBRARIES} fmt::fmt)
+diff --git a/samples/luxcorescenedemo/CMakeLists.txt b/samples/luxcorescenedemo/CMakeLists.txt
+index f428305ec..5a010f325 100644
+--- a/samples/luxcorescenedemo/CMakeLists.txt
++++ b/samples/luxcorescenedemo/CMakeLists.txt
+@@ -28,5 +28,6 @@ set(LUXCORESCENEDEMO_SRCS
+ 
+ add_executable(luxcorescenedemo ${LUXCORESCENEDEMO_SRCS})
+ add_definitions(${VISIBILITY_FLAGS})
++find_package(fmt REQUIRED)
+ 
+-TARGET_LINK_LIBRARIES(luxcorescenedemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${OpenVDB_LIBRARIES})
++TARGET_LINK_LIBRARIES(luxcorescenedemo ${LUXCORE_LIBRARY} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${OpenVDB_LIBRARIES} fmt::fmt)
+diff --git a/samples/luxcoreui/CMakeLists.txt b/samples/luxcoreui/CMakeLists.txt
+index 92f1784f7..c06be0fb6 100644
+--- a/samples/luxcoreui/CMakeLists.txt
++++ b/samples/luxcoreui/CMakeLists.txt
+@@ -85,6 +85,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ ENDIF()
+ 
+ add_executable(luxcoreui ${LUXCOREUI_SRCS})
++find_package(fmt REQUIRED)
+ 
+ if(APPLE)
+ 
+@@ -105,5 +106,8 @@ TARGET_LINK_LIBRARIES(luxcoreui
+ 	${GTK3_LIBRARIES}
+        ${Boost_LIBRARIES}
+         ${PYTHON_LIBRARIES}
+-        ${OpenVDB_LIBRARIES})
++        ${OpenVDB_LIBRARIES}
++        ${FMT_LIBRARIES}
++        fmt::fmt
++        )
+ endif()
+diff --git a/src/luxcore/luxcore.cpp b/src/luxcore/luxcore.cpp
+index ab754faac..2a86bc817 100644
+--- a/src/luxcore/luxcore.cpp
++++ b/src/luxcore/luxcore.cpp
+@@ -19,7 +19,7 @@
+ #include <OpenImageIO/imagebuf.h>
+ #include <OpenImageIO/imagebufalgo.h>
+ 
+-#include "spdlog/spdlog.h"
++#include <spdlog/spdlog.h>
+ 
+ #include "luxrays/core/intersectiondevice.h"
+ #include "luxrays/utils/utils.h"
+diff --git a/src/luxcore/luxcoreinit.cpp b/src/luxcore/luxcoreinit.cpp
+index 489968516..b6cee09a0 100644
+--- a/src/luxcore/luxcoreinit.cpp
++++ b/src/luxcore/luxcoreinit.cpp
+@@ -20,9 +20,9 @@
+ #include <boost/format.hpp>
+ #include <boost/thread/mutex.hpp>
+ 
+-#include "spdlog/spdlog.h"
+-#include "spdlog/sinks/rotating_file_sink.h"
+-#include "spdlog/sinks/null_sink.h"
++#include <spdlog/spdlog.h>
++#include <spdlog/sinks/rotating_file_sink.h>
++#include <spdlog/sinks/null_sink.h>
+ 
+ #include "luxrays/luxrays.h"
+ #include "luxrays/utils/strutils.h"
+diff --git a/tests/luxcoreimplserializationdemo/CMakeLists.txt b/tests/luxcoreimplserializationdemo/CMakeLists.txt
+index 2bfad6bf1..276851016 100644
+--- a/tests/luxcoreimplserializationdemo/CMakeLists.txt
++++ b/tests/luxcoreimplserializationdemo/CMakeLists.txt
+@@ -30,5 +30,6 @@ include_directories(${LuxRays_SOURCE_DIR}/deps/bcd-1.1/include)
+ include_directories(${LuxRays_SOURCE_DIR}/deps/opencolorio-2.0.0/include)
+ 
+ add_executable(luxcoreimplserializationdemo ${LUXCOREIMPL_SERIALIZATIONDEMO_SRCS})
++find_package(fmt)
+ 
+-TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays bcd opensubdiv opencolorio ${OpenVDB_LIBRARIES} ${BLOSC_LIBRARY} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${PYTHON_LIBRARIES})
++TARGET_LINK_LIBRARIES(luxcoreimplserializationdemo luxcore slg-core slg-film slg-kernels luxrays bcd opensubdiv opencolorio ${OpenVDB_LIBRARIES} ${BLOSC_LIBRARY} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${PYTHON_LIBRARIES} fmt::fmt)
+-- 
+2.38.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 0593239968c3..9c101dfce080 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,12 +23,12 @@ pkgver=2.6
 [ -n "${_rel}" ] && _pkgver=${pkgver}${_rel} && pkgver+=".${_rel}" || _pkgver=${pkgver}
 _name=LuxCore-${pkgname}_v${_pkgver}
 epoch=2
-pkgrel=5
+pkgrel=6
 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 openvdb openmp)
+depends+=(blosc boost-libs embree glfw gtk3 openimagedenoise openimageio openvdb fmt python)
 optdepends+=("pyside2: for pyluxcoretools gui")
 makedepends+=(boost cmake doxygen git ninja pyside2-tools)
 provides=(luxrays)
@@ -42,39 +42,39 @@ source=("https://github.com/LuxCoreRender/LuxCore/archive/${pkgname}_v${_pkgver}
         "0007-silence-compiler-warnings.patch"
         "0008-silence-preprocessing.patch"
         "0009-openvdb.patch"
-        "0010-spdlog.patch"
-        "0011-openimageio.patch"
-        "0012-opencolorio.patch"
-        "0013-boost179-fstream.patch"
+        "0010-openimageio.patch"
+        "0011-opencolorio.patch"
+        "0012-boost179-fstream.patch"
+        "0013-spdlog.patch"
         )
 sha256sums=('b844989b8229bf02f3c8aa6845be6a587aa5ae55a45861591119ad0e1a195867'
-            'd4f16fc1b21f2a5b9981db6157ebf64ceb6a9e0719cbbe2126d82c3013caa4ab'
-            '8c9f3554252e4679e0d0a9fc4ad98a9e48846cea396e067466b4b809a945330c'
-            '0b6c8328b4af7390061ba36fbc58eb444a17bce3ef169f5c046f51d2059833fe'
-            'd1b469b86d875757e57df9d9567fa7e242c56673b1158cc085e3ce7f846cdb78'
-            '99cb5223b70a3c1be84ce8639e60b747245f0a81538ff859ecdc63a3f30ec5ef'
-            '8a4f1811965f6dead9e3129f991a068b22585aaee1a25f51cfcc1155f8200060'
-            '464afd2eeddb18bfcdbeda7b21bafe32aced4ca9e7f23145726914839918a2bf'
-            '6c9aa23e19565166ea5fdac569129f245c8e066566bf6f64bc539016a8978ba9'
-            '60873c7b7123fc586fa7f0b5ebb34bada035baab7f82bf2d2ccbc2b145ed3757'
-            '29e673797cf8982434d9cff6adb47b6beb14ebc3062d767430ae51bf4bbae398'
-            '3dbb879a1720faf02bead50a5645e1036ace4b5c561667a4cabf4f5e8134d1b9'
-            '12ce172728510cdaa9fe8b550a9577befece9b013d78b4b5b6d2da5e415eea82'
-            '48c4f8b73ec5fbcf5b5665fe4056554759e7691da4abe6e1169a17562e525b6d')
+            '488e3bf2aac0c412643bbc91248de4fe83f13936cd4b8f963d0d782a52aa3301'
+            '4f501087867efa1fbd7803f0620e39fb25b0e718f63596e1b4d832a58e746aae'
+            '1bb10a3d9c7139699ffab0e11621addb65891b73121c3ba67cf782e609169e2a'
+            '1a3d922a95f305077a33af3b7a3f1a7e8af1a21b8dfc78bcc039353a79e94411'
+            '273ae005ba86f2df0750cc278ed64a8ec33bbaa7f32ffd2c4eb12bf2feb6da0c'
+            '45c09e893d6fa31f5af77c1db5e99261a630a4b866ce6a6448f2644f0ff15f57'
+            '73ac844cd78bf20d625f0250e5555ef59de3cd749efc8baaa23b0cb87052c226'
+            'c8f368a597cc657e42da19d275d7f86d85e718cc94a67e3db307cef51a8540ec'
+            'de3caaa28ccc56041eb8e048a9d6db4862a890fd26f01f5ba716e8b453627fc3'
+            '5cce35bc5a2dddbe4576a1764545502528a1043ed46e22300f3ffd708e04514e'
+            '403436261b647a43bf4e3f7c6bd10d414145197371b044b5ed41e11f33262f15'
+            '98c63144e59a43ec20a3958406f104d5310cd9551e5a5c6563a845b5059a3bdb'
+            '8d4d4233096d301e22f6611f8af90ac34be998a71e67673b3f548ba1079d6289')
 b2sums=('ead966b0df7bb72ac9aa2aefb1e5f2dd020156a8e66f67aeff75d29606072ea7b147ddc4d6effea687baf4653e670bd3ad93fc9c7b0e7cac340cb1d5976adb14'
-        '6b9671a2d8d335a9a551b60f6e616210a56dd89ae20d7b5b41fb55fc96b97f09bee830b8fd23d832bf2dcd05eeafe16a421d69435032424a3796d719cc352bee'
-        'e99e1d551235c0f11ca018136caf2fbb283cb2e03dd9f16c05b93ffb4f37fea45d95008c84d8cac174f225ae13aecf3d02d7639fe8c22e006de00e3189c0fc7e'
-        'aaad4781bfcc07cb3c0a25449c7c52be541e9dfb9c907b8684876f8dd8fd8aec1ba900903d97d8e4e3b95c494acb7f7aaee4c1b1e7e8e3302c62bc3297abc83a'
-        'd64e8e17e60b452f9b3e472293e08caa428937958ba3ae24f0a05b7d9e70a20e1b5d6ab60f901d508241d279905b7226c2ce4de3f378ed62bad88e03fdd5a0c0'
-        'a90af82a64a4a005271931a19671c699dcbe9b7bef609190ca060b65124f85e2cefedd1e0e2d4983a8c231d20af485e3fca3fdbc9e5046ae84bf70919f6b0424'
-        '6c365150d2e63934f6de30e3f6d15260a54a3ca6c8aa5e0d1d56c3ee6f522df6eaeab81052cebf579df5be6c8750d6d606cf7dfad107316c84cfb3da31bd76c9'
-        'b1be50e479cd8d452faccb614a9ce1ebebd0a87832055446c988578d57c03fb315be561eab09849bbb053f2ba0b1daf95c7d4bb430ea4ad23f825eb8519d4542'
-        '484629720dbd2313291428bf4f6996b5a2ccd8df79eae289b0fd766476bdbbe69a75b9628d00d7af89ea24f9cabee4cd4fd01ed30f520b1cbb253fd3e08e87bd'
-        '7a481ac8e1fd2e36f7dbb6297b48b2cc599e71c1752bc56c59179abe40c8ebe5c84319d79e41673f4516f42c56aa01df66d71a761773615e15f8d8ce1d01f56d'
-        '62e39a787c9bdb97999fcb38d97120f90d0895357757e36b8bdf3c4a5b57c67a982f37a905aec98904ca659accddfa47c64e7f5200aac4dc86e17adacfedd328'
-        '2457826edfa6de29da4423cb1473f6875255d6f9cbea1c3b39e66d94029fd9e782c911ff4a67a9ca975c77c5e6c1ad9d489253246c8a7543a7a4e8db4a859313'
-        'c56661331a66a5ea4b3598ecf69dcfdb6fcd6e635f76aaa3eabcd3e0752327b64566458c2489e58db4f568d9066a9413bac98e2942d759091754873330b59b4d'
-        '828f40e954eeb2e47b10bc8b2173000308897042d31cc232d47f5c5883f38e6702c5d62a61446778467bdf398fe9bda0bebfeeea85a88e0bc914af35cd2d1201')
+        'c79c24b2e73b13927b40ffd7ff114ffefc78fd2d6d0b2151f2b35d8784f07aa1b1f48370828ca127ff9ae77aa408363c19ef319dbb41db7fe5a81982466ea91a'
+        'bb540e093ed3e714b703df48c2611953947d45b59683358c5254e3fceb8612103c05953a43cf4410189a6143d41bd829ba26f0df2bb7f0542be55611ac1c395b'
+        '15d0c8325bd130cd75d178c9e144340e9a1677fecb6fbd06d75d41d8a2838223707e33dc5fa1027c2b1be7a7c8f1e376c5613d7426a74115aed9bfe8bd1a6d08'
+        '284afde4f854c689fc1dabde8e0e6beba8ad896027aabc390ebf5811d97d7cc0022733698cdfbacfee496458fad006009a04d20080cacccba5b33a2c8a57564f'
+        '12344286fe26359f5a82073ce5d5507cc981c6d9661e2ace31f3a38ac91fd4458d9d739142695f5380b2e60b75651060693191bf6133fd7c8916827733e3679b'
+        '1b8d6097d9b35778b5ce6c706f6c98a42d5bd4c1f4045464412dfd3d4bd6b224b6e845d40425cc85c55a219303131c0d354f429d2ca1e62287f29c8d098392e0'
+        'ce9185f920f0a94aaf88c1ff71f83f3433e79f065e2a8070028e7a3d4a2b1c535faa9fed452b2a4ae31fffeafe4de1aa346ac6d4f045379b709e90a8c31275ec'
+        '2af04224058508e7c51236eec752c400ac9ec602016f07fee5ec4cbe643a405bdf592ded7e55c8d4fc97aa5aa8ca40256da191f8fbbcffc5b089f0b37981d6bb'
+        'ae6741724b805cfa23c8939148c49003fdd6cd2ecff58acb36d1a587ad6956ff417f652b42d9e2fd56c73de5cb6c6175a3a662d670ee7861500f1af0a68251d6'
+        'cd8fee59875514a22391c0fa5cf85022a33a3dc017d638372c25b0b7f5a1b485f235e872c1d01f6c73277b3526406ead157b76a8d9fa76647e0997744436d0ff'
+        'c18566140d5e85caeafbe443cee237d0a1e012742bbad47733de23ff38e64241b87e9fe961cbbe48997b8445804f36032da695596770abfcd5cda33e2a3fb335'
+        '0affefa29a68a719e307edb5307935b63805bd8e842b9a1db0dce807f64a576f8b3ba7feafea238adee3875b53d3d1ec997880e88707d1f973396060c6dae46d'
+        'cabf93834f26e1585ca8a2003227483c1ed66f7a2edcfcc12d4ed9eaf85247d4f18e6e341c70ffb4305b2ae21a843390aa275faec0bc46e319a3c4d1a5d50e78')
 
 prepare() {
   for patch in "${srcdir}"/*.patch; do