jengelh/gzdoom
SHA256
1
0
Fork 0
forked from pool/gzdoom
Code Pull Requests Activity

Accepting request 1174235 from games

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1174235
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gzdoom?expand=0&rev=34
This commit is contained in:
Ana Guerrero 2024-05-15 19:29:07 +00:00 committed by Git OBS Bridge
commit a299092623
2 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gzdoom.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 8 11:37:09 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
- Update more-32bit.patch to fix i586/ILP32 FTBFS.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 30 10:40:25 UTC 2024 - Jan Engelhardt <jengelh@inai.de> Tue Apr 30 10:40:25 UTC 2024 - Jan Engelhardt <jengelh@inai.de>

38
more-32bit.patch
View File

@ -8,15 +8,18 @@ VkSurfaceKHR is an alias to `struct something *` on 64-bit platforms, but to
'VkSurfaceKHR' {aka 'long long unsigned int'} in initialization 'VkSurfaceKHR' {aka 'long long unsigned int'} in initialization
[ 88s] 294 | VkSurfaceKHR surfacehandle = nullptr; [ 88s] 294 | VkSurfaceKHR surfacehandle = nullptr;
static_assert for particle_t also failed, because it's 120 on ILP32.
--- ---
src/common/platform/posix/sdl/sdlglvideo.cpp | 2 +- src/common/platform/posix/sdl/sdlglvideo.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) src/playsim/p_effect.h | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
Index: gzdoom-g4.11.3/src/common/platform/posix/sdl/sdlglvideo.cpp Index: gzdoom-g4.12.2/src/common/platform/posix/sdl/sdlglvideo.cpp
=================================================================== ===================================================================
--- gzdoom-g4.11.3.orig/src/common/platform/posix/sdl/sdlglvideo.cpp --- gzdoom-g4.12.2.orig/src/common/platform/posix/sdl/sdlglvideo.cpp
+++ gzdoom-g4.11.3/src/common/platform/posix/sdl/sdlglvideo.cpp +++ gzdoom-g4.12.2/src/common/platform/posix/sdl/sdlglvideo.cpp
@@ -291,7 +291,7 @@ DFrameBuffer *SDLVideo::CreateFrameBuffe @@ -400,7 +400,7 @@ DFrameBuffer *SDLVideo::CreateFrameBuffe
builder.RequireExtension(names[i]); builder.RequireExtension(names[i]);
auto instance = builder.Create(); auto instance = builder.Create();
@ -25,3 +28,28 @@ Index: gzdoom-g4.11.3/src/common/platform/posix/sdl/sdlglvideo.cpp
if (!I_CreateVulkanSurface(instance->Instance, &surfacehandle)) if (!I_CreateVulkanSurface(instance->Instance, &surfacehandle))
VulkanError("I_CreateVulkanSurface failed"); VulkanError("I_CreateVulkanSurface failed");
Index: gzdoom-g4.12.2/src/playsim/p_effect.h
===================================================================
--- gzdoom-g4.12.2.orig/src/playsim/p_effect.h
+++ gzdoom-g4.12.2/src/playsim/p_effect.h
@@ -70,7 +70,10 @@ enum EParticleFlags
class DVisualThinker;
struct particle_t
{
- subsector_t* subsector; //+8 = 8
+ union {
+ subsector_t* subsector;
+ uint64_t _pad0; //+8 = 8
+ };
DVector3 Pos; //+24 = 32
FVector3 Vel; //+12 = 44
FVector3 Acc; //+12 = 56
@@ -83,7 +86,7 @@ struct particle_t
float Roll, RollVel, RollAcc; //+12 = 100
uint16_t tnext, snext, tprev; //+6 = 106
uint16_t flags; //+2 = 108
- // uint32_t padding; //+4 = 112
+ uint32_t padding; //+4 = 112
FStandaloneAnimation animData; //+16 = 128
};