summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorhowetuft2024-01-31 15:33:25 +0100
committerhowetuft2024-01-31 16:18:22 +0100
commitabc42a7fee204a64a8394a3d2f6f4ac8718ee6ca (patch)
tree165cac759cb4040b5f748ad60152c184e858b487
parentb570197b74493ed8c1ed94dfe18067efb607f9e6 (diff)
downloadaur-abc42a7fee204a64a8394a3d2f6f4ac8718ee6ca.tar.gz
Remove fmt dependency
Diffstat
-rw-r--r--.SRCINFO92
-rw-r--r--0001-cxx-version.patch25
-rw-r--r--0002-silence-compiler-warnings.patch (renamed from 0007-silence-compiler-warnings.patch)14
-rw-r--r--0003-silence-preprocessing.patch (renamed from 0008-silence-preprocessing.patch)6
-rw-r--r--0004-glfw.patch (renamed from 0001-glfw.patch)6
-rw-r--r--0005-boost107400.patch (renamed from 0002-boost107400.patch)6
-rw-r--r--0006-python.patch (renamed from 0003-python.patch)8
-rw-r--r--0007-cpplib.patch (renamed from 0004-cpplib.patch)6
-rw-r--r--0008-clang-isnan-isinf.patch (renamed from 0005-clang-isnan-isinf.patch)6
-rw-r--r--0009-openexr3.patch (renamed from 0006-openexr3.patch)6
-rw-r--r--0010-openvdb.patch (renamed from 0009-openvdb.patch)27
-rw-r--r--0011-openimageio.patch (renamed from 0010-openimageio.patch)6
-rw-r--r--0012-opencolorio.patch (renamed from 0011-opencolorio.patch)6
-rw-r--r--0013-boost179-fstream.patch (renamed from 0012-boost179-fstream.patch)6
-rw-r--r--0013-spdlog.patch187
-rw-r--r--0014-fmt9.patch107
-rw-r--r--0014-spdlog.patch136
-rw-r--r--PKGBUILD91
18 files changed, 299 insertions, 442 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 18e57495ab54..5176c0585650 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = luxcorerender
pkgdesc = Physically correct, unbiased rendering engine.
pkgver = 2.7.beta1
- pkgrel = 1
+ pkgrel = 2
epoch = 2
url = https://www.luxcorerender.org/
arch = x86_64
@@ -14,7 +14,6 @@ pkgbase = luxcorerender
makedepends = git
makedepends = ninja
makedepends = pyside2-tools
- makedepends = pyside6-tools-wrappers
depends = opencl-icd-loader
depends = blosc
depends = boost-libs
@@ -24,7 +23,6 @@ pkgbase = luxcorerender
depends = openimagedenoise
depends = openimageio
depends = openvdb
- depends = fmt9
depends = python
depends = spdlog
optdepends = opencl-driver: for gpu acceleration
@@ -32,49 +30,49 @@ pkgbase = luxcorerender
provides = luxrays
options = !lto
source = https://github.com/LuxCoreRender/LuxCore/archive/luxcorerender_v2.7beta1.tar.gz
- source = 0001-glfw.patch
- source = 0002-boost107400.patch
- source = 0003-python.patch
- source = 0004-cpplib.patch
- source = 0005-clang-isnan-isinf.patch
- source = 0006-openexr3.patch
- source = 0007-silence-compiler-warnings.patch
- source = 0008-silence-preprocessing.patch
- source = 0009-openvdb.patch
- source = 0010-openimageio.patch
- source = 0011-opencolorio.patch
- source = 0012-boost179-fstream.patch
- source = 0013-spdlog.patch
- source = 0014-fmt9.patch
- sha256sums = 24adaf0da781921ed18c2aee55468ee94138db023e5cff95a5ede0fb394f8c09
- sha256sums = 818366af720ef49b57c604791caeef0dc5dccf549b764001fdfe2be5016296d6
- sha256sums = a8293ca87b18bfd12e05c8fec42c7a29001ec50a5996fb0038cdbc5eb8167b55
- sha256sums = 11471500540a53b2ca4e2289c187a388c76aa388a8f51fd6b9981d36e6cb95f7
- sha256sums = 261df8e99dacea6261ad513d3e3edd2e69fab953316d7a789a97789178019e7f
- sha256sums = cb2f0441c0fb9046952dc89dbd0ec38fcfbcfaefba3644358cde881b71c70b77
- sha256sums = 488382fbf7c62aff55cfa517c74dbed0f2abea7fd060942fa3836750bf65f439
- sha256sums = 5bf12f95d393d62ee5a11f13db1df46c20958d5832f654d8e8cfad88b6e5892e
- sha256sums = a2c5901b7e9eeee9a928f8f568493303fc58fb7ca1e6801533e9af53f0cbe470
- sha256sums = d8c24fc0f32883b0a97191b3eb5d0d4bcb4d8c2790d8786902ea4dbbb36eff43
- sha256sums = 010f1a88c238a00e5ea035766514a7fe5c45dc45f247a2240821b10ffb30b6dd
- sha256sums = 6c34263d955440cb200ddb6f51711fca9b5548ca9ccf133cc924f87298f4dce0
- sha256sums = 069ca9caef3b7c85ffc4a55de79122488b1b513135b0536b24772c483c8d0cab
- sha256sums = b8b3d9d4432198e34a281f24c0ffedb4a9f69ce8ee36c30125b83b4a6c6358f6
- sha256sums = e4ad9b7a0b77e0ca00136159f8f7c8e5940d26918421f18114ad5657fbf32359
- b2sums = 0f6203610dbef2fd2d43c6465502459337eb99da00b494d7bfcab245b8fdb3d9f9179018e6d9b2f927024f6a21fba4d5cfb51e9e14049d1a56ce8aabaea2312d
- b2sums = 1a1f4de4f70564216a99f1a27c6321c85187eaea80d9a2a47c66be07fa4a1d825eeef526167aaeb89e4bd67a376a56728af95ee00ee8c1bcc7556afce5f126b0
- b2sums = 56fa362f1a79e735377b85b1a5303d0761b0b022b9b4a6063af8aee19643bcef0663105cefd969e746ace5cf7e13f3d0da2b7fc696ba0b500f2c21bb57f1bddb
- b2sums = fde24f909b7f639ac4b1d113710a0e4fb2b1fde97bdbdd905c76fc864bd016fa13965452d5d63dd522ac40663ed8a2e609b93d391e01891f5e780e712f3169c4
- b2sums = d1a5dd49df142d5bc352240e5674aab30f94775a645598328f4dcc4db17ed208b8cfb818b8f7510d4d031511191290920bd2ebc7ed3776b031febd4ddc94e0bc
- b2sums = 1ec46e7b28ab00ef696d06f5c0ba6d5fdfe9dc448d9be415239a8013f92334603be8b577c7c3b406648c8e6fe1738933d40b335fb777bc5e90dd623abab05061
- b2sums = 2249bb65fab1dd4f01077ffa530dfa15d5612c47436819a266c307a16699d978a5fbd5beea9ca066d8877177264095a18af030cc1e7bd3376fc1c4b0f9566647
- b2sums = 38b9ee28c6453f190c1325846b91f7760ceec3ad2708bc63d6ca46aa58b93b04b21112eab14c07a6ce624f3974f224a7d398a2b392a83f25df8af02b40448b4b
- b2sums = 5a5fbb58d92e550000c02b26dcca6c0d5bc1b2aa1d5ad93ea303f71a03a67391a06ae3e0f015392c08c35ffb413900fca383834c113fdd90d3db8c74db28db01
- b2sums = aef00c485858c07953ef1e1ed9d1ea8871a1ee25bb156eaebf6bdf006a3e7ce06bba350ba8aa2c521500dbfafb236b71fff2807b0d516e74179781b12b0fcaf9
- b2sums = efe5fcf5065a93bab4a9442eca8c57d780e55a21fbda895cfdda95c1d751834805b49418752578125fb0317136528485d1be6e0d2b6e0d7c971608e38137ca18
- b2sums = 19a81a9c442272e7d0123bc99b93be8cafab1a84a7a9bbb58e92e5a6624277e85b33c41183e739ebb8898aa886d477854c9075457a4da9266a5a8a0b26387ae0
- b2sums = 1d434b3eb400af3b4db9ad1fd3f40d8cfcae6d7adcb0912f3fb243f5f824f1df72b6ccd044fc22d7ca5b7476e58ce3ffce0eadbe5d9e8f5a07ab9fcecc85b776
- b2sums = 34176c1fd0e8e22daab5a986b67a6732170376a618a2e59cf0a3b6ca33c6f1407f61c8a1c92f00cdce1bee850ade295d8092691191d4c2c7cbc05016c4c791d6
- b2sums = 084628e44473a2ddb5fdcffb5ddab5dabf02aee46de01a3a0f22f0ffab958be3980494078a7b4b2fcd2168a4d048de13ac14cecd26dda97ff00037e41ca50c11
+ source = 0001-cxx-version.patch
+ source = 0002-silence-compiler-warnings.patch
+ source = 0003-silence-preprocessing.patch
+ source = 0004-glfw.patch
+ source = 0005-boost107400.patch
+ source = 0006-python.patch
+ source = 0007-cpplib.patch
+ source = 0008-clang-isnan-isinf.patch
+ source = 0009-openexr3.patch
+ source = 0010-openvdb.patch
+ source = 0011-openimageio.patch
+ source = 0012-opencolorio.patch
+ source = 0013-boost179-fstream.patch
+ source = 0014-spdlog.patch
+ sha256sums = b844989b8229bf02f3c8aa6845be6a587aa5ae55a45861591119ad0e1a195867
+ sha256sums = d3e0c4f74341746bf271efa6a62f3f0e2a72072afd86c032a9a5a1a565cf28f0
+ sha256sums = 540f6e92877165c06ce70d2c7ac5c28ec95632520941b645f63ffa5d77541693
+ sha256sums = d754596d2c17a3d12fa38abb373f4a58b2ca7a0b8df8fdf7ba9e991753998b6b
+ sha256sums = 77db48d1a823f345a170c0632d3bfa0a962c92f6c662117e2a96a172d48732e9
+ sha256sums = 415ba07ff99f9b97106aa806c6c1b40b68be3c39096ecd08cd2e0d40e6ea2fc3
+ sha256sums = fa142fa282ae3e2482e7c39ffa07382d68ad732f32468eae5aa67d4378efc144
+ sha256sums = 71b62a8c8c61779d914ce8e10bb5594dd0ed8bfecc1d6007263870393bb89955
+ sha256sums = 09bf685f7367b05ac2d756e22c3b8d7a1ba931bca7ef4d6096852bbcdd203f8b
+ sha256sums = e2034c00d456cf04843f84ee36eca991498a9580d52d15fafebe63f61642afb2
+ sha256sums = 12bb2b0873b14f7878b9ec05b36a18156879b770da5ba47505bf3d6004038092
+ sha256sums = 9eca0d8c3de4088ed02b40b5269ce709077f0b810eaa570050d9f41c320e79ee
+ sha256sums = 1d91f515a4fcfb88119e02a71f4a5185a6765991296cd1d4760e36a642c29ff1
+ sha256sums = 3185b3e4b42423fb51ef007e9f36f193ef7bd54bb83efdb242e7ba3c6fb67532
+ sha256sums = ca46c01fbe2183916e20e990c23991148e878e401cec6d9ddabf7aa6bfdc6933
+ b2sums = ead966b0df7bb72ac9aa2aefb1e5f2dd020156a8e66f67aeff75d29606072ea7b147ddc4d6effea687baf4653e670bd3ad93fc9c7b0e7cac340cb1d5976adb14
+ b2sums = 2b8c411347c4b27b21cddf7f4543beeaa229968e95f59f762b872264afd23cb5cea8074bd606b8e56df1a84473ada13720f8fb097fcfb80303495a89ed9052ef
+ b2sums = 97302dc99edebe5f35d5d469b2a2a9172eb7357248fb2bcc4510507de59a4d1db32cbfaf18acbba29b5046011615f57eb6ab322346560ec2777172c6b08a30b9
+ b2sums = c951ce3d6172c0a916c13fa53c682336a74d229c6e903f26c40f7a6e91a6b3ff54241178f85e4945d621210d23f54503b95e69d0f05e40246165eb23422aafb9
+ b2sums = 88e40b301961daef2e493b71cbd497aeb63035e9ed1ff2078c98c6a2c0e17f7c23a712905cd335ad3cc518b7b53b503441b261bc04ee6a27cb8531f74ec019f8
+ b2sums = 8ef8933c5dc6acb0881ddb51f959530eeda80c7d7d0a1e26ce5878e19b082746e95af8bee53e5937276e500473bbd56137cf68e5901b2a0a48d9255e11016cbf
+ b2sums = 96708a30229163849cefc4e7e13db571fe2529f08952a999a2176f99b4748869391184345780ef22d74ae8c93fb18b0a8831fcb5f3b043bcb63b545e90396205
+ b2sums = 7c8979e9549b03f0535d5760d9929acfb0d954b027253ec42ce910033c5aac60a34af3bbe92b6b07b9a3d0c0e66a43373b74697bdbc91e2ca6ae42ae4866352d
+ b2sums = 947d3cba2c9e1c4c430f9623a13f5275613491ac1125c88b042dc4bb0fa6905c8955731e75e954850035f3605df12fdf5f77b5caec7495b3d321aa6eb357bd57
+ b2sums = 3e2431d7b0175a7ec0ac452d0201222a26d16cb02191aa7a65a14cfb6af5a99109e82efeb8125f5b8b76314bfbc8ede5d055da5955cfa5d0238870d9de3bd73c
+ b2sums = 76ee674dcbcd52c698924cbcd547d2b8a4b3761cf2ade8d7c463b2a5bdc9f741537485ce9db12968d3b43a28cca1508223e3a363fc7c0b7b9483e107d77155e7
+ b2sums = 6ebaf49099a78adb59c0f9c601410529b8709377ec1c6eacf9510bdf5fba5027cdd81bae6422425cceab6ee1ebb4709a3edf9d818fcce2a5b475e009153a7842
+ b2sums = f56cec862ace8a1499a1a718f3c88488661b7d683d4e9bafc027d20fcb6542ce91a70f11ad46dd7a5ad0e61f2cd8dff6247617ad8d51b378e96fdc5e0c1ae94a
+ b2sums = 78333747e508f28293c85175e0f9d0624b8303c1f4f5491304e79c3dbc104fedf4eaac9065f0876a968d379898eb5810cd802350adae44de5f44673b0949f1ba
+ b2sums = 5e59c732a417775984cd85755b7a1810b33fb8a09cb3a8542c048958e7788d1aac3ecef5f28266278ca6444e1f59421b1d167a305eda9e70c0ae62155c01274b
pkgname = luxcorerender
diff --git a/0001-cxx-version.patch b/0001-cxx-version.patch
new file mode 100644
index 000000000000..e7f2cf76380f
--- /dev/null
+++ b/0001-cxx-version.patch
@@ -0,0 +1,25 @@
+From d73cadf257821da12ce526432ed6fe8e6fb5665a Mon Sep 17 00:00:00 2001
+From: howetuft <howetuft@gmail.com>
+Date: Wed, 31 Jan 2024 06:51:35 +0100
+Subject: [PATCH 01/14] cxx-version
+
+---
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 72c1996ac..fad738f43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,6 +41,8 @@ unset(CMAKE_CONFIGURATION_TYPES CACHE)
+ # This boots up the generator:
+ enable_language(C)
+ enable_language(CXX)
++set(CMAKE_CXX_STANDARD 23)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+ if (CMAKE_CONFIGURATION_TYPES)
+
+--
+2.43.0
+
diff --git a/0007-silence-compiler-warnings.patch b/0002-silence-compiler-warnings.patch
index 958b4f83645c..758649761611 100644
--- a/0007-silence-compiler-warnings.patch
+++ b/0002-silence-compiler-warnings.patch
@@ -1,24 +1,24 @@
-From 14b8584ebbb5065f9a160bb8773986aa231a396b Mon Sep 17 00:00:00 2001
+From a7943d7b3f00c5d1405214761bbdc65bf9c578ad Mon Sep 17 00:00:00 2001
From: howetuft <howetuft@gmail.com>
Date: Sat, 21 May 2022 18:19:13 +0200
-Subject: [PATCH 07/14] silence-compiler-warnings
+Subject: [PATCH 02/14] silence-compiler-warnings
---
CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 78316b671..74f5465ef 100644
+index fad738f43..a266db8f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -45,6 +45,7 @@ unset(CMAKE_CONFIGURATION_TYPES CACHE)
- # This boots up the generator:
- enable_language(C)
+@@ -43,6 +43,7 @@ enable_language(C)
enable_language(CXX)
+ set(CMAKE_CXX_STANDARD 23)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
if (CMAKE_CONFIGURATION_TYPES)
--
-2.41.0
+2.43.0
diff --git a/0008-silence-preprocessing.patch b/0003-silence-preprocessing.patch
index 5b451650eee0..61a2fcaedc20 100644
--- a/0008-silence-preprocessing.patch
+++ b/0003-silence-preprocessing.patch
@@ -1,7 +1,7 @@
-From d1551e23297a88d23caaf3cbde38f9a47b02b688 Mon Sep 17 00:00:00 2001
+From ad805c618b38f3a9918f7e10dfa3a5411f42283f Mon Sep 17 00:00:00 2001
From: howetuft <howetuft@gmail.com>
Date: Sat, 21 May 2022 18:19:34 +0200
-Subject: [PATCH 08/14] silence-preprocessing
+Subject: [PATCH 03/14] silence-preprocessing
---
cmake/KernelPreprocess.cmake | 2 +-
@@ -21,5 +21,5 @@ index d877f0ef3..3d71d4a57 100644
add_custom_command(
OUTPUT ${DST}
--
-2.41.0
+2.43.0
diff --git a/0001-glfw.patch b/0004-glfw.patch
index e9255cf7f8f8..90070a15188b 100644
--- a/0001-glfw.patch
+++ b/0004-glfw.patch
@@ -1,7 +1,7 @@
-From cac71451ef9ce473d8cd4ee86f6da1f2143efe96 Mon Sep 17 00:00:00 2001
+From be9e10a37ac78e8f3aee57d65694c0eebc27b90c Mon Sep 17 00:00:00 2001
From: howetuft <howetuft@gmail.com>
Date: Sat, 21 May 2022 18:16:28 +0200
-Subject: [PATCH 01/14] glfw
+Subject: [PATCH 04/14] glfw
---
samples/luxcoreui/CMakeLists.txt | 5 ++++-
@@ -24,5 +24,5 @@ index 8b74e0704..d2e823874 100644
include_directories(deps/nfd/include)
--
-2.41.0
+2.43.0
diff --git a/0002-boost107400.patch b/0005-boost107400.patch
index 402613c8304c..6aa57c25f308 100644
--- a/0002-boost107400.patch
+++ b/0005-boost107400.patch
@@ -1,7 +1,7 @@
-From 7df01f2694a34332e9584ff107ee4c91e75c52ad Mon Sep 17 00:00:00 2001
+From 15c4773cdbe2322860face1ac8f54baf24ebf04b Mon Sep 17 00:00:00 2001
From: howetuft <howetuft@gmail.com>
Date: Sat, 21 May 2022 18:17:09 +0200
-Subject: [PATCH 02/14] boost107400
+Subject: [PATCH 05/14] boost107400
---
src/slg/engines/bakecpu/bakecputhread.cpp | 2 ++
@@ -62,5 +62,5 @@ index 6cd3aee46..120eb8cb5 100644
#include "slg/film/film.h"
--
-2.41.0
+2.43.0
diff --git a/0003-python.patch b/0006-python.patch
index 7843f64e84cf..16dafd757827 100644
--- a/0003-python.patch
+++ b/0006-python.patch
@@ -1,7 +1,7 @@
-From 92cec4d9caae3d036c5b807cef3392309763c6df Mon Sep 17 00:00:00 2001
+From a6fbe12e4031aea2a23088ec1ec224dbe84a19af Mon Sep 17 00:00:00 2001
From: howetuft <howetuft@gmail.com>
Date: Sat, 21 May 2022 18:17:31 +0200
-Subject: [PATCH 03/14] python
+Subject: [PATCH 06/14] python
---
CMakeLists.txt | 4 ++++
@@ -13,7 +13,7 @@ Subject: [PATCH 03/14] python
6 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 72c1996ac..78316b671 100644
+index a266db8f2..393a1cbaa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,10 @@ MESSAGE(STATUS "CMake version " ${CMAKE_VERSION} " detected")
@@ -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.41.0
+2.43.0
diff --git a/0004-cpplib.patch b/0007-cpplib.patch
index 4577f7f4676d..4517b62ef8ac 100644
--- a/0004-cpplib.patch
+++ b/0007-cpplib.patch
@@ -1,7 +1,7 @@
-From 61c054c33c70000d6a7c2303698c27b2be7d8490 Mon Sep 17 00:00:00 2001
+From a0165f46b8bd07d0c19f5e5ded7a3f102adb9f1f Mon Sep 17 00:00:00 2001
From: howetuft <howetuft@gmail.com>
Date: Sat, 21 May 2022 18:17:51 +0200
-Subject: [PATCH 04/14] cpplib
+Subject: [PATCH 07/14] cpplib
---
src/slg/scene/parsematerials.cpp | 2 ++
@@ -49,5 +49,5 @@ index c9798c2ec..8101b5742 100644
using namespace luxrays;
using namespace slg;
--
-2.41.0
+2.43.0
diff --git a/0005-clang-isnan-isinf.patch b/0008-clang-isnan-isinf.patch
index 509330ea68d5..52b53615ba73 100644
--- a/0005-clang-isnan-isinf.patch
+++ b/0008-clang-isnan-isinf.patch
@@ -1,7 +1,7 @@
-From a0bd5a19c95ff3fd1f51a434c76da8b0e39ccefc Mon Sep 17 00:00:00 2001
+From 816c122471a1d0000a4059ca43142431e63eb755 Mon Sep 17 00:00:00 2001
From: howetuft <howetuft@gmail.com>
Date: Sat, 21 May 2022 18:18:23 +0200
-Subject: [PATCH 05/14] clang-isnan-isinf
+Subject: [PATCH 08/14] clang-isnan-isinf
---
include/luxrays/utils/utils.h | 5 +++++
@@ -24,5 +24,5 @@ index b6584b383..d48d7d93d 100644
#include <string>
#endif
--
-2.41.0
+2.43.0
diff --git a/0006-openexr3.patch b/0009-openexr3.patch
index 8befc33735c9..7753e652f8b3 100644
--- a/0006-openexr3.patch
+++ b/0009-openexr3.patch
@@ -1,7 +1,7 @@
-From 8bde9ca54fa42261c111bbcb530cea94f6c4d0d4 Mon Sep 17 00:00:00 2001
+From 596bb2f33c70b7c6859019971938194cc39e8bdb Mon Sep 17 00:00:00 2001
From: howetuft <howetuft@gmail.com>
Date: Sat, 21 May 2022 18:18:50 +0200
-Subject: [PATCH 06/14] openexr3
+Subject: [PATCH 09/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.41.0
+2.43.0
diff --git a/0009-openvdb.patch b/0010-openvdb.patch
index 813112052e21..366a7c00f195 100644
--- a/0009-openvdb.patch
+++ b/0010-openvdb.patch
@@ -1,10 +1,10 @@
-From a914fa5f804e4299b71dc044e89d82bfcf948a81 Mon Sep 17 00:00:00 2001
+From 3bf21ed9f4d392487b479a5a532c7e39caa5be1c Mon Sep 17 00:00:00 2001
From: howetuft <howetuft@gmail.com>
-Date: Sat, 21 May 2022 18:19:59 +0200
-Subject: [PATCH 09/14] openvdb
+Date: Wed, 31 Jan 2024 06:52:05 +0100
+Subject: [PATCH 10/14] openvdb
---
- CMakeLists.txt | 12 +++++++++++-
+ CMakeLists.txt | 10 +++++++++-
samples/luxcoreconsole/CMakeLists.txt | 2 +-
samples/luxcoredemo/CMakeLists.txt | 2 +-
samples/luxcorescenedemo/CMakeLists.txt | 2 +-
@@ -12,22 +12,13 @@ Subject: [PATCH 09/14] openvdb
src/luxcore/CMakeLists.txt | 5 ++---
src/slg/CMakeLists.txt | 7 +------
tests/luxcoreimplserializationdemo/CMakeLists.txt | 2 +-
- 8 files changed, 20 insertions(+), 15 deletions(-)
+ 8 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 74f5465ef..586ca9ece 100644
+index 393a1cbaa..73b3eac24 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 17)
-+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
+@@ -113,6 +113,14 @@ include_directories("${LuxRays_SOURCE_DIR}/deps/robin-hood-hashing-3.9.1/src/inc
# Find dependencies
include(Dependencies)
@@ -42,7 +33,7 @@ index 74f5465ef..586ca9ece 100644
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)
+@@ -176,7 +184,7 @@ if (BUILD_LUXCORE_DLL)
set(LUXCORE_LIBRARY luxcore)
ADD_DEFINITIONS("-DLUXCORE_DLL")
else()
@@ -145,5 +136,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.41.0
+2.43.0
diff --git a/0010-openimageio.patch b/0011-openimageio.patch
index b1b23f66bb89..7c0cf0adc2a4 100644
--- a/0010-openimageio.patch
+++ b/0011-openimageio.patch
@@ -1,7 +1,7 @@
-From c5599a1a493e2789f2d581735242302da1af9278 Mon Sep 17 00:00:00 2001
+From f02bdb4057380d48c0f793f7f9e7b5b3e1cfbcf0 Mon Sep 17 00:00:00 2001
From: howetuft <howetuft@gmail.com>
Date: Sat, 21 May 2022 18:20:33 +0200
-Subject: [PATCH 10/14] openimageio
+Subject: [PATCH 11/14] openimageio
---
cmake/Packages/FindOpenImageIO.cmake | 11 ++++++++++-
@@ -37,5 +37,5 @@ index 66bf54966..49eb82372 100644
ENDIF(OPENIMAGEIO_FOUND)
--
-2.41.0
+2.43.0
diff --git a/0011-opencolorio.patch b/0012-opencolorio.patch
index 45348a89ad40..9c1cea8a0f2a 100644
--- a/0011-opencolorio.patch
+++ b/0012-opencolorio.patch
@@ -1,7 +1,7 @@
-From 9522a41693cfa0125a0a8a238f31434c4140784a Mon Sep 17 00:00:00 2001
+From 152eb08598ccc0ef7525a99425cc86be5dc6cdf9 Mon Sep 17 00:00:00 2001
From: howetuft <howetuft@gmail.com>
Date: Sat, 21 May 2022 18:21:33 +0200
-Subject: [PATCH 11/14] opencolorio
+Subject: [PATCH 12/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.41.0
+2.43.0
diff --git a/0012-boost179-fstream.patch b/0013-boost179-fstream.patch
index 4e1a5a1c9824..99ccb2aca571 100644
--- a/0012-boost179-fstream.patch
+++ b/0013-boost179-fstream.patch
@@ -1,7 +1,7 @@
-From a6fa314427f99b3d24018490e8dfa18177184445 Mon Sep 17 00:00:00 2001
+From 6c37bbfa60a8d00e1e87a63043d67c82e137d7fb Mon Sep 17 00:00:00 2001
From: howetuft <howetuft@gmail.com>
Date: Sun, 3 Jul 2022 20:02:31 +0200
-Subject: [PATCH 12/14] boost179 fstream
+Subject: [PATCH 13/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.41.0
+2.43.0
diff --git a/0013-spdlog.patch b/0013-spdlog.patch
deleted file mode 100644
index 7241f460abcf..000000000000
--- a/0013-spdlog.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-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/14] 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.41.0
-
diff --git a/0014-fmt9.patch b/0014-fmt9.patch
deleted file mode 100644
index 77815a814f9a..000000000000
--- a/0014-fmt9.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From df8c3049c6b7cd822d21a18d295a8c653e153c03 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 +-
- src/luxcore/CMakeLists.txt | 2 +-
- tests/luxcoreimplserializationdemo/CMakeLists.txt | 2 +-
- 7 files changed, 9 insertions(+), 6 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/src/luxcore/CMakeLists.txt b/src/luxcore/CMakeLists.txt
-index 4a3fa76e9..f3bb5f3f4 100644
---- a/src/luxcore/CMakeLists.txt
-+++ b/src/luxcore/CMakeLists.txt
-@@ -182,7 +182,7 @@ 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_LIBRARIES} 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} fmt::fmt)
- endif()
-
- set_target_properties(pyluxcore PROPERTIES PREFIX "")
-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/0014-spdlog.patch b/0014-spdlog.patch
new file mode 100644
index 000000000000..f82d7f6c3a10
--- /dev/null
+++ b/0014-spdlog.patch
@@ -0,0 +1,136 @@
+From 582e247a72c4cbfce33f41aeb2c4628464e81070 Mon Sep 17 00:00:00 2001
+From: howetuft <howetuft@gmail.com>
+Date: Sat, 21 May 2022 18:20:14 +0200
+Subject: [PATCH 14/14] spdlog
+
+---
+ CMakeLists.txt | 7 ++++++-
+ include/luxcore/luxcorelogger.h | 2 +-
+ include/luxcore/luxcoresink.h | 4 ++--
+ src/luxcore/luxcore.cpp | 2 +-
+ src/luxcore/luxcoreimpl.cpp | 16 ++++++++++++++++
+ src/luxcore/luxcoreinit.cpp | 6 +++---
+ 6 files changed, 29 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 73b3eac24..511e06672 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -107,12 +107,17 @@ 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)
++add_definitions(-DSPDLOG_USE_STD_FORMAT=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/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..7ccb8f622 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
+@@ -41,7 +41,7 @@ namespace sinks {
+ memory_buf_t formatted;
+ base_sink<Mutex>::formatter_->format(msg, formatted);
+
+- logHandler(fmt::to_string(formatted).c_str());
++ logHandler(formatted.c_str());
+ }
+ }
+
+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/luxcoreimpl.cpp b/src/luxcore/luxcoreimpl.cpp
+index b0bf6b900..522f05428 100644
+--- a/src/luxcore/luxcoreimpl.cpp
++++ b/src/luxcore/luxcoreimpl.cpp
+@@ -20,6 +20,7 @@
+ #include <boost/foreach.hpp>
+ #include <boost/thread/once.hpp>
+ #include <boost/thread/mutex.hpp>
++#include <format>
+
+ #include "luxcore/luxcorelogger.h"
+ #include "luxrays/core/intersectiondevice.h"
+@@ -1805,3 +1806,18 @@ void RenderSessionImpl::SaveResumeFile(const std::string &fileName) {
+
+ API_END();
+ }
++
++
++template <>
++struct std::formatter<luxcore::Camera::CameraType> {
++ // for debugging only
++ formatter() { std::cout << "formatter<luxcore::Camera::CameraType>()\n"; }
++
++ constexpr auto parse(std::format_parse_context& ctx) {
++ return ctx.begin();
++ }
++
++ auto format(const luxcore::Camera::CameraType& cam, std::format_context& ctx) const {
++ return std::format_to(ctx.out(), "{}", int(cam));
++ }
++};
+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"
+--
+2.43.0
+
diff --git a/PKGBUILD b/PKGBUILD
index ae0a89823425..3d50f8bb5965 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,63 +22,63 @@ pkgver=2.7
_rel="beta1"
[ -n "${_rel}" ] && _pkgver=${pkgver}${_rel} && pkgver+=".${_rel}" || _pkgver=${pkgver}
_name=LuxCore-${pkgname}_v${_pkgver}
-pkgrel=1
+pkgrel=2
epoch=2
pkgdesc="Physically correct, unbiased rendering engine."
arch=('x86_64')
url="https://www.luxcorerender.org/"
license=('Apache')
-depends+=(blosc boost-libs embree3 glfw gtk3 openimagedenoise openimageio openvdb fmt9 python spdlog)
+depends+=(blosc boost-libs embree3 glfw gtk3 openimagedenoise openimageio openvdb python spdlog)
optdepends+=("pyside2: for pyluxcoretools gui")
-makedepends+=(boost cmake doxygen git ninja pyside2-tools pyside6-tools-wrappers)
+makedepends+=(boost cmake doxygen git ninja pyside2-tools)
provides=(luxrays)
options=('!lto')
source=("https://github.com/LuxCoreRender/LuxCore/archive/${pkgname}_v${_pkgver}.tar.gz"
- "0001-glfw.patch"
- "0002-boost107400.patch"
- "0003-python.patch"
- "0004-cpplib.patch"
- "0005-clang-isnan-isinf.patch"
- "0006-openexr3.patch"
- "0007-silence-compiler-warnings.patch"
- "0008-silence-preprocessing.patch"
- "0009-openvdb.patch"
- "0010-openimageio.patch"
- "0011-opencolorio.patch"
- "0012-boost179-fstream.patch"
- "0013-spdlog.patch"
- "0014-fmt9.patch"
+ "0001-cxx-version.patch"
+ "0002-silence-compiler-warnings.patch"
+ "0003-silence-preprocessing.patch"
+ "0004-glfw.patch"
+ "0005-boost107400.patch"
+ "0006-python.patch"
+ "0007-cpplib.patch"
+ "0008-clang-isnan-isinf.patch"
+ "0009-openexr3.patch"
+ "0010-openvdb.patch"
+ "0011-openimageio.patch"
+ "0012-opencolorio.patch"
+ "0013-boost179-fstream.patch"
+ "0014-spdlog.patch"
)
sha256sums=('24adaf0da781921ed18c2aee55468ee94138db023e5cff95a5ede0fb394f8c09'
- '818366af720ef49b57c604791caeef0dc5dccf549b764001fdfe2be5016296d6'
- 'a8293ca87b18bfd12e05c8fec42c7a29001ec50a5996fb0038cdbc5eb8167b55'
- '11471500540a53b2ca4e2289c187a388c76aa388a8f51fd6b9981d36e6cb95f7'
- '261df8e99dacea6261ad513d3e3edd2e69fab953316d7a789a97789178019e7f'
- 'cb2f0441c0fb9046952dc89dbd0ec38fcfbcfaefba3644358cde881b71c70b77'
- '488382fbf7c62aff55cfa517c74dbed0f2abea7fd060942fa3836750bf65f439'
- '5bf12f95d393d62ee5a11f13db1df46c20958d5832f654d8e8cfad88b6e5892e'
- 'a2c5901b7e9eeee9a928f8f568493303fc58fb7ca1e6801533e9af53f0cbe470'
- 'd8c24fc0f32883b0a97191b3eb5d0d4bcb4d8c2790d8786902ea4dbbb36eff43'
- '010f1a88c238a00e5ea035766514a7fe5c45dc45f247a2240821b10ffb30b6dd'
- '6c34263d955440cb200ddb6f51711fca9b5548ca9ccf133cc924f87298f4dce0'
- '069ca9caef3b7c85ffc4a55de79122488b1b513135b0536b24772c483c8d0cab'
- 'b8b3d9d4432198e34a281f24c0ffedb4a9f69ce8ee36c30125b83b4a6c6358f6'
- 'e4ad9b7a0b77e0ca00136159f8f7c8e5940d26918421f18114ad5657fbf32359')
+ 'd3e0c4f74341746bf271efa6a62f3f0e2a72072afd86c032a9a5a1a565cf28f0'
+ '540f6e92877165c06ce70d2c7ac5c28ec95632520941b645f63ffa5d77541693'
+ 'd754596d2c17a3d12fa38abb373f4a58b2ca7a0b8df8fdf7ba9e991753998b6b'
+ '77db48d1a823f345a170c0632d3bfa0a962c92f6c662117e2a96a172d48732e9'
+ '415ba07ff99f9b97106aa806c6c1b40b68be3c39096ecd08cd2e0d40e6ea2fc3'
+ 'fa142fa282ae3e2482e7c39ffa07382d68ad732f32468eae5aa67d4378efc144'
+ '71b62a8c8c61779d914ce8e10bb5594dd0ed8bfecc1d6007263870393bb89955'
+ '09bf685f7367b05ac2d756e22c3b8d7a1ba931bca7ef4d6096852bbcdd203f8b'
+ 'e2034c00d456cf04843f84ee36eca991498a9580d52d15fafebe63f61642afb2'
+ '12bb2b0873b14f7878b9ec05b36a18156879b770da5ba47505bf3d6004038092'
+ '9eca0d8c3de4088ed02b40b5269ce709077f0b810eaa570050d9f41c320e79ee'
+ '1d91f515a4fcfb88119e02a71f4a5185a6765991296cd1d4760e36a642c29ff1'
+ '3185b3e4b42423fb51ef007e9f36f193ef7bd54bb83efdb242e7ba3c6fb67532'
+ 'ca46c01fbe2183916e20e990c23991148e878e401cec6d9ddabf7aa6bfdc6933')
b2sums=('0f6203610dbef2fd2d43c6465502459337eb99da00b494d7bfcab245b8fdb3d9f9179018e6d9b2f927024f6a21fba4d5cfb51e9e14049d1a56ce8aabaea2312d'
- '1a1f4de4f70564216a99f1a27c6321c85187eaea80d9a2a47c66be07fa4a1d825eeef526167aaeb89e4bd67a376a56728af95ee00ee8c1bcc7556afce5f126b0'
- '56fa362f1a79e735377b85b1a5303d0761b0b022b9b4a6063af8aee19643bcef0663105cefd969e746ace5cf7e13f3d0da2b7fc696ba0b500f2c21bb57f1bddb'
- 'fde24f909b7f639ac4b1d113710a0e4fb2b1fde97bdbdd905c76fc864bd016fa13965452d5d63dd522ac40663ed8a2e609b93d391e01891f5e780e712f3169c4'
- 'd1a5dd49df142d5bc352240e5674aab30f94775a645598328f4dcc4db17ed208b8cfb818b8f7510d4d031511191290920bd2ebc7ed3776b031febd4ddc94e0bc'
- '1ec46e7b28ab00ef696d06f5c0ba6d5fdfe9dc448d9be415239a8013f92334603be8b577c7c3b406648c8e6fe1738933d40b335fb777bc5e90dd623abab05061'
- '2249bb65fab1dd4f01077ffa530dfa15d5612c47436819a266c307a16699d978a5fbd5beea9ca066d8877177264095a18af030cc1e7bd3376fc1c4b0f9566647'
- '38b9ee28c6453f190c1325846b91f7760ceec3ad2708bc63d6ca46aa58b93b04b21112eab14c07a6ce624f3974f224a7d398a2b392a83f25df8af02b40448b4b'
- '5a5fbb58d92e550000c02b26dcca6c0d5bc1b2aa1d5ad93ea303f71a03a67391a06ae3e0f015392c08c35ffb413900fca383834c113fdd90d3db8c74db28db01'
- 'aef00c485858c07953ef1e1ed9d1ea8871a1ee25bb156eaebf6bdf006a3e7ce06bba350ba8aa2c521500dbfafb236b71fff2807b0d516e74179781b12b0fcaf9'
- 'efe5fcf5065a93bab4a9442eca8c57d780e55a21fbda895cfdda95c1d751834805b49418752578125fb0317136528485d1be6e0d2b6e0d7c971608e38137ca18'
- '19a81a9c442272e7d0123bc99b93be8cafab1a84a7a9bbb58e92e5a6624277e85b33c41183e739ebb8898aa886d477854c9075457a4da9266a5a8a0b26387ae0'
- '1d434b3eb400af3b4db9ad1fd3f40d8cfcae6d7adcb0912f3fb243f5f824f1df72b6ccd044fc22d7ca5b7476e58ce3ffce0eadbe5d9e8f5a07ab9fcecc85b776'
- '34176c1fd0e8e22daab5a986b67a6732170376a618a2e59cf0a3b6ca33c6f1407f61c8a1c92f00cdce1bee850ade295d8092691191d4c2c7cbc05016c4c791d6'
- '084628e44473a2ddb5fdcffb5ddab5dabf02aee46de01a3a0f22f0ffab958be3980494078a7b4b2fcd2168a4d048de13ac14cecd26dda97ff00037e41ca50c11')
+ '2b8c411347c4b27b21cddf7f4543beeaa229968e95f59f762b872264afd23cb5cea8074bd606b8e56df1a84473ada13720f8fb097fcfb80303495a89ed9052ef'
+ '97302dc99edebe5f35d5d469b2a2a9172eb7357248fb2bcc4510507de59a4d1db32cbfaf18acbba29b5046011615f57eb6ab322346560ec2777172c6b08a30b9'
+ 'c951ce3d6172c0a916c13fa53c682336a74d229c6e903f26c40f7a6e91a6b3ff54241178f85e4945d621210d23f54503b95e69d0f05e40246165eb23422aafb9'
+ '88e40b301961daef2e493b71cbd497aeb63035e9ed1ff2078c98c6a2c0e17f7c23a712905cd335ad3cc518b7b53b503441b261bc04ee6a27cb8531f74ec019f8'
+ '8ef8933c5dc6acb0881ddb51f959530eeda80c7d7d0a1e26ce5878e19b082746e95af8bee53e5937276e500473bbd56137cf68e5901b2a0a48d9255e11016cbf'
+ '96708a30229163849cefc4e7e13db571fe2529f08952a999a2176f99b4748869391184345780ef22d74ae8c93fb18b0a8831fcb5f3b043bcb63b545e90396205'
+ '7c8979e9549b03f0535d5760d9929acfb0d954b027253ec42ce910033c5aac60a34af3bbe92b6b07b9a3d0c0e66a43373b74697bdbc91e2ca6ae42ae4866352d'
+ '947d3cba2c9e1c4c430f9623a13f5275613491ac1125c88b042dc4bb0fa6905c8955731e75e954850035f3605df12fdf5f77b5caec7495b3d321aa6eb357bd57'
+ '3e2431d7b0175a7ec0ac452d0201222a26d16cb02191aa7a65a14cfb6af5a99109e82efeb8125f5b8b76314bfbc8ede5d055da5955cfa5d0238870d9de3bd73c'
+ '76ee674dcbcd52c698924cbcd547d2b8a4b3761cf2ade8d7c463b2a5bdc9f741537485ce9db12968d3b43a28cca1508223e3a363fc7c0b7b9483e107d77155e7'
+ '6ebaf49099a78adb59c0f9c601410529b8709377ec1c6eacf9510bdf5fba5027cdd81bae6422425cceab6ee1ebb4709a3edf9d818fcce2a5b475e009153a7842'
+ 'f56cec862ace8a1499a1a718f3c88488661b7d683d4e9bafc027d20fcb6542ce91a70f11ad46dd7a5ad0e61f2cd8dff6247617ad8d51b378e96fdc5e0c1ae94a'
+ '78333747e508f28293c85175e0f9d0624b8303c1f4f5491304e79c3dbc104fedf4eaac9065f0876a968d379898eb5810cd802350adae44de5f44673b0949f1ba'
+ '5e59c732a417775984cd85755b7a1810b33fb8a09cb3a8542c048958e7788d1aac3ecef5f28266278ca6444e1f59421b1d167a305eda9e70c0ae62155c01274b')
prepare() {
for patch in "${srcdir}"/*.patch; do
@@ -90,6 +90,7 @@ prepare() {
build() {
_pyver=$(python -c "from sys import version_info; print(\"%d%d\" % (version_info.major,version_info.minor))")
CMAKE_FLAGS+=("-DPYTHON_V=${_pyver}")
+ CMAKE_FLAGS+=("-DCMAKE_BUILD_TYPE=Release")
cmake "${CMAKE_FLAGS[@]}" -S "${srcdir}"/${_name} -B build -G Ninja
# shellcheck disable=SC2086
ninja $(grep -oP -- '-+[A-z]+ ?[0-9]*'<<<"${MAKEFLAGS:--j1}") -C "${srcdir}/build"