From ecfedf6305b6a65ae40c7a9fec6320763cee1a9a Mon Sep 17 00:00:00 2001
From: "B. Watson" <urchlay@slackware.uk>
Date: Thu, 15 Aug 2024 00:18:35 -0400
Subject: [PATCH] games/snes9x: Updated for version 1.63.

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 games/snes9x/fix-32bit-build.diff | 19 +++++++++++++++++++
 games/snes9x/snes9x.SlackBuild    | 16 +++++++++++++---
 games/snes9x/snes9x.info          | 10 +++++-----
 3 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 games/snes9x/fix-32bit-build.diff

diff --git a/games/snes9x/fix-32bit-build.diff b/games/snes9x/fix-32bit-build.diff
new file mode 100644
index 0000000000..282d6a7fb3
--- /dev/null
+++ b/games/snes9x/fix-32bit-build.diff
@@ -0,0 +1,19 @@
+diff --git a/gtk/src/gtk_display_driver_vulkan.cpp b/gtk/src/gtk_display_driver_vulkan.cpp
+index 66e5b164..ce860e4d 100644
+--- a/gtk/src/gtk_display_driver_vulkan.cpp
++++ b/gtk/src/gtk_display_driver_vulkan.cpp
+@@ -66,12 +66,12 @@ bool S9xVulkanDisplayDriver::init_imgui()
+     init_info.Device = context->device;;
+     init_info.QueueFamily = context->graphics_queue_family_index;
+     init_info.Queue = context->queue;
+-    init_info.DescriptorPool = imgui_descriptor_pool.get();
++    init_info.DescriptorPool = static_cast<VkDescriptorPool>(imgui_descriptor_pool.get());
+     init_info.Subpass = 0;
+     init_info.MinImageCount = context->swapchain->get_num_frames();
+     init_info.ImageCount = context->swapchain->get_num_frames();
+     init_info.MSAASamples = VK_SAMPLE_COUNT_1_BIT;
+-    ImGui_ImplVulkan_Init(&init_info, context->swapchain->get_render_pass());
++    ImGui_ImplVulkan_Init(&init_info, static_cast<VkRenderPass>(context->swapchain->get_render_pass()));
+ 
+     auto cmd = context->begin_cmd_buffer();
+     ImGui_ImplVulkan_CreateFontsTexture(cmd);
diff --git a/games/snes9x/snes9x.SlackBuild b/games/snes9x/snes9x.SlackBuild
index ad26551806..9b94e185d7 100644
--- a/games/snes9x/snes9x.SlackBuild
+++ b/games/snes9x/snes9x.SlackBuild
@@ -6,7 +6,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20240814 bkw: update for v1.63.
+# Had to update Vulkan-Headers to get it to compile. Did not update
+# Spirv-Headers or glslang. If this causes anyone any problems, please
+# let me know.
+
 # 20230418 bkw: BUILD=2, make portaudio optional + autodetected.
+
 # 20230410 bkw: update for 1.62.3.
 # Most of the work needed for this update was done by M.Dinslage,
 # to whom I owe thanks. I updated the man page, and added the
@@ -18,13 +24,13 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=snes9x
-VERSION=${VERSION:-1.62.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.63}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 SPIRVVER="2021-01-15"
-VULKVER="1.3.246"
+VULKVER="1.3.280"
 GLSLANGVER="12.1.0"
 
 if [ -z "$ARCH" ]; then
@@ -84,6 +90,10 @@ 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 {} \+
 
+# upstream commit bff02194a797b44f7d0082c4594a2c8c0381bb1b,
+# post 1.63 release.
+patch -p1 < $CWD/fix-32bit-build.diff
+
 WITHPULSE=yes
 if [ "$PULSE" = "no" ] || ! pkg-config --exists libpulse; then
   PULSEOPT="-DUSE_PULSEAUDIO=OFF"
diff --git a/games/snes9x/snes9x.info b/games/snes9x/snes9x.info
index fda41c81b4..db6bd9a121 100644
--- a/games/snes9x/snes9x.info
+++ b/games/snes9x/snes9x.info
@@ -1,13 +1,13 @@
 PRGNAM="snes9x"
-VERSION="1.62.3"
+VERSION="1.63"
 HOMEPAGE="https://github.com/snes9xgit/snes9x"
-DOWNLOAD="https://github.com/snes9xgit/snes9x/archive/1.62.3/snes9x-1.62.3.tar.gz \
+DOWNLOAD="https://github.com/snes9xgit/snes9x/archive/1.63/snes9x-1.63.tar.gz \
           https://github.com/KhronosGroup/glslang/archive/12.1.0/glslang-12.1.0.tar.gz \
-          https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.3.246/Vulkan-Headers-1.3.246.tar.gz \
+          https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.3.280/Vulkan-Headers-1.3.280.tar.gz \
           https://github.com/KhronosGroup/SPIRV-Cross/archive/2021-01-15/SPIRV-Cross-2021-01-15.tar.gz"
-MD5SUM="53879c428f871e5e56d5a10dc24e4c10 \
+MD5SUM="e1b505a1a15cf963dbf47de4379949f8 \
         218e2dd3ab422fca3a99ba6ca517c84c \
-        9b0106c6cae8ef061ba8a7c5b5778b1b \
+        bd9cac8372fb5e450645135706b3aea9 \
         b3d17d652cde727629a68ff338881290"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""