+ From 2babe4d3c0f52d82b6b6ac13f269b4a4e8c3b403 Mon Sep 17 00:00:00 2001

+ From: Mamoru TASAKA <mtasaka@fedoraproject.org>

+ Date: Thu, 9 Mar 2023 22:55:50 +0900

+ Subject: [PATCH] FIX: support boost 1.81

+ 

+ https://www.boost.org/users/history/version_1_79_0.html

+ 

+ boost 1.79 deprecated boost/filesystem/string_file.hpp and

+ with boost 1.81 boost::filesystem::ofstream or so is no longer

+ available.

+ 

+ Replace these with boost::nowide in boost/nowide/fstream.hpp .

+ 

+ Fixes #610 .

+ ---

+  src/luxrays/utils/cuda.cpp | 13 +++++++------

+  src/luxrays/utils/ocl.cpp  | 13 +++++++------

+  2 files changed, 14 insertions(+), 12 deletions(-)

+ 

+ diff --git a/src/luxrays/utils/cuda.cpp b/src/luxrays/utils/cuda.cpp

+ index 6ae9e9f42..de9f11df5 100644

+ --- a/src/luxrays/utils/cuda.cpp

+ +++ b/src/luxrays/utils/cuda.cpp

+ @@ -24,6 +24,7 @@

+  

+  #include <boost/algorithm/string/replace.hpp>

+  #include <boost/algorithm/string/trim.hpp>

+ +#include <boost/nowide/fstream.hpp>

+  

+  #include "luxrays/luxrays.h"

+  #include "luxrays/utils/utils.h"

+ @@ -174,10 +175,10 @@ bool cudaKernelPersistentCache::CompilePTX(const vector<string> &kernelsParamete

+  

+  			// The use of boost::filesystem::path is required for UNICODE support: fileName

+  			// is supposed to be UTF-8 encoded.

+ -			boost::filesystem::ofstream file(boost::filesystem::path(fileName),

+ -					boost::filesystem::ofstream::out |

+ -					boost::filesystem::ofstream::binary |

+ -					boost::filesystem::ofstream::trunc);

+ +			boost::nowide::ofstream file(boost::filesystem::path(fileName),

+ +					boost::nowide::ofstream::out |

+ +					boost::nowide::ofstream::binary |

+ +					boost::nowide::ofstream::trunc);

+  

+  			// Write the binary hash

+  			const u_int hashBin = oclKernelPersistentCache::HashBin(*ptx, *ptxSize);

+ @@ -206,8 +207,8 @@ bool cudaKernelPersistentCache::CompilePTX(const vector<string> &kernelsParamete

+  

+  			// The use of boost::filesystem::path is required for UNICODE support: fileName

+  			// is supposed to be UTF-8 encoded.

+ -			boost::filesystem::ifstream file(boost::filesystem::path(fileName),

+ -					boost::filesystem::ifstream::in | boost::filesystem::ifstream::binary);

+ +			boost::nowide::ifstream file(boost::filesystem::path(fileName),

+ +					boost::nowide::ifstream::in | boost::nowide::ifstream::binary);

+  

+  			// Read the binary hash

+  			u_int hashBin;

+ diff --git a/src/luxrays/utils/ocl.cpp b/src/luxrays/utils/ocl.cpp

+ index 785836cef..a31af9ed6 100644

+ --- a/src/luxrays/utils/ocl.cpp

+ +++ b/src/luxrays/utils/ocl.cpp

+ @@ -24,6 +24,7 @@

+  

+  #include <boost/algorithm/string/replace.hpp>

+  #include <boost/algorithm/string/trim.hpp>

+ +#include <boost/nowide/fstream.hpp>

+  

+  #include "luxrays/luxrays.h"

+  #include "luxrays/utils/utils.h"

+ @@ -303,10 +304,10 @@ cl_program oclKernelPersistentCache::Compile(cl_context context, cl_device_id de

+  

+  			// The use of boost::filesystem::path is required for UNICODE support: fileName

+  			// is supposed to be UTF-8 encoded.

+ -			boost::filesystem::ofstream file(boost::filesystem::path(fileName),

+ -					boost::filesystem::ofstream::out |

+ -					boost::filesystem::ofstream::binary |

+ -					boost::filesystem::ofstream::trunc);

+ +			boost::nowide::ofstream file(boost::filesystem::path(fileName),

+ +					boost::nowide::ofstream::out |

+ +					boost::nowide::ofstream::binary |

+ +					boost::nowide::ofstream::trunc);

+  

+  			// Write the binary hash

+  			const u_int hashBin = HashBin(bins, binsSizes[0]);

+ @@ -337,8 +338,8 @@ cl_program oclKernelPersistentCache::Compile(cl_context context, cl_device_id de

+  

+  			// The use of boost::filesystem::path is required for UNICODE support: fileName

+  			// is supposed to be UTF-8 encoded.

+ -			boost::filesystem::ifstream file(boost::filesystem::path(fileName),

+ -					boost::filesystem::ifstream::in | boost::filesystem::ifstream::binary);

+ +			boost::nowide::ifstream file(boost::filesystem::path(fileName),

+ +					boost::nowide::ifstream::in | boost::nowide::ifstream::binary);

+  

+  			// Read the binary hash

+  			u_int hashBin;

+ # https://github.com/LuxCoreRender/LuxCore/pull/611 (Currently under review)

+ # Replace boost::filesystem::ofstream with boost::nowide

+ Patch11:        luxcorerender-pr611-boost_181.patch