gentoo resync : 29.12.2022

3 files changed, 53 insertions, 0 deletions

diff --git a/games-simulation/EmptyEpsilon/files/EmptyEpsilon-cmake-meshoptimizer.patch b/games-simulation/EmptyEpsilon/files/EmptyEpsilon-cmake-meshoptimizer.patch
new file mode 100644
index 000000000000..d948d6923e39
--- /dev/null
+++ b/games-simulation/EmptyEpsilon/files/EmptyEpsilon-cmake-meshoptimizer.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -133,9 +133,9 @@ else()
+ endif()
+ 
+ if(NOT meshoptimizer_POPULATED)
+-  if(COMMAND FetchContent_Populate)
+-    FetchContent_Populate(meshoptimizer)
+-  endif()
++  set(meshoptimizer_SOURCE_DIR "${EXTERNALS_DIR}/meshoptimizer")
++  set(meshoptimizer_BINARY_DIR "${PROJECT_BINARY_DIR}/externals/meshoptimizer")
++
+   add_subdirectory(${meshoptimizer_SOURCE_DIR} ${meshoptimizer_BINARY_DIR} EXCLUDE_FROM_ALL)
+ endif()
+ 
diff --git a/games-simulation/EmptyEpsilon/files/SeriousProton-Add-missing-include-memory-to-websocket.h.patch b/games-simulation/EmptyEpsilon/files/SeriousProton-Add-missing-include-memory-to-websocket.h.patch
new file mode 100644
index 000000000000..861eaa781e8f
--- /dev/null
+++ b/games-simulation/EmptyEpsilon/files/SeriousProton-Add-missing-include-memory-to-websocket.h.patch
@@ -0,0 +1,23 @@
+From 9fe127233eae44f14e37900c3f54e8a305d2f161 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Sun, 22 May 2022 12:36:08 +0200
+Subject: [PATCH] Add missing #include <memory> to websocket.h
+
+std::unique_ptr, which is used for the 'socket' field, is defined in
+<memory> but currently not included. Starting with GCC 12, the missing
+include will cause a compilation error.
+
+The missing include was found by Gentoo's CI and reported as
+https://bugs.gentoo.org/846935
+--- a/src/io/http/websocket.h
++++ b/src/io/http/websocket.h
+@@ -5,6 +5,9 @@
+ #include <io/network/tcpSocket.h>
+ #include <unordered_map>
+ 
++#ifndef EMSCRIPTEN
++#include <memory>
++#endif
+ 
+ namespace sp {
+ namespace io {
diff --git a/games-simulation/EmptyEpsilon/files/SeriousProton-cmake.patch b/games-simulation/EmptyEpsilon/files/SeriousProton-cmake.patch
new file mode 100644
index 000000000000..3ac8368055f1
--- /dev/null
+++ b/games-simulation/EmptyEpsilon/files/SeriousProton-cmake.patch
@@ -0,0 +1,15 @@
+--- a/libs/basis_universal/CMakeLists.txt
++++ b/libs/basis_universal/CMakeLists.txt
+@@ -29,9 +29,9 @@ else()
+ endif()
+ 
+ if(NOT basis_POPULATED)
+-    if(COMMAND FetchContent_Populate)
+-        FetchContent_Populate(basis)
+-    endif()
++    set(basis_SOURCE_DIR "${EXTERNALS_DIR}/basis")
++    set(basis_BINARY_DIR "${PROJECT_BINARY_DIR}/externals/basis")
++
+     if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+         set(BUILD_X64 FALSE CACHE BOOL "")
+     endif()