Merge branch 'work'

16 files changed, 197 insertions, 98 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 416d6963b380..5d903aa11424 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = luxcorerender
 	pkgdesc = Physically correct, unbiased rendering engine.
 	pkgver = 2.6
-	pkgrel = 8
+	pkgrel = 9
 	epoch = 2
 	url = https://www.luxcorerender.org/
 	arch = x86_64
@@ -44,33 +44,36 @@ pkgbase = luxcorerender
 	source = 0011-opencolorio.patch
 	source = 0012-boost179-fstream.patch
 	source = 0013-spdlog.patch
+	source = 0014-fmt9.patch
 	sha256sums = b844989b8229bf02f3c8aa6845be6a587aa5ae55a45861591119ad0e1a195867
-	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
+	sha256sums = 818366af720ef49b57c604791caeef0dc5dccf549b764001fdfe2be5016296d6
+	sha256sums = a8293ca87b18bfd12e05c8fec42c7a29001ec50a5996fb0038cdbc5eb8167b55
+	sha256sums = 11471500540a53b2ca4e2289c187a388c76aa388a8f51fd6b9981d36e6cb95f7
+	sha256sums = 261df8e99dacea6261ad513d3e3edd2e69fab953316d7a789a97789178019e7f
+	sha256sums = cb2f0441c0fb9046952dc89dbd0ec38fcfbcfaefba3644358cde881b71c70b77
+	sha256sums = 488382fbf7c62aff55cfa517c74dbed0f2abea7fd060942fa3836750bf65f439
+	sha256sums = 5bf12f95d393d62ee5a11f13db1df46c20958d5832f654d8e8cfad88b6e5892e
+	sha256sums = a2c5901b7e9eeee9a928f8f568493303fc58fb7ca1e6801533e9af53f0cbe470
+	sha256sums = 21dbaa1df164feed463b9caf4aff5733f7b4c8e404b7ec6ad0fc0784151adb4d
+	sha256sums = 010f1a88c238a00e5ea035766514a7fe5c45dc45f247a2240821b10ffb30b6dd
+	sha256sums = 6c34263d955440cb200ddb6f51711fca9b5548ca9ccf133cc924f87298f4dce0
+	sha256sums = 069ca9caef3b7c85ffc4a55de79122488b1b513135b0536b24772c483c8d0cab
+	sha256sums = b8b3d9d4432198e34a281f24c0ffedb4a9f69ce8ee36c30125b83b4a6c6358f6
+	sha256sums = 754b12d61f18a6408d9c4c7814b5402bbe3ed709cad5ddc29ad9cf1ca5a04067
 	b2sums = ead966b0df7bb72ac9aa2aefb1e5f2dd020156a8e66f67aeff75d29606072ea7b147ddc4d6effea687baf4653e670bd3ad93fc9c7b0e7cac340cb1d5976adb14
-	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
+	b2sums = 1a1f4de4f70564216a99f1a27c6321c85187eaea80d9a2a47c66be07fa4a1d825eeef526167aaeb89e4bd67a376a56728af95ee00ee8c1bcc7556afce5f126b0
+	b2sums = 56fa362f1a79e735377b85b1a5303d0761b0b022b9b4a6063af8aee19643bcef0663105cefd969e746ace5cf7e13f3d0da2b7fc696ba0b500f2c21bb57f1bddb
+	b2sums = fde24f909b7f639ac4b1d113710a0e4fb2b1fde97bdbdd905c76fc864bd016fa13965452d5d63dd522ac40663ed8a2e609b93d391e01891f5e780e712f3169c4
+	b2sums = d1a5dd49df142d5bc352240e5674aab30f94775a645598328f4dcc4db17ed208b8cfb818b8f7510d4d031511191290920bd2ebc7ed3776b031febd4ddc94e0bc
+	b2sums = 1ec46e7b28ab00ef696d06f5c0ba6d5fdfe9dc448d9be415239a8013f92334603be8b577c7c3b406648c8e6fe1738933d40b335fb777bc5e90dd623abab05061
+	b2sums = 2249bb65fab1dd4f01077ffa530dfa15d5612c47436819a266c307a16699d978a5fbd5beea9ca066d8877177264095a18af030cc1e7bd3376fc1c4b0f9566647
+	b2sums = 38b9ee28c6453f190c1325846b91f7760ceec3ad2708bc63d6ca46aa58b93b04b21112eab14c07a6ce624f3974f224a7d398a2b392a83f25df8af02b40448b4b
+	b2sums = 5a5fbb58d92e550000c02b26dcca6c0d5bc1b2aa1d5ad93ea303f71a03a67391a06ae3e0f015392c08c35ffb413900fca383834c113fdd90d3db8c74db28db01
+	b2sums = 4fef3e631b55cc1a6449bf6e7546d82459b1386674d079306052c0457699e01e6feec785e317e5e820b5b5bcab32c400ea9c2aa4846c86e7404c541586368a3c
+	b2sums = efe5fcf5065a93bab4a9442eca8c57d780e55a21fbda895cfdda95c1d751834805b49418752578125fb0317136528485d1be6e0d2b6e0d7c971608e38137ca18
+	b2sums = 19a81a9c442272e7d0123bc99b93be8cafab1a84a7a9bbb58e92e5a6624277e85b33c41183e739ebb8898aa886d477854c9075457a4da9266a5a8a0b26387ae0
+	b2sums = 1d434b3eb400af3b4db9ad1fd3f40d8cfcae6d7adcb0912f3fb243f5f824f1df72b6ccd044fc22d7ca5b7476e58ce3ffce0eadbe5d9e8f5a07ab9fcecc85b776
+	b2sums = 34176c1fd0e8e22daab5a986b67a6732170376a618a2e59cf0a3b6ca33c6f1407f61c8a1c92f00cdce1bee850ade295d8092691191d4c2c7cbc05016c4c791d6
+	b2sums = 0397e8edfc21b6498022bda0545fad6c98eba8dcdc0f6f45c920156f27634f7c66dc9ad57f49d48e69d8818065627ddd3cf33259f3a83c576eb16a9304610f3b
 
 pkgname = luxcorerender
diff --git a/0001-glfw.patch b/0001-glfw.patch
index b983f4473980..e9255cf7f8f8 100644
--- a/0001-glfw.patch
+++ b/0001-glfw.patch
@@ -1,7 +1,7 @@
-From fdf20c2ce2ea87663031b322ca38644b0babf1ec Mon Sep 17 00:00:00 2001
+From cac71451ef9ce473d8cd4ee86f6da1f2143efe96 Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
 Date: Sat, 21 May 2022 18:16:28 +0200
-Subject: [PATCH 01/13] glfw
+Subject: [PATCH 01/14] glfw
 
 ---
  samples/luxcoreui/CMakeLists.txt | 5 ++++-
@@ -24,5 +24,5 @@ index 8b74e0704..d2e823874 100644
  include_directories(deps/nfd/include)
  
 -- 
-2.38.1
+2.41.0
 
diff --git a/0002-boost107400.patch b/0002-boost107400.patch
index db18bae9f083..402613c8304c 100644
--- a/0002-boost107400.patch
+++ b/0002-boost107400.patch
@@ -1,7 +1,7 @@
-From 2e84475cf47832d7d1b6b9416b8a0884381c8cf8 Mon Sep 17 00:00:00 2001
+From 7df01f2694a34332e9584ff107ee4c91e75c52ad Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
 Date: Sat, 21 May 2022 18:17:09 +0200
-Subject: [PATCH 02/13] boost107400
+Subject: [PATCH 02/14] boost107400
 
 ---
  src/slg/engines/bakecpu/bakecputhread.cpp         | 2 ++
@@ -11,7 +11,7 @@ Subject: [PATCH 02/13] boost107400
  4 files changed, 7 insertions(+)
 
 diff --git a/src/slg/engines/bakecpu/bakecputhread.cpp b/src/slg/engines/bakecpu/bakecputhread.cpp
-index ca0284271..7eb9e97b1 100644
+index d4766aaf3..82629772c 100644
 --- a/src/slg/engines/bakecpu/bakecputhread.cpp
 +++ b/src/slg/engines/bakecpu/bakecputhread.cpp
 @@ -23,6 +23,8 @@
@@ -24,7 +24,7 @@ index ca0284271..7eb9e97b1 100644
  using namespace luxrays;
  using namespace slg;
 diff --git a/src/slg/engines/pathocl/pathoclopenclthread.cpp b/src/slg/engines/pathocl/pathoclopenclthread.cpp
-index 5d17f8ff4..0cbef9349 100644
+index d006861a5..47d8e7d1e 100644
 --- a/src/slg/engines/pathocl/pathoclopenclthread.cpp
 +++ b/src/slg/engines/pathocl/pathoclopenclthread.cpp
 @@ -31,6 +31,8 @@
@@ -62,5 +62,5 @@ index 6cd3aee46..120eb8cb5 100644
  
  #include "slg/film/film.h"
 -- 
-2.38.1
+2.41.0
 
diff --git a/0003-python.patch b/0003-python.patch
index c9c7f35f9db8..7843f64e84cf 100644
--- a/0003-python.patch
+++ b/0003-python.patch
@@ -1,7 +1,7 @@
-From 59246af1699c3234a5e24b4af5e187acc621e324 Mon Sep 17 00:00:00 2001
+From 92cec4d9caae3d036c5b807cef3392309763c6df Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
 Date: Sat, 21 May 2022 18:17:31 +0200
-Subject: [PATCH 03/13] python
+Subject: [PATCH 03/14] python
 
 ---
  CMakeLists.txt                                    | 4 ++++
@@ -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.38.1
+2.41.0
 
diff --git a/0004-cpplib.patch b/0004-cpplib.patch
index c57a5602b65a..4577f7f4676d 100644
--- a/0004-cpplib.patch
+++ b/0004-cpplib.patch
@@ -1,7 +1,7 @@
-From 5f90e5915e2d24068495371df15f579367a45aa8 Mon Sep 17 00:00:00 2001
+From 61c054c33c70000d6a7c2303698c27b2be7d8490 Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
 Date: Sat, 21 May 2022 18:17:51 +0200
-Subject: [PATCH 04/13] cpplib
+Subject: [PATCH 04/14] cpplib
 
 ---
  src/slg/scene/parsematerials.cpp | 2 ++
@@ -10,7 +10,7 @@ Subject: [PATCH 04/13] cpplib
  3 files changed, 6 insertions(+)
 
 diff --git a/src/slg/scene/parsematerials.cpp b/src/slg/scene/parsematerials.cpp
-index 592c10e81..0288d7c5d 100644
+index 7b3952125..d26cb29e3 100644
 --- a/src/slg/scene/parsematerials.cpp
 +++ b/src/slg/scene/parsematerials.cpp
 @@ -52,6 +52,8 @@
@@ -49,5 +49,5 @@ index c9798c2ec..8101b5742 100644
  using namespace luxrays;
  using namespace slg;
 -- 
-2.38.1
+2.41.0
 
diff --git a/0005-clang-isnan-isinf.patch b/0005-clang-isnan-isinf.patch
index 13e4620d78f2..509330ea68d5 100644
--- a/0005-clang-isnan-isinf.patch
+++ b/0005-clang-isnan-isinf.patch
@@ -1,7 +1,7 @@
-From f98a18521525ebfcc3d481a6c2a6e81c4569fc0f Mon Sep 17 00:00:00 2001
+From a0bd5a19c95ff3fd1f51a434c76da8b0e39ccefc Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
 Date: Sat, 21 May 2022 18:18:23 +0200
-Subject: [PATCH 05/13] clang-isnan-isinf
+Subject: [PATCH 05/14] clang-isnan-isinf
 
 ---
  include/luxrays/utils/utils.h | 5 +++++
@@ -24,5 +24,5 @@ index b6584b383..d48d7d93d 100644
  #include <string>
  #endif
 -- 
-2.38.1
+2.41.0
 
diff --git a/0006-openexr3.patch b/0006-openexr3.patch
index d71dda3d9bda..8befc33735c9 100644
--- a/0006-openexr3.patch
+++ b/0006-openexr3.patch
@@ -1,7 +1,7 @@
-From e2f76bd9aaa4111eaf1b23d907367a982de9d5ff Mon Sep 17 00:00:00 2001
+From 8bde9ca54fa42261c111bbcb530cea94f6c4d0d4 Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
 Date: Sat, 21 May 2022 18:18:50 +0200
-Subject: [PATCH 06/13] openexr3
+Subject: [PATCH 06/14] openexr3
 
 ---
  cmake/Packages/FindOpenEXR.cmake              | 241 ++++++++++--------
@@ -390,5 +390,5 @@ index 551789888..2624f118c 100644
  #include "luxrays/utils/utils.h"
  #include "luxrays/utils/serializationutils.h"
 -- 
-2.38.1
+2.41.0
 
diff --git a/0007-silence-compiler-warnings.patch b/0007-silence-compiler-warnings.patch
index d3de60a650d4..958b4f83645c 100644
--- a/0007-silence-compiler-warnings.patch
+++ b/0007-silence-compiler-warnings.patch
@@ -1,7 +1,7 @@
-From 905c132fe054804cea3897d33c222a33bc41142d Mon Sep 17 00:00:00 2001
+From 14b8584ebbb5065f9a160bb8773986aa231a396b Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
 Date: Sat, 21 May 2022 18:19:13 +0200
-Subject: [PATCH 07/13] silence-compiler-warnings
+Subject: [PATCH 07/14] silence-compiler-warnings
 
 ---
  CMakeLists.txt | 1 +
@@ -20,5 +20,5 @@ index 78316b671..74f5465ef 100644
  if (CMAKE_CONFIGURATION_TYPES)
  
 -- 
-2.38.1
+2.41.0
 
diff --git a/0008-silence-preprocessing.patch b/0008-silence-preprocessing.patch
index 939403dcaa1f..5b451650eee0 100644
--- a/0008-silence-preprocessing.patch
+++ b/0008-silence-preprocessing.patch
@@ -1,7 +1,7 @@
-From 449ef842927c0540d3f4c71b994e7d58fe16b199 Mon Sep 17 00:00:00 2001
+From d1551e23297a88d23caaf3cbde38f9a47b02b688 Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
 Date: Sat, 21 May 2022 18:19:34 +0200
-Subject: [PATCH 08/13] silence-preprocessing
+Subject: [PATCH 08/14] silence-preprocessing
 
 ---
  cmake/KernelPreprocess.cmake | 2 +-
@@ -21,5 +21,5 @@ index d877f0ef3..3d71d4a57 100644
  	add_custom_command(
  		OUTPUT ${DST}
 -- 
-2.38.1
+2.41.0
 
diff --git a/0009-openvdb.patch b/0009-openvdb.patch
index a7faeb23c23e..055ab70fd2e3 100644
--- a/0009-openvdb.patch
+++ b/0009-openvdb.patch
@@ -1,7 +1,7 @@
-From 21ca16138a8f08b48f40c3c0d42d7d188a42fae7 Mon Sep 17 00:00:00 2001
+From a914fa5f804e4299b71dc044e89d82bfcf948a81 Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
 Date: Sat, 21 May 2022 18:19:59 +0200
-Subject: [PATCH 09/13] openvdb
+Subject: [PATCH 09/14] openvdb
 
 ---
  CMakeLists.txt                                    | 12 +++++++++++-
@@ -95,7 +95,7 @@ index 80325af7e..92f1784f7 100644
 +        ${OpenVDB_LIBRARIES})
  endif()
 diff --git a/src/luxcore/CMakeLists.txt b/src/luxcore/CMakeLists.txt
-index f96f5284e..a8df6d601 100644
+index d797b749f..4a3fa76e9 100644
 --- a/src/luxcore/CMakeLists.txt
 +++ b/src/luxcore/CMakeLists.txt
 @@ -175,15 +175,14 @@ set(PYLUXCORE_SRCS
@@ -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.38.1
+2.41.0
 
diff --git a/0010-openimageio.patch b/0010-openimageio.patch
index 429c56f44038..b1b23f66bb89 100644
--- a/0010-openimageio.patch
+++ b/0010-openimageio.patch
@@ -1,7 +1,7 @@
-From 5cb832372c5e12481b922e59ace3878f90fbab72 Mon Sep 17 00:00:00 2001
+From c5599a1a493e2789f2d581735242302da1af9278 Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
 Date: Sat, 21 May 2022 18:20:33 +0200
-Subject: [PATCH 10/13] openimageio
+Subject: [PATCH 10/14] openimageio
 
 ---
  cmake/Packages/FindOpenImageIO.cmake | 11 ++++++++++-
@@ -37,5 +37,5 @@ index 66bf54966..49eb82372 100644
  ENDIF(OPENIMAGEIO_FOUND)
  
 -- 
-2.38.1
+2.41.0
 
diff --git a/0011-opencolorio.patch b/0011-opencolorio.patch
index dc454d026cbb..45348a89ad40 100644
--- a/0011-opencolorio.patch
+++ b/0011-opencolorio.patch
@@ -1,7 +1,7 @@
-From 2d1e68e45d69823c500447dbf7088ee662aac829 Mon Sep 17 00:00:00 2001
+From 9522a41693cfa0125a0a8a238f31434c4140784a Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
 Date: Sat, 21 May 2022 18:21:33 +0200
-Subject: [PATCH 11/13] opencolorio
+Subject: [PATCH 11/14] opencolorio
 
 ---
  deps/opencolorio-2.0.0/src/OpenColorIO/FileRules.cpp | 1 +
@@ -20,5 +20,5 @@ index 329f54f50..f22926b35 100644
  #include <OpenColorIO/OpenColorIO.h>
  
 -- 
-2.38.1
+2.41.0
 
diff --git a/0012-boost179-fstream.patch b/0012-boost179-fstream.patch
index 6e947ee912d3..4e1a5a1c9824 100644
--- a/0012-boost179-fstream.patch
+++ b/0012-boost179-fstream.patch
@@ -1,7 +1,7 @@
-From 25f332ac644a248be2d6d109dcc52c2a090cdfbb Mon Sep 17 00:00:00 2001
+From a6fa314427f99b3d24018490e8dfa18177184445 Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
 Date: Sun, 3 Jul 2022 20:02:31 +0200
-Subject: [PATCH 12/13] boost179 fstream
+Subject: [PATCH 12/14] 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.38.1
+2.41.0
 
diff --git a/0013-spdlog.patch b/0013-spdlog.patch
index 71088c96d76d..7241f460abcf 100644
--- a/0013-spdlog.patch
+++ b/0013-spdlog.patch
@@ -1,7 +1,7 @@
-From eb0462759684405bc2f2855dac6bdf3a5fa4f30e Mon Sep 17 00:00:00 2001
+From 0d29db229c7d403545eff2e64f35a1170836f7ce 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
+Subject: [PATCH 13/14] spdlog
 
 ---
  CMakeLists.txt                                    | 6 +++++-
@@ -183,5 +183,5 @@ index 2bfad6bf1..276851016 100644
 -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
+2.41.0
 
diff --git a/0014-fmt9.patch b/0014-fmt9.patch
new file mode 100644
index 000000000000..7713c6cae58e
--- /dev/null
+++ b/0014-fmt9.patch
@@ -0,0 +1,93 @@
+From 63f1a46b601f5f10fddcda9ce5ed44092352c147 Mon Sep 17 00:00:00 2001
+From: howetuft <howetuft@gmail.com>
+Date: Wed, 16 Aug 2023 20:05:05 +0200
+Subject: [PATCH 14/14] fmt9
+
+---
+ CMakeLists.txt                                    | 3 +++
+ samples/luxcoreconsole/CMakeLists.txt             | 2 +-
+ samples/luxcoredemo/CMakeLists.txt                | 2 +-
+ samples/luxcorescenedemo/CMakeLists.txt           | 2 +-
+ samples/luxcoreui/CMakeLists.txt                  | 2 +-
+ tests/luxcoreimplserializationdemo/CMakeLists.txt | 2 +-
+ 6 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c0da2b5d5..f0067dc1a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -116,6 +116,9 @@ include(Dependencies)
+ add_definitions(-DSPDLOG_FMT_EXTERNAL=1)
+ find_package(spdlog REQUIRED)
+ include_directories(${SPDLOG_INCLUDE_DIRS})
++find_package(fmt 9.0.0...<10.0.0 CONFIG)
++get_target_property(FMT_INCLUDE_DIRECTORIES fmt::fmt INTERFACE_INCLUDE_DIRECTORIES)
++include_directories(${FMT_INCLUDE_DIRECTORIES})
+ 
+ SET(Boost_Save ${Boost_LIBRARIES})
+ find_package(OpenVDB)
+diff --git a/samples/luxcoreconsole/CMakeLists.txt b/samples/luxcoreconsole/CMakeLists.txt
+index bd9a73651..f302c4734 100644
+--- a/samples/luxcoreconsole/CMakeLists.txt
++++ b/samples/luxcoreconsole/CMakeLists.txt
+@@ -27,7 +27,7 @@ set(LUXCORECONSOLE_SRCS
+ 	)
+ 
+ add_executable(luxcoreconsole ${LUXCORECONSOLE_SRCS})
+-find_package(fmt REQUIRED)
++find_package(fmt 9.0.0...<10.0.0 REQUIRED)
+ 
+ if(APPLE)
+ TARGET_LINK_LIBRARIES(luxcoreconsole expat "-framework Carbon" "-framework IOKit" ${LUXCORE_LIBRARY} ${Boost_LIBRARIES})
+diff --git a/samples/luxcoredemo/CMakeLists.txt b/samples/luxcoredemo/CMakeLists.txt
+index e2f5d114a..879929554 100644
+--- a/samples/luxcoredemo/CMakeLists.txt
++++ b/samples/luxcoredemo/CMakeLists.txt
+@@ -28,6 +28,6 @@ set(LUXCORELIBDEMO_SRCS
+ 
+ add_executable(luxcoredemo ${LUXCORELIBDEMO_SRCS})
+ add_definitions(${VISIBILITY_FLAGS})
+-find_package(fmt REQUIRED)
++find_package(fmt 9.0.0...<10.0.0 REQUIRED)
+ 
+ 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 5a010f325..389784e18 100644
+--- a/samples/luxcorescenedemo/CMakeLists.txt
++++ b/samples/luxcorescenedemo/CMakeLists.txt
+@@ -28,6 +28,6 @@ set(LUXCORESCENEDEMO_SRCS
+ 
+ add_executable(luxcorescenedemo ${LUXCORESCENEDEMO_SRCS})
+ add_definitions(${VISIBILITY_FLAGS})
+-find_package(fmt REQUIRED)
++find_package(fmt 9.0.0...<10.0.0 REQUIRED)
+ 
+ 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 c06be0fb6..b6ff48570 100644
+--- a/samples/luxcoreui/CMakeLists.txt
++++ b/samples/luxcoreui/CMakeLists.txt
+@@ -85,7 +85,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ ENDIF()
+ 
+ add_executable(luxcoreui ${LUXCOREUI_SRCS})
+-find_package(fmt REQUIRED)
++find_package(fmt 9.0.0...<10.0.0 REQUIRED)
+ 
+ if(APPLE)
+ 
+diff --git a/tests/luxcoreimplserializationdemo/CMakeLists.txt b/tests/luxcoreimplserializationdemo/CMakeLists.txt
+index 276851016..39de31bbf 100644
+--- a/tests/luxcoreimplserializationdemo/CMakeLists.txt
++++ b/tests/luxcoreimplserializationdemo/CMakeLists.txt
+@@ -30,6 +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)
++find_package(fmt 9.0.0...<10.0.0)
+ 
+ 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.41.0
+
diff --git a/PKGBUILD b/PKGBUILD
index bd57abcae1b2..ff314c09c8a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ pkgver=2.6
 #_rel="rc1"
 [ -n "${_rel}" ] && _pkgver=${pkgver}${_rel} && pkgver+=".${_rel}" || _pkgver=${pkgver}
 _name=LuxCore-${pkgname}_v${_pkgver}
-pkgrel=8
+pkgrel=9
 epoch=2
 pkgdesc="Physically correct, unbiased rendering engine."
 arch=('x86_64')
@@ -30,7 +30,7 @@ url="https://www.luxcorerender.org/"
 license=('Apache')
 depends+=(blosc boost-libs embree3 glfw gtk3 openimagedenoise openimageio openvdb fmt python spdlog)
 optdepends+=("pyside2: for pyluxcoretools gui")
-makedepends+=(boost cmake doxygen git ninja pyside2-tools)
+makedepends+=(boost cmake doxygen git ninja pyside2-tools pyside6-tools-wrappers)
 provides=(luxrays)
 options=('!lto')
 source=("https://github.com/LuxCoreRender/LuxCore/archive/${pkgname}_v${_pkgver}.tar.gz"
@@ -47,35 +47,38 @@ source=("https://github.com/LuxCoreRender/LuxCore/archive/${pkgname}_v${_pkgver}
         "0011-opencolorio.patch"
         "0012-boost179-fstream.patch"
         "0013-spdlog.patch"
+        "0014-fmt9.patch"
         )
 sha256sums=('b844989b8229bf02f3c8aa6845be6a587aa5ae55a45861591119ad0e1a195867'
-            '488e3bf2aac0c412643bbc91248de4fe83f13936cd4b8f963d0d782a52aa3301'
-            '4f501087867efa1fbd7803f0620e39fb25b0e718f63596e1b4d832a58e746aae'
-            '1bb10a3d9c7139699ffab0e11621addb65891b73121c3ba67cf782e609169e2a'
-            '1a3d922a95f305077a33af3b7a3f1a7e8af1a21b8dfc78bcc039353a79e94411'
-            '273ae005ba86f2df0750cc278ed64a8ec33bbaa7f32ffd2c4eb12bf2feb6da0c'
-            '45c09e893d6fa31f5af77c1db5e99261a630a4b866ce6a6448f2644f0ff15f57'
-            '73ac844cd78bf20d625f0250e5555ef59de3cd749efc8baaa23b0cb87052c226'
-            'c8f368a597cc657e42da19d275d7f86d85e718cc94a67e3db307cef51a8540ec'
-            'de3caaa28ccc56041eb8e048a9d6db4862a890fd26f01f5ba716e8b453627fc3'
-            '5cce35bc5a2dddbe4576a1764545502528a1043ed46e22300f3ffd708e04514e'
-            '403436261b647a43bf4e3f7c6bd10d414145197371b044b5ed41e11f33262f15'
-            '98c63144e59a43ec20a3958406f104d5310cd9551e5a5c6563a845b5059a3bdb'
-            '8d4d4233096d301e22f6611f8af90ac34be998a71e67673b3f548ba1079d6289')
+            '818366af720ef49b57c604791caeef0dc5dccf549b764001fdfe2be5016296d6'
+            'a8293ca87b18bfd12e05c8fec42c7a29001ec50a5996fb0038cdbc5eb8167b55'
+            '11471500540a53b2ca4e2289c187a388c76aa388a8f51fd6b9981d36e6cb95f7'
+            '261df8e99dacea6261ad513d3e3edd2e69fab953316d7a789a97789178019e7f'
+            'cb2f0441c0fb9046952dc89dbd0ec38fcfbcfaefba3644358cde881b71c70b77'
+            '488382fbf7c62aff55cfa517c74dbed0f2abea7fd060942fa3836750bf65f439'
+            '5bf12f95d393d62ee5a11f13db1df46c20958d5832f654d8e8cfad88b6e5892e'
+            'a2c5901b7e9eeee9a928f8f568493303fc58fb7ca1e6801533e9af53f0cbe470'
+            '21dbaa1df164feed463b9caf4aff5733f7b4c8e404b7ec6ad0fc0784151adb4d'
+            '010f1a88c238a00e5ea035766514a7fe5c45dc45f247a2240821b10ffb30b6dd'
+            '6c34263d955440cb200ddb6f51711fca9b5548ca9ccf133cc924f87298f4dce0'
+            '069ca9caef3b7c85ffc4a55de79122488b1b513135b0536b24772c483c8d0cab'
+            'b8b3d9d4432198e34a281f24c0ffedb4a9f69ce8ee36c30125b83b4a6c6358f6'
+            '754b12d61f18a6408d9c4c7814b5402bbe3ed709cad5ddc29ad9cf1ca5a04067')
 b2sums=('ead966b0df7bb72ac9aa2aefb1e5f2dd020156a8e66f67aeff75d29606072ea7b147ddc4d6effea687baf4653e670bd3ad93fc9c7b0e7cac340cb1d5976adb14'
-        'c79c24b2e73b13927b40ffd7ff114ffefc78fd2d6d0b2151f2b35d8784f07aa1b1f48370828ca127ff9ae77aa408363c19ef319dbb41db7fe5a81982466ea91a'
-        'bb540e093ed3e714b703df48c2611953947d45b59683358c5254e3fceb8612103c05953a43cf4410189a6143d41bd829ba26f0df2bb7f0542be55611ac1c395b'
-        '15d0c8325bd130cd75d178c9e144340e9a1677fecb6fbd06d75d41d8a2838223707e33dc5fa1027c2b1be7a7c8f1e376c5613d7426a74115aed9bfe8bd1a6d08'
-        '284afde4f854c689fc1dabde8e0e6beba8ad896027aabc390ebf5811d97d7cc0022733698cdfbacfee496458fad006009a04d20080cacccba5b33a2c8a57564f'
-        '12344286fe26359f5a82073ce5d5507cc981c6d9661e2ace31f3a38ac91fd4458d9d739142695f5380b2e60b75651060693191bf6133fd7c8916827733e3679b'
-        '1b8d6097d9b35778b5ce6c706f6c98a42d5bd4c1f4045464412dfd3d4bd6b224b6e845d40425cc85c55a219303131c0d354f429d2ca1e62287f29c8d098392e0'
-        'ce9185f920f0a94aaf88c1ff71f83f3433e79f065e2a8070028e7a3d4a2b1c535faa9fed452b2a4ae31fffeafe4de1aa346ac6d4f045379b709e90a8c31275ec'
-        '2af04224058508e7c51236eec752c400ac9ec602016f07fee5ec4cbe643a405bdf592ded7e55c8d4fc97aa5aa8ca40256da191f8fbbcffc5b089f0b37981d6bb'
-        'ae6741724b805cfa23c8939148c49003fdd6cd2ecff58acb36d1a587ad6956ff417f652b42d9e2fd56c73de5cb6c6175a3a662d670ee7861500f1af0a68251d6'
-        'cd8fee59875514a22391c0fa5cf85022a33a3dc017d638372c25b0b7f5a1b485f235e872c1d01f6c73277b3526406ead157b76a8d9fa76647e0997744436d0ff'
-        'c18566140d5e85caeafbe443cee237d0a1e012742bbad47733de23ff38e64241b87e9fe961cbbe48997b8445804f36032da695596770abfcd5cda33e2a3fb335'
-        '0affefa29a68a719e307edb5307935b63805bd8e842b9a1db0dce807f64a576f8b3ba7feafea238adee3875b53d3d1ec997880e88707d1f973396060c6dae46d'
-        'cabf93834f26e1585ca8a2003227483c1ed66f7a2edcfcc12d4ed9eaf85247d4f18e6e341c70ffb4305b2ae21a843390aa275faec0bc46e319a3c4d1a5d50e78')
+        '1a1f4de4f70564216a99f1a27c6321c85187eaea80d9a2a47c66be07fa4a1d825eeef526167aaeb89e4bd67a376a56728af95ee00ee8c1bcc7556afce5f126b0'
+        '56fa362f1a79e735377b85b1a5303d0761b0b022b9b4a6063af8aee19643bcef0663105cefd969e746ace5cf7e13f3d0da2b7fc696ba0b500f2c21bb57f1bddb'
+        'fde24f909b7f639ac4b1d113710a0e4fb2b1fde97bdbdd905c76fc864bd016fa13965452d5d63dd522ac40663ed8a2e609b93d391e01891f5e780e712f3169c4'
+        'd1a5dd49df142d5bc352240e5674aab30f94775a645598328f4dcc4db17ed208b8cfb818b8f7510d4d031511191290920bd2ebc7ed3776b031febd4ddc94e0bc'
+        '1ec46e7b28ab00ef696d06f5c0ba6d5fdfe9dc448d9be415239a8013f92334603be8b577c7c3b406648c8e6fe1738933d40b335fb777bc5e90dd623abab05061'
+        '2249bb65fab1dd4f01077ffa530dfa15d5612c47436819a266c307a16699d978a5fbd5beea9ca066d8877177264095a18af030cc1e7bd3376fc1c4b0f9566647'
+        '38b9ee28c6453f190c1325846b91f7760ceec3ad2708bc63d6ca46aa58b93b04b21112eab14c07a6ce624f3974f224a7d398a2b392a83f25df8af02b40448b4b'
+        '5a5fbb58d92e550000c02b26dcca6c0d5bc1b2aa1d5ad93ea303f71a03a67391a06ae3e0f015392c08c35ffb413900fca383834c113fdd90d3db8c74db28db01'
+        '4fef3e631b55cc1a6449bf6e7546d82459b1386674d079306052c0457699e01e6feec785e317e5e820b5b5bcab32c400ea9c2aa4846c86e7404c541586368a3c'
+        'efe5fcf5065a93bab4a9442eca8c57d780e55a21fbda895cfdda95c1d751834805b49418752578125fb0317136528485d1be6e0d2b6e0d7c971608e38137ca18'
+        '19a81a9c442272e7d0123bc99b93be8cafab1a84a7a9bbb58e92e5a6624277e85b33c41183e739ebb8898aa886d477854c9075457a4da9266a5a8a0b26387ae0'
+        '1d434b3eb400af3b4db9ad1fd3f40d8cfcae6d7adcb0912f3fb243f5f824f1df72b6ccd044fc22d7ca5b7476e58ce3ffce0eadbe5d9e8f5a07ab9fcecc85b776'
+        '34176c1fd0e8e22daab5a986b67a6732170376a618a2e59cf0a3b6ca33c6f1407f61c8a1c92f00cdce1bee850ade295d8092691191d4c2c7cbc05016c4c791d6'
+        '0397e8edfc21b6498022bda0545fad6c98eba8dcdc0f6f45c920156f27634f7c66dc9ad57f49d48e69d8818065627ddd3cf33259f3a83c576eb16a9304610f3b')
 
 prepare() {
   for patch in "${srcdir}"/*.patch; do