Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gzdoom for openSUSE:Factory checked
in at 2024-05-15 21:29:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gzdoom (Old)
and /work/SRC/openSUSE:Factory/.gzdoom.new.1880 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gzdoom"
Wed May 15 21:29:07 2024 rev:34 rq:1174235 version:4.12.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/gzdoom/gzdoom.changes 2024-05-03
10:29:07.875645844 +0200
+++ /work/SRC/openSUSE:Factory/.gzdoom.new.1880/gzdoom.changes 2024-05-15
21:29:30.127901717 +0200
@@ -1,0 +2,5 @@
+Wed May 8 11:37:09 UTC 2024 - Jan Engelhardt <jeng...@inai.de>
+
+- Update more-32bit.patch to fix i586/ILP32 FTBFS.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ more-32bit.patch ++++++
--- /var/tmp/diff_new_pack.jZC8ld/_old 2024-05-15 21:29:32.115973675 +0200
+++ /var/tmp/diff_new_pack.jZC8ld/_new 2024-05-15 21:29:32.119973820 +0200
@@ -8,15 +8,18 @@
'VkSurfaceKHR' {aka 'long long unsigned int'} in initialization
[ 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 +-
- 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.11.3/src/common/platform/posix/sdl/sdlglvideo.cpp
-@@ -291,7 +291,7 @@ DFrameBuffer *SDLVideo::CreateFrameBuffe
+--- gzdoom-g4.12.2.orig/src/common/platform/posix/sdl/sdlglvideo.cpp
++++ gzdoom-g4.12.2/src/common/platform/posix/sdl/sdlglvideo.cpp
+@@ -400,7 +400,7 @@ DFrameBuffer *SDLVideo::CreateFrameBuffe
builder.RequireExtension(names[i]);
auto instance = builder.Create();
@@ -25,4 +28,29 @@
if (!I_CreateVulkanSurface(instance->Instance,
&surfacehandle))
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
+ };
+
