pool/gzdoom
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Add more-32bit.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=102
This commit is contained in:
Jan Engelhardt 2023-11-03 09:53:38 +00:00 committed by Git OBS Bridge
parent 574d9f0684
commit 335001b6ec
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gzdoom.changes
View File

@ -15,6 +15,7 @@ Fri Oct 27 04:20:10 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
setting.
* Lots of new ZScript features.
- Delete gzdoom-vulkan.patch, gcc13.diff
- Add more-32bit.patch
-------------------------------------------------------------------
Thu Mar 30 22:02:53 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

1
gzdoom.spec
View File

@ -32,6 +32,7 @@ Patch6: gzdoom-discord.patch
Patch8: 0001-removed-some-32bit-only-CMake-code.patch
Patch9: 0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch
Patch10: 0001-Revert-Switch-to-miniz-from-zlib.patch
Patch11: more-32bit.patch
BuildRequires: cmake >= 2.8.7
BuildRequires: discord-rpc-devel
BuildRequires: gcc-c++

27
more-32bit.patch Normal file
View File

@ -0,0 +1,27 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2023-11-03 10:46:06.423636287 +0100
VkSurfaceKHR is an alias to `struct something *` on 64-bit platforms, but to
`uint64_t` on 32-bit. Using {} will clear it without running into a type error:
[ 88s] sdlglvideo.cpp:294:54: error: cannot convert 'std::nullptr_t' to
'VkSurfaceKHR' {aka 'long long unsigned int'} in initialization
[ 88s] 294 | VkSurfaceKHR surfacehandle = nullptr;
---
src/common/platform/posix/sdl/sdlglvideo.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: gzdoom-g4.11.3/src/common/platform/posix/sdl/sdlglvideo.cpp
===================================================================
--- gzdoom-g4.11.3.orig/src/common/platform/posix/sdl/sdlglvideo.cpp
+++ gzdoom-g4.11.3/src/common/platform/posix/sdl/sdlglvideo.cpp
@@ -291,7 +291,7 @@ DFrameBuffer *SDLVideo::CreateFrameBuffe
builder.RequireExtension(names[i]);
auto instance = builder.Create();
- VkSurfaceKHR surfacehandle = nullptr;
+ VkSurfaceKHR surfacehandle = {};
if (!I_CreateVulkanSurface(instance->Instance, &surfacehandle))
VulkanError("I_CreateVulkanSurface failed");