diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-06-20 01:14:49 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-06-20 01:14:49 +0100 |
| commit | bc4457d8e0e53a2e43c4254d08053ba9708663e1 (patch) | |
| tree | 4f8809f23d683eed73ef800d99ce7aa628a82527 /games-fps/gzdoom/files | |
| parent | 5f593f75391c28294f0dffa4dd1df280a4d8df73 (diff) | |
gentoo auto-resync : 20:06:2023 - 01:14:49
Diffstat (limited to 'games-fps/gzdoom/files')
| -rw-r--r-- | games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch | 14 | ||||
| -rw-r--r-- | games-fps/gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch | 36 |
2 files changed, 14 insertions, 36 deletions
diff --git a/games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch b/games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch new file mode 100644 index 000000000000..d34cb749e7f5 --- /dev/null +++ b/games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/907087 + +diff --git a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h +index fd44722..7189d0e 100644 +--- a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h ++++ b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h +@@ -20,6 +20,8 @@ + // THE SOFTWARE. + // + ++#include <cstdio> ++ + #ifndef AMD_VULKAN_MEMORY_ALLOCATOR_H + #define AMD_VULKAN_MEMORY_ALLOCATOR_H diff --git a/games-fps/gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch b/games-fps/gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch deleted file mode 100644 index 6070d47566e0..000000000000 --- a/games-fps/gzdoom/files/gzdoom-4.8.2-fix-gzdoom-pk3.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b132d2c3fe7f9074e1c08dbab77fc1270e8736fb Mon Sep 17 00:00:00 2001 -From: Omar Polo <op@omarpolo.com> -Date: Mon, 11 Jul 2022 11:52:43 +0200 -Subject: [PATCH] fix gzdoom.pk3 not found error - -Move the initialization before BaseFileSearch is called, otherwise -GameConfig is used not initialized and it doesn't find the gzdoom.pk3 -file. - -GameConfig used uninitalized was spotted by @LoneFox78. ---- - src/d_main.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/d_main.cpp b/src/d_main.cpp -index b64142c07fe..005f8cf8cd5 100644 ---- a/src/d_main.cpp -+++ b/src/d_main.cpp -@@ -3534,6 +3534,8 @@ static int D_DoomMain_Internal (void) - - std::set_new_handler(NewFailure); - const char *batchout = Args->CheckValue("-errorlog"); -+ -+ D_DoomInit(); - - // [RH] Make sure zdoom.pk3 is always loaded, - // as it contains magic stuff we need. -@@ -3568,8 +3570,6 @@ static int D_DoomMain_Internal (void) - - if (!batchrun) Printf(PRINT_LOG, "%s version %s\n", GAMENAME, GetVersionString()); - -- D_DoomInit(); -- - extern void D_ConfirmSendStats(); - D_ConfirmSendStats(); - |