From 18712dbad51f16c72f8f5dd6ff8514051766b6f94c08294898d2afa82f98a0d4 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 2 Nov 2024 17:43:26 +0100 Subject: [PATCH] gzdoom 4.13.2 --- g4.13.0.tar.gz | 3 --- g4.13.2.tar.gz | 3 +++ gzdoom.changes | 10 ++++++++++ gzdoom.spec | 2 +- more-32bit.patch | 39 ++++++++++++++++++++++++++------------- 5 files changed, 40 insertions(+), 17 deletions(-) delete mode 100644 g4.13.0.tar.gz create mode 100644 g4.13.2.tar.gz diff --git a/g4.13.0.tar.gz b/g4.13.0.tar.gz deleted file mode 100644 index f374976..0000000 --- a/g4.13.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c773d6efc7d84e13af2293ab5b13e06ba12a8da3f9cf04021ea1a8a5cf17fe17 -size 25950480 diff --git a/g4.13.2.tar.gz b/g4.13.2.tar.gz new file mode 100644 index 0000000..be093cc --- /dev/null +++ b/g4.13.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9649f5b3b6b3cb06a35ca0dbec7b3f59eabcaf0b2d5b99f8c46a010ea1fed9c +size 25950370 diff --git a/gzdoom.changes b/gzdoom.changes index df2b780..0e987c5 100644 --- a/gzdoom.changes +++ b/gzdoom.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Nov 2 16:40:47 UTC 2024 - Jan Engelhardt + +- Update to release 4.13.2 + * Added (SPF_)STRETCHPIXELS - for actors, makes rollsprites + levelstretched, for particles, puts them back to the original + stretch math as before, optional opt-in flag. + * Sector damage code reverted due to some critical bugs, + feature will be in 4.14 timeframe. + ------------------------------------------------------------------- Sat Oct 12 08:46:50 UTC 2024 - Jan Engelhardt diff --git a/gzdoom.spec b/gzdoom.spec index 27c5c84..6820ffb 100644 --- a/gzdoom.spec +++ b/gzdoom.spec @@ -17,7 +17,7 @@ Name: gzdoom -Version: 4.13.0 +Version: 4.13.2 Release: 0 Summary: A DOOM source port with graphic and modding extensions License: GPL-3.0-only diff --git a/more-32bit.patch b/more-32bit.patch index 614ec8c..a79dca1 100644 --- a/more-32bit.patch +++ b/more-32bit.patch @@ -20,14 +20,15 @@ Using {} will clear it without running into a type error: --- src/CMakeLists.txt | 5 +++++ src/common/engine/i_interface.cpp | 8 -------- + src/common/models/bonecomponents.h | 1 + src/common/platform/posix/sdl/sdlglvideo.cpp | 2 +- src/playsim/p_effect.h | 7 +++++-- - 4 files changed, 11 insertions(+), 11 deletions(-) + 5 files changed, 12 insertions(+), 11 deletions(-) -Index: gzdoom-g4.13.0/src/CMakeLists.txt +Index: gzdoom-g4.13.2/src/CMakeLists.txt =================================================================== ---- gzdoom-g4.13.0.orig/src/CMakeLists.txt -+++ gzdoom-g4.13.0/src/CMakeLists.txt +--- gzdoom-g4.13.2.orig/src/CMakeLists.txt ++++ gzdoom-g4.13.2/src/CMakeLists.txt @@ -44,6 +44,11 @@ if( ${TARGET_ARCHITECTURE} MATCHES "x86_ set( X64 64 ) add_definitions( -DARCH_IA32 ) @@ -40,10 +41,10 @@ Index: gzdoom-g4.13.0/src/CMakeLists.txt if( NOT PROJECT_LIBRARIES ) set( PROJECT_LIBRARIES "" ) -Index: gzdoom-g4.13.0/src/common/engine/i_interface.cpp +Index: gzdoom-g4.13.2/src/common/engine/i_interface.cpp =================================================================== ---- gzdoom-g4.13.0.orig/src/common/engine/i_interface.cpp -+++ gzdoom-g4.13.0/src/common/engine/i_interface.cpp +--- gzdoom-g4.13.2.orig/src/common/engine/i_interface.cpp ++++ gzdoom-g4.13.2/src/common/engine/i_interface.cpp @@ -6,14 +6,6 @@ #include "gstrings.h" #include "version.h" @@ -59,10 +60,22 @@ Index: gzdoom-g4.13.0/src/common/engine/i_interface.cpp // Some global engine variables taken out of the backend code. FStartupScreen* StartWindow; SystemCallbacks sysCallbacks; -Index: gzdoom-g4.13.0/src/common/platform/posix/sdl/sdlglvideo.cpp +Index: gzdoom-g4.13.2/src/common/models/bonecomponents.h =================================================================== ---- gzdoom-g4.13.0.orig/src/common/platform/posix/sdl/sdlglvideo.cpp -+++ gzdoom-g4.13.0/src/common/platform/posix/sdl/sdlglvideo.cpp +--- gzdoom-g4.13.2.orig/src/common/models/bonecomponents.h ++++ gzdoom-g4.13.2/src/common/models/bonecomponents.h +@@ -43,6 +43,7 @@ struct ModelAnim + float framerate = 0; + double startFrame = 0; + int flags = MODELANIM_NONE; ++ int __padding = 0; + double startTic = 0; // when the current animation started (changing framerates counts as restarting) (or when animation starts if interpolating from previous animation) + double switchOffset = 0; // when the animation was changed -- where to interpolate the switch from + }; +Index: gzdoom-g4.13.2/src/common/platform/posix/sdl/sdlglvideo.cpp +=================================================================== +--- gzdoom-g4.13.2.orig/src/common/platform/posix/sdl/sdlglvideo.cpp ++++ gzdoom-g4.13.2/src/common/platform/posix/sdl/sdlglvideo.cpp @@ -400,7 +400,7 @@ DFrameBuffer *SDLVideo::CreateFrameBuffe builder.RequireExtension(names[i]); auto instance = builder.Create(); @@ -72,10 +85,10 @@ Index: gzdoom-g4.13.0/src/common/platform/posix/sdl/sdlglvideo.cpp if (!I_CreateVulkanSurface(instance->Instance, &surfacehandle)) VulkanError("I_CreateVulkanSurface failed"); -Index: gzdoom-g4.13.0/src/playsim/p_effect.h +Index: gzdoom-g4.13.2/src/playsim/p_effect.h =================================================================== ---- gzdoom-g4.13.0.orig/src/playsim/p_effect.h -+++ gzdoom-g4.13.0/src/playsim/p_effect.h +--- gzdoom-g4.13.2.orig/src/playsim/p_effect.h ++++ gzdoom-g4.13.2/src/playsim/p_effect.h @@ -75,7 +75,10 @@ enum EParticleFlags class DVisualThinker; struct particle_t