attached fixes for the gcc-13 FTBFS
From e8d1d1486e3d9d8495af4c0903d6eb3e24a92094 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel <bre...@blender.org> Date: Wed, 18 Jan 2023 13:42:55 +0100 Subject: [PATCH] Fix T103960: build issue with GCC 13 in Cycles thread code
--- intern/cycles/util/thread.cpp | 2 ++ 1 file changed, 2 insertions(+) Origin: upstream, https://projects.blender.org/blender/blender/commit/e8d1d1486e3d9d8495af4c0903d6eb3e24a92094 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/blender/+bug/2029503 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1043014 Last-Update: 2023-08-05 diff --git a/intern/cycles/util/thread.cpp b/intern/cycles/util/thread.cpp index f4949aa2b44..7f1e8eb4159 100644 --- a/intern/cycles/util/thread.cpp +++ b/intern/cycles/util/thread.cpp @@ -6,6 +6,8 @@ #include "util/system.h" #include "util/windows.h" +#include <system_error> + CCL_NAMESPACE_BEGIN thread::thread(function<void()> run_cb) : run_cb_(run_cb), joined_(false)
From fea567651b5dadb71c830b17cbca31ed3f5b733e Mon Sep 17 00:00:00 2001 From: Bastien Montagne <bast...@blender.org> Date: Mon, 27 Mar 2023 18:29:39 +0200 Subject: [PATCH] Fix building Blender with some versions of gcc. Seems like quadriflow was missing a header, which somehow made the build fails on Suse Tumbleweed (gcc 13). --- extern/quadriflow/src/loader.cpp | 1 + 1 file changed, 1 insertion(+) Origin: upstream, https://projects.blender.org/blender/blender/commit/fea567651b5dadb71c830b17cbca31ed3f5b733e Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/blender/+bug/2029503 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1043014 Last-Update: 2023-08-05 diff --git a/extern/quadriflow/src/loader.cpp b/extern/quadriflow/src/loader.cpp index a1596eeff9a..5b9d717db71 100644 --- a/extern/quadriflow/src/loader.cpp +++ b/extern/quadriflow/src/loader.cpp @@ -8,6 +8,7 @@ #include "loader.hpp" +#include <cstdint> #include <fstream> #include <unordered_map>
