From 9a659d4e127e703a60255115ff77834bc1037b32 Mon Sep 17 00:00:00 2001
From: Alairion <alexy.pellegrini@laposte.net>
Date: Sun, 15 May 2022 23:02:18 +0200
Subject: [PATCH] Fix build issues with GCC 12

---
 apyre/src/apyre/application.cpp             | 1 +
 apyre/src/apyre/window.cpp                  | 1 +
 captal/src/captal/bin_packing.cpp           | 1 +
 captal/src/captal/physics.cpp               | 1 +
 captal/src/captal/translation.hpp           | 1 +
 cmake/FindChipmunk.cmake                    | 1 +
 cmake/superbuild_not_enough_standards.cmake | 2 +-
 cmake/superbuild_zlib.cmake                 | 1 +
 swell/src/swell/application.cpp             | 1 +
 swell/src/swell/audio_pulser.hpp            | 1 +
 swell/src/swell/audio_world.cpp             | 1 +
 swell/src/swell/flac.cpp                    | 1 +
 swell/src/swell/flac.hpp                    | 1 +
 swell/src/swell/ogg.hpp                     | 2 ++
 swell/src/swell/stream.cpp                  | 1 +
 swell/src/swell/wave.cpp                    | 1 +
 swell/src/swell/wave.hpp                    | 1 +
 tephra/src/tephra/vulkan/vulkan.hpp         | 1 +
 18 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/apyre/src/apyre/application.cpp b/apyre/src/apyre/application.cpp
index 0a3d9f3..b09c2b0 100644
--- a/apyre/src/apyre/application.cpp
+++ b/apyre/src/apyre/application.cpp
@@ -24,6 +24,7 @@
 
 #include <algorithm>
 #include <stdexcept>
+#include <utility>
 
 #include <SDL.h>
 #include <SDL_syswm.h>
diff --git a/apyre/src/apyre/window.cpp b/apyre/src/apyre/window.cpp
index af27d6f..59512b4 100644
--- a/apyre/src/apyre/window.cpp
+++ b/apyre/src/apyre/window.cpp
@@ -25,6 +25,7 @@
 #include <algorithm>
 #include <iostream>
 #include <stdexcept>
+#include <utility>
 
 #include "application.hpp"
 #include "monitor.hpp"
diff --git a/captal/src/captal/bin_packing.cpp b/captal/src/captal/bin_packing.cpp
index 65d5375..a53aead 100644
--- a/captal/src/captal/bin_packing.cpp
+++ b/captal/src/captal/bin_packing.cpp
@@ -23,6 +23,7 @@
 #include "bin_packing.hpp"
 
 #include <cassert>
+#include <algorithm>
 
 namespace cpt
 {
diff --git a/captal/src/captal/physics.cpp b/captal/src/captal/physics.cpp
index eec1974..606187e 100644
--- a/captal/src/captal/physics.cpp
+++ b/captal/src/captal/physics.cpp
@@ -23,6 +23,7 @@
 #include "physics.hpp"
 
 #include <stdexcept>
+#include <utility>
 
 #include <captal_foundation/stack_allocator.hpp>
 
diff --git a/captal/src/captal/translation.hpp b/captal/src/captal/translation.hpp
index 25028de..8fb7262 100644
--- a/captal/src/captal/translation.hpp
+++ b/captal/src/captal/translation.hpp
@@ -33,6 +33,7 @@
 #include <numeric>
 #include <variant>
 #include <span>
+#include <vector>
 
 #include <captal_foundation/encoding.hpp>
 
diff --git a/cmake/FindChipmunk.cmake b/cmake/FindChipmunk.cmake
index 968879d..37a5031 100644
--- a/cmake/FindChipmunk.cmake
+++ b/cmake/FindChipmunk.cmake
@@ -5,6 +5,7 @@ find_library(CHIPMUNK_LIBS
         chipmunk
     PATH_SUFFIXES
         lib
+        OFF
     PATHS
         ${Chipmunk_DIR}
 )
diff --git a/cmake/superbuild_not_enough_standards.cmake b/cmake/superbuild_not_enough_standards.cmake
index dbb35f5..d15e914 100644
--- a/cmake/superbuild_not_enough_standards.cmake
+++ b/cmake/superbuild_not_enough_standards.cmake
@@ -4,7 +4,7 @@ option(CAPTAL_SUPERBUILD_EXCLUDE_NOT_ENOUGH_STANDARDS "Does not build Not Enough
 
 if(NOT CAPTAL_SUPERBUILD_EXCLUDE_NOT_ENOUGH_STANDARDS)
     set(CAPTAL_SUPERBUILD_NOT_ENOUGH_STANDARDS_GIT_URL "https://github.com/Alairion/not-enough-standards.git" CACHE STRING "Used url for Not Enough Standards git clone (allow usage of mirrors or interal repo)")
-    set(CAPTAL_SUPERBUILD_NOT_ENOUGH_STANDARDS_GIT_TAG "v1.0.2" CACHE STRING "Used tag for NES git clone")
+    set(CAPTAL_SUPERBUILD_NOT_ENOUGH_STANDARDS_GIT_TAG "v1.0.3" CACHE STRING "Used tag for NES git clone")
 
     mark_as_advanced(CAPTAL_SUPERBUILD_NOT_ENOUGH_STANDARDS_GIT_URL)
     mark_as_advanced(CAPTAL_SUPERBUILD_NOT_ENOUGH_STANDARDS_GIT_TAG)
diff --git a/cmake/superbuild_zlib.cmake b/cmake/superbuild_zlib.cmake
index 9934b98..bcf3177 100644
--- a/cmake/superbuild_zlib.cmake
+++ b/cmake/superbuild_zlib.cmake
@@ -20,6 +20,7 @@ if(NOT CAPTAL_SUPERBUILD_EXCLUDE_ZLIB)
 
             "-DBUILD_SHARED_LIBS=OFF"
             "-DZLIB_ENABLE_TESTS=OFF"
+            "-DZLIB_COMPAT=ON"
 
             "-DCMAKE_C_FLAGS=${EXTERNAL_FLAGS}"
             "-DCMAKE_C_FLAGS_DEBUG=${EXTERNAL_FLAGS_DEBUG}"
diff --git a/swell/src/swell/application.cpp b/swell/src/swell/application.cpp
index 1ad4f6b..3696c62 100644
--- a/swell/src/swell/application.cpp
+++ b/swell/src/swell/application.cpp
@@ -24,6 +24,7 @@
 
 #include <algorithm>
 #include <stdexcept>
+#include <utility>
 
 #include <portaudio.h>
 
diff --git a/swell/src/swell/audio_pulser.hpp b/swell/src/swell/audio_pulser.hpp
index 5c62ea8..67da2b7 100644
--- a/swell/src/swell/audio_pulser.hpp
+++ b/swell/src/swell/audio_pulser.hpp
@@ -35,6 +35,7 @@
 #include <future>
 #include <span>
 #include <chrono>
+#include <utility>
 
 #include "audio_world.hpp"
 #include "stream.hpp"
diff --git a/swell/src/swell/audio_world.cpp b/swell/src/swell/audio_world.cpp
index 696d696..a94db37 100644
--- a/swell/src/swell/audio_world.cpp
+++ b/swell/src/swell/audio_world.cpp
@@ -24,6 +24,7 @@
 
 #include <cassert>
 #include <numbers>
+#include <utility>
 
 namespace swl
 {
diff --git a/swell/src/swell/flac.cpp b/swell/src/swell/flac.cpp
index 8e13e04..c2b121e 100644
--- a/swell/src/swell/flac.cpp
+++ b/swell/src/swell/flac.cpp
@@ -23,6 +23,7 @@
 #include "flac.hpp"
 
 #include <cassert>
+#include <algorithm>
 
 #include <FLAC/stream_decoder.h>
 
diff --git a/swell/src/swell/flac.hpp b/swell/src/swell/flac.hpp
index d0abb48..2989ec4 100644
--- a/swell/src/swell/flac.hpp
+++ b/swell/src/swell/flac.hpp
@@ -29,6 +29,7 @@
 #include <filesystem>
 #include <optional>
 #include <span>
+#include <vector>
 
 #include "sound_reader.hpp"
 
diff --git a/swell/src/swell/ogg.hpp b/swell/src/swell/ogg.hpp
index 1439aac..9559d9b 100644
--- a/swell/src/swell/ogg.hpp
+++ b/swell/src/swell/ogg.hpp
@@ -28,6 +28,8 @@
 #include <fstream>
 #include <filesystem>
 #include <span>
+#include <vector>
+#include <memory>
 
 #include "sound_reader.hpp"
 
diff --git a/swell/src/swell/stream.cpp b/swell/src/swell/stream.cpp
index cb277da..06ba7a4 100644
--- a/swell/src/swell/stream.cpp
+++ b/swell/src/swell/stream.cpp
@@ -24,6 +24,7 @@
 
 #include <stdexcept>
 #include <iostream>
+#include <utility>
 
 #include <portaudio.h>
 
diff --git a/swell/src/swell/wave.cpp b/swell/src/swell/wave.cpp
index 2576431..34eab87 100644
--- a/swell/src/swell/wave.cpp
+++ b/swell/src/swell/wave.cpp
@@ -23,6 +23,7 @@
 #include "wave.hpp"
 
 #include <cassert>
+#include <algorithm>
 
 #include <captal_foundation/stack_allocator.hpp>
 
diff --git a/swell/src/swell/wave.hpp b/swell/src/swell/wave.hpp
index 47e285d..754490c 100644
--- a/swell/src/swell/wave.hpp
+++ b/swell/src/swell/wave.hpp
@@ -29,6 +29,7 @@
 #include <filesystem>
 #include <span>
 #include <variant>
+#include <vector>
 
 #include "sound_reader.hpp"
 
diff --git a/tephra/src/tephra/vulkan/vulkan.hpp b/tephra/src/tephra/vulkan/vulkan.hpp
index 367210a..8f91532 100644
--- a/tephra/src/tephra/vulkan/vulkan.hpp
+++ b/tephra/src/tephra/vulkan/vulkan.hpp
@@ -29,6 +29,7 @@
 #include <span>
 #include <exception>
 #include <algorithm>
+#include <utility>
 
 #include <vulkan/vulkan_core.h>