games/gzdoom: Updated for version 4.12.2.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 20 insertions, 84 deletions

diff --git a/games/gzdoom/README b/games/gzdoom/README
index 30176aa78d54..4a44710bce57 100644
--- a/games/gzdoom/README
+++ b/games/gzdoom/README
@@ -3,10 +3,11 @@ gzdoom (OpenGL port of DOOM)
 Enhanced OpenGL port of the official DOOM source code that also supports
 Heretic, Hexen, and Strife.
 
-This is the latest version of gzdoom, which may not run well
-on older/slower systems. If you have problems, try running with
-"-glversion 3.3". If it still won't start, or doesn't run smoothly on
-your system, try installing gzdoom-legacy instead. Note that gzdoom
-and gzdoom-legacy conflict: only install one or the other.
+This is the latest version of gzdoom, which may not run well on
+older/slower systems, and doesn't support 32-bit x86 at all. If
+you have problems, try running with "-glversion 3.3". If it still
+won't start, or doesn't run smoothly on your system, try installing
+gzdoom-legacy instead. Note that gzdoom and gzdoom-legacy conflict:
+only install one or the other.
 
 See README_SBo.txt for optional runtime dependencies.
diff --git a/games/gzdoom/gcc13-missing-includes.diff b/games/gzdoom/gcc13-missing-includes.diff
deleted file mode 100644
index 4083e06f801a..000000000000
--- a/games/gzdoom/gcc13-missing-includes.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-From ee8c12eac62349f4524229370da20915624485ef Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Thu, 30 Mar 2023 23:41:22 +0200
-Subject: [PATCH] build: resolve missing includes under gcc-13
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-$ make
-...
-~/gzdoom/libraries/ZVulkan/src/vulkanbuilders.cpp: In member function ‘std::unique_ptr<VulkanShader> ShaderBuilder::Create(const char*, VulkanDevice*)’:
-~/gzdoom/libraries/ZVulkan/src/vulkanbuilders.cpp:168:28: error: ‘runtime_error’ is not a member of ‘std’
-~/gzdoom/libraries/ZVulkan/include/zvulkan/vk_mem_alloc/vk_mem_alloc.h: In function ‘void VmaUint32ToStr(char*, size_t, uint32_t)’:
-~/gzdoom/libraries/ZVulkan/include/zvulkan/vk_mem_alloc/vk_mem_alloc.h:2410:9: error: ‘snprint ’ was not declared in this scope
----
- src/common/rendering/vulkan/system/vk_builders.cpp              | 1 +
- src/common/rendering/vulkan/system/vk_swapchain.cpp             | 1 +
- .../rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h     | 2 ++
- 3 files changed, 4 insertions(+)
-
-diff --git a/src/common/rendering/vulkan/system/vk_builders.cpp b/src/common/rendering/vulkan/system/vk_builders.cpp
-index aff0de50a9..b8d4a13de9 100644
---- a/src/common/rendering/vulkan/system/vk_builders.cpp
-+++ b/src/common/rendering/vulkan/system/vk_builders.cpp
-@@ -20,6 +20,7 @@
- **
- */
- 
-+#include <stdexcept>
- #include "vk_builders.h"
- #include "engineerrors.h"
- #include "renderstyle.h"
-diff --git a/src/common/rendering/vulkan/system/vk_swapchain.cpp b/src/common/rendering/vulkan/system/vk_swapchain.cpp
-index f44139b1f5..e89a6bd823 100644
---- a/src/common/rendering/vulkan/system/vk_swapchain.cpp
-+++ b/src/common/rendering/vulkan/system/vk_swapchain.cpp
-@@ -20,6 +20,7 @@
- **
- */
- 
-+#include <stdexcept>
- #include "vk_swapchain.h"
- #include "vk_objects.h"
- #include "c_cvars.h"
-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 fd4472286b..db0b94f4e8 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
-@@ -104,6 +104,8 @@ Documentation of all members: vk_mem_alloc.h
- - [Source repository on GitHub](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator)
- */
- 
-+#include <stdio.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
--- 
-2.40.1
-
diff --git a/games/gzdoom/gzdoom.SlackBuild b/games/gzdoom/gzdoom.SlackBuild
index 0a599804e23f..e5bd90b1b00d 100644
--- a/games/gzdoom/gzdoom.SlackBuild
+++ b/games/gzdoom/gzdoom.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20240805 bkw: updated for 4.12.2.
 # 20230810 bkw: add patch to fix build on -current (does no harm on 15.0).
 # 20230109 bkw: Updated for 4.10.0. Many thanks to fourtysixandtwo for
 # testing this on more capable hardware than I have, and for finding
@@ -40,7 +41,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gzdoom
-VERSION=${VERSION:-4.10.0}
+VERSION=${VERSION:-4.12.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -62,13 +63,15 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
+case "$ARCH" in
+  i?86) echo "32-bit builds aren't supported, sorry."
+        exit 1 ;;
+esac
+
+if [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
@@ -88,10 +91,6 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# 20230810 bkw: patch for gcc 13 (Slackware -current), from AUR, by
-# way of biker_rat on LQ, delivered C/O ponce.
-patch -p1 < $CWD/gcc13-missing-includes.diff
-
 # 20201027 bkw: fix the '<unknown version>' in the window title. This
 # used to be done in an uglier way (with a patch that occasionally broke
 # when applied against new gzdooms).
@@ -109,10 +108,6 @@ sed -i '1i#include <cmath>' \
        src/rendering/swrenderer/drawers/r_draw.cpp \
        src/rendering/swrenderer/viewport/r_spritedrawer.cpp
 
-# 20220318 bkw: gzdoom requires SSE2. not a problem for x86_64, but we
-# have to explicitly set the flags for the 32-bit build to succeed.
-SLKCFLAGS+=" -msse -msse2"
-
 mkdir -p build
 cd build
   cmake \
diff --git a/games/gzdoom/gzdoom.info b/games/gzdoom/gzdoom.info
index 83f1c39a2e02..bc4ae00652f9 100644
--- a/games/gzdoom/gzdoom.info
+++ b/games/gzdoom/gzdoom.info
@@ -1,10 +1,10 @@
 PRGNAM="gzdoom"
-VERSION="4.10.0"
+VERSION="4.12.2"
 HOMEPAGE="http://gzdoom.drdteam.org/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/coelckers/gzdoom/archive/g4.10.0/gzdoom-g4.10.0.tar.gz"
-MD5SUM_x86_64="54d8348650b8693fb545b20538e019ad"
+DOWNLOAD_x86_64="https://github.com/coelckers/gzdoom/archive/g4.12.2/gzdoom-g4.12.2.tar.gz"
+MD5SUM_x86_64="53a3e0a2ca05d1330db0f09d5e076fa5"
 REQUIRES="zmusic"
 MAINTAINER="B. Watson"
 EMAIL="urchlay@slackware.uk"