Fix boost:1.74, oidn:1.2.4

5 files changed, 119 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a25b3f8cf3e5..39552f27c6a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -28,12 +28,21 @@ pkgbase = luxcorerender
 	source = https://github.com/LuxCoreRender/LuxCore/archive/luxcorerender_v2.5beta1.tar.gz
 	source = python.patch
 	source = glfw.patch
+	source = oidn124.patch
+	source = boost107400.patch
+	source = cpplib.patch
 	sha256sums = eed186b4ff8002c1e29d882751e42f7a7d66cd622054f7f031a32d6688b5c1c7
 	sha256sums = f639fb7e31056b6c7214e303c90fe06665572ffafc11e545f7c05128a8d85dc4
 	sha256sums = 4e04c3eb653f00d2389aff8e7fda2d244e258cbca3a22e32c13388a3984e4bb1
+	sha256sums = aec4cb388ed25944ef64abc8bd1dbcaa2da989ac0cf06acc026c1f82a817fa92
+	sha256sums = 8a8a681cce3a3ff39536cb0cbfefed8ed61887665ce1f4b101b3a222a1da50f6
+	sha256sums = 7203f773f94d632923a992824c66741a64f07a07fad932f5623ac9a257aa73a5
 	b2sums = 0ce686271e6c04e9381e587fe083c86bb54a10bb6c85fa5796ebf8ae0f19c954f79699bac3c9517913a3702f7275ca9821f39322328e03ccd88d979cc508798a
 	b2sums = 348fa445b9ac7f738461543f8adadbb9a93dc2f75d96d0d26acbf7168290a0621224d6f11b3af77a6c6e492ae089e57770fc02a987af0748f5bb3e73b8d90f54
 	b2sums = 2903992389c61fc4720cde8a011d0b637de647a7c9e701609968c01a8ab904277dfb27a90179d4cfcf98382973542e59d1384580236c25f6568aaa7b6ba90528
+	b2sums = 67cf563120070fc675618bdc4da8b8b224bea42c50ac8aabbd3d6b254b4189f330d0f93678f02cd96748a1bb1560f5275ed4fb0c9b2066f67761027343da86ec
+	b2sums = 04d1e78d044666720a9a099a9b95426ea06fe076354698f642a1a24df25bc27a033e6823a56cbdc21b695cba0e71446f4278c9a1474dba2cfa6aa91945950266
+	b2sums = 1985ee3dbd596cf7ac4a3041b395792733d59c95de4226dc54ff33887db4ec4adc0ef877d294cf66da2926eb025166397fdf6ceb76bfd280932e3ecd9ae716ec
 
 pkgname = luxcorerender
 
diff --git a/PKGBUILD b/PKGBUILD
index ea9961edc747..8a858267ab27 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -35,13 +35,22 @@ provides=(luxrays)
 source=("https://github.com/LuxCoreRender/LuxCore/archive/${pkgname}_v${_pkgver}.tar.gz"
         "python.patch"
         "glfw.patch"
+        "oidn124.patch"
+        "boost107400.patch"
+        "cpplib.patch"
         )
 sha256sums=('eed186b4ff8002c1e29d882751e42f7a7d66cd622054f7f031a32d6688b5c1c7'
             'f639fb7e31056b6c7214e303c90fe06665572ffafc11e545f7c05128a8d85dc4'
-            '4e04c3eb653f00d2389aff8e7fda2d244e258cbca3a22e32c13388a3984e4bb1')
+            '4e04c3eb653f00d2389aff8e7fda2d244e258cbca3a22e32c13388a3984e4bb1'
+            'aec4cb388ed25944ef64abc8bd1dbcaa2da989ac0cf06acc026c1f82a817fa92'
+            '8a8a681cce3a3ff39536cb0cbfefed8ed61887665ce1f4b101b3a222a1da50f6'
+            '7203f773f94d632923a992824c66741a64f07a07fad932f5623ac9a257aa73a5')
 b2sums=('0ce686271e6c04e9381e587fe083c86bb54a10bb6c85fa5796ebf8ae0f19c954f79699bac3c9517913a3702f7275ca9821f39322328e03ccd88d979cc508798a'
         '348fa445b9ac7f738461543f8adadbb9a93dc2f75d96d0d26acbf7168290a0621224d6f11b3af77a6c6e492ae089e57770fc02a987af0748f5bb3e73b8d90f54'
-        '2903992389c61fc4720cde8a011d0b637de647a7c9e701609968c01a8ab904277dfb27a90179d4cfcf98382973542e59d1384580236c25f6568aaa7b6ba90528')
+        '2903992389c61fc4720cde8a011d0b637de647a7c9e701609968c01a8ab904277dfb27a90179d4cfcf98382973542e59d1384580236c25f6568aaa7b6ba90528'
+        '67cf563120070fc675618bdc4da8b8b224bea42c50ac8aabbd3d6b254b4189f330d0f93678f02cd96748a1bb1560f5275ed4fb0c9b2066f67761027343da86ec'
+        '04d1e78d044666720a9a099a9b95426ea06fe076354698f642a1a24df25bc27a033e6823a56cbdc21b695cba0e71446f4278c9a1474dba2cfa6aa91945950266'
+        '1985ee3dbd596cf7ac4a3041b395792733d59c95de4226dc54ff33887db4ec4adc0ef877d294cf66da2926eb025166397fdf6ceb76bfd280932e3ecd9ae716ec')
 
 prepare() {
   for patch in "${srcdir}"/*.patch; do
diff --git a/boost107400.patch b/boost107400.patch
new file mode 100644
index 000000000000..7f7efccd5ca4
--- /dev/null
+++ b/boost107400.patch
@@ -0,0 +1,47 @@
+diff -Naur LuxCore-luxcorerender_v2.5beta1/src/slg/film/filmserialize.cpp LuxCore-luxcorerender_v2.5beta1-new/src/slg/film/filmserialize.cpp
+--- LuxCore-luxcorerender_v2.5beta1/src/slg/film/filmserialize.cpp	2020-11-15 11:42:41.000000000 +0100
++++ LuxCore-luxcorerender_v2.5beta1-new/src/slg/film/filmserialize.cpp	2020-12-11 15:40:07.712190410 +0100
+@@ -21,6 +21,7 @@
+ #include <boost/lexical_cast.hpp>
+ #include <boost/foreach.hpp>
++#include <boost/serialization/library_version_type.hpp>
+ #include <boost/serialization/unordered_set.hpp>
+ 
+ #include "slg/film/film.h"
+ #include "slg/film/imagepipeline/imagepipeline.h"
+diff -Naur LuxCore-luxcorerender_v2.5beta1/src/slg/engines/bakecpu/bakecputhread.cpp LuxCore-luxcorerender_v2.5beta1-new/src/slg/engines/bakecpu/bakecputhread.cpp
+--- LuxCore-luxcorerender_v2.5beta1/src/slg/engines/bakecpu/bakecputhread.cpp	2020-11-15 11:42:41.000000000 +0100
++++ LuxCore-luxcorerender_v2.5beta1-new/src/slg/engines/bakecpu/bakecputhread.cpp	2020-12-11 15:59:46.150726376 +0100
+@@ -23,6 +23,8 @@
+ #include "slg/utils/varianceclamping.h"
+ #include "slg/film/imagepipeline/plugins/bakemapmargin.h"
+ 
++#include <boost/bind.hpp>
++
+ using namespace std;
+ using namespace luxrays;
+ using namespace slg;
+diff -Naur LuxCore-luxcorerender_v2.5beta1/src/slg/engines/pathocl/pathoclopenclthread.cpp LuxCore-luxcorerender_v2.5beta1-new/src/slg/engines/pathocl/pathoclopenclthread.cpp
+--- LuxCore-luxcorerender_v2.5beta1/src/slg/engines/pathocl/pathoclopenclthread.cpp	2020-11-15 11:42:41.000000000 +0100
++++ LuxCore-luxcorerender_v2.5beta1-new/src/slg/engines/pathocl/pathoclopenclthread.cpp	2020-12-11 15:59:38.660798941 +0100
+@@ -31,6 +31,8 @@
+ #include "slg/renderconfig.h"
+ #include "slg/engines/pathocl/pathocl.h"
+ 
++#include <boost/bind.hpp>
++
+ using namespace std;
+ using namespace luxrays;
+ using namespace slg;
+diff -Naur LuxCore-luxcorerender_v2.5beta1/src/slg/engines/tilepathocl/tilepathoclthread.cpp LuxCore-luxcorerender_v2.5beta1-new/src/slg/engines/tilepathocl/tilepathoclthread.cpp
+--- LuxCore-luxcorerender_v2.5beta1/src/slg/engines/tilepathocl/tilepathoclthread.cpp	2020-11-15 11:42:41.000000000 +0100
++++ LuxCore-luxcorerender_v2.5beta1-new/src/slg/engines/tilepathocl/tilepathoclthread.cpp	2020-12-11 15:59:08.011095932 +0100
+@@ -24,6 +24,8 @@
+ #include "slg/kernels/kernels.h"
+ #include "slg/engines/tilepathocl/tilepathocl.h"
+ 
++#include <boost/bind.hpp>
++
+ using namespace std;
+ using namespace luxrays;
+ using namespace slg;
diff --git a/cpplib.patch b/cpplib.patch
new file mode 100644
index 000000000000..1fb2e37a8376
--- /dev/null
+++ b/cpplib.patch
@@ -0,0 +1,36 @@
+diff -Naur LuxCore-luxcorerender_v2.5beta1/src/slg/scene/parsematerials.cpp LuxCore-luxcorerender_v2.5beta1-new/src/slg/scene/parsematerials.cpp
+--- LuxCore-luxcorerender_v2.5beta1/src/slg/scene/parsematerials.cpp	2020-11-15 11:42:41.000000000 +0100
++++ LuxCore-luxcorerender_v2.5beta1-new/src/slg/scene/parsematerials.cpp	2020-12-11 16:25:46.032356584 +0100
+@@ -52,6 +52,8 @@
+ 
+ #include "slg/utils/filenameresolver.h"
+ 
++#include <atomic>
++
+ using namespace std;
+ using namespace luxrays;
+ using namespace slg;
+diff -Naur LuxCore-luxcorerender_v2.5beta1/src/slg/scene/parsevolumes.cpp LuxCore-luxcorerender_v2.5beta1-new/src/slg/scene/parsevolumes.cpp
+--- LuxCore-luxcorerender_v2.5beta1/src/slg/scene/parsevolumes.cpp	2020-11-15 11:42:41.000000000 +0100
++++ LuxCore-luxcorerender_v2.5beta1-new/src/slg/scene/parsevolumes.cpp	2020-12-11 16:25:58.548903384 +0100
+@@ -32,6 +32,8 @@
+ #include "slg/volumes/heterogenous.h"
+ #include "slg/volumes/homogenous.h"
+ 
++#include <atomic>
++
+ using namespace std;
+ using namespace luxrays;
+ using namespace slg;
+diff -Naur LuxCore-luxcorerender_v2.5beta1/src/slg/scene/parseobjects.cpp LuxCore-luxcorerender_v2.5beta1-new/src/slg/scene/parseobjects.cpp
+--- LuxCore-luxcorerender_v2.5beta1/src/slg/scene/parseobjects.cpp	2020-11-15 11:42:41.000000000 +0100
++++ LuxCore-luxcorerender_v2.5beta1-new/src/slg/scene/parseobjects.cpp	2020-12-11 16:31:37.835655891 +0100
+@@ -19,6 +19,8 @@
+ #include "slg/scene/scene.h"
+ #include "slg/utils/filenameresolver.h"
+ 
++#include <atomic>
++
+ using namespace std;
+ using namespace luxrays;
+ using namespace slg;
diff --git a/oidn124.patch b/oidn124.patch
new file mode 100644
index 000000000000..533524d79dcf
--- /dev/null
+++ b/oidn124.patch
@@ -0,0 +1,16 @@
+diff -Naur LuxCore-luxcorerender_v2.5beta1-new/cmake/Packages/FindOidn.cmake LuxCore-luxcorerender_v2.5beta1/cmake/Packages/FindOidn.cmake
+--- LuxCore-luxcorerender_v2.5beta1-new/cmake/Packages/FindOidn.cmake	2020-12-11 15:27:02.273125334 +0100
++++ LuxCore-luxcorerender_v2.5beta1/cmake/Packages/FindOidn.cmake	2020-11-15 11:42:41.000000000 +0100
+@@ -14,10 +14,10 @@
+ ## limitations under the License.                                           ##
+ ## ======================================================================== ##
+ 
+-FIND_PATH(OIDN_INCLUDE_PATH NAMES OpenImageDenoise/version.h PATHS
++FIND_PATH(OIDN_INCLUDE_PATH NAMES OpenImageDenoise/config.h PATHS
+ 	${OIDN_ROOT}/include)
+ IF (NOT OIDN_INCLUDE_PATH)
+-	FIND_PATH(OIDN_INCLUDE_PATH NAMES OpenImageDenoise/version.h PATHS
++	FIND_PATH(OIDN_INCLUDE_PATH NAMES OpenImageDenoise/config.h PATHS
+ 		/usr/include
+ 		/usr/local/include
+ 		/opt/local/include)