commit 114e63eb35f05587f9bec46c829e81ba802f0048 Author: Andrea Musuruane <musuruan(a)gmail.com&gt; Date: Thu Jul 11 16:17:11 2024 +0200 Updated to 1.63 .gitignore | 3 +++ snes9x-1.62.1-gcc13.patch | 20 ------------------ snes9x-1.63-format_strings.patch | 45 ++++++++++++++++++++++++++++++++++++++++ snes9x.spec | 33 +++++++++++++++++------------ sources | 6 +++--- 5 files changed, 71 insertions(+), 36 deletions(-) --- diff --git a/.gitignore b/.gitignore index 1fae7ae..17a15e4 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,6 @@ snes9x-1.53-src.tar.bz2 /glslang-12.1.0.tar.gz /SPIRV-Cross-1.3.243.0.tar.gz /Vulkan-Headers-1.3.242.tar.gz +/snes9x-1.63.tar.gz +/SPIRV-Cross-1.3.261.1.tar.gz +/Vulkan-Headers-1.3.280.tar.gz diff --git a/snes9x-1.63-format_strings.patch b/snes9x-1.63-format_strings.patch new file mode 100644 index 0000000..bb69902 --- /dev/null +++ b/snes9x-1.63-format_strings.patch @@ -0,0 +1,45 @@ +--- a/gtk/src/gtk_s9x.cpp ++++ b/gtk/src/gtk_s9x.cpp +@@ -383,35 +383,35 @@ + case S9X_TRACE: + case S9X_DEBUG: + { +- g_debug(message); ++ g_debug("%s", message); + break; + } + case S9X_WARNING: + { +- g_warning(message); ++ g_warning("%s", message); + break; + } + case S9X_INFO: + { +- g_info(message); +- g_message(message); ++ g_info("%s", message); ++ g_message("%s", message); + break; + } + case S9X_ERROR: + { + // GLib’s g_critical() does not terminate the process +- g_critical(message); ++ g_critical("%s", message); + break; + } + case S9X_FATAL_ERROR: + { + // GLib’s g_error() terminates the process +- g_error(message); ++ g_error("%s", message); + break; + } + default: + { +- g_message(message); ++ g_message("%s", message); + } + } + } diff --git a/snes9x.spec b/snes9x.spec index bb3a881..8fdb1e4 100644 --- a/snes9x.spec +++ b/snes9x.spec @@ -1,21 +1,25 @@ +%global SPIRV_Cross_version 1.3.261.1 +%global glslang_version 12.1.0 +%global vulkan_headers_version 1.3.280 + Summary: Super Nintendo Entertainment System emulator Name: snes9x -Version: 1.62.3 -Release: 2%{?dist} +Version: 1.63 +Release: 1%{?dist} License: Other URL: http://www.snes9x.com/ Source0: https://github.com/snes9xgit/snes9x/archive/%{version}.tar.gz#/%{name}-%{... # AppData file Source1: %{name}-gtk.appdata.xml # Bundled Libraries -Source10: https://github.com/KhronosGroup/glslang/archive/12.1.0/glslang-12.1.0.tar.gz -Source11: https://github.com/KhronosGroup/SPIRV-Cross/archive/refs/tags/sdk-1.3.243... -Source12: https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.3.242/Vulkan-He... +Source10: https://github.com/KhronosGroup/SPIRV-Cross/archive/refs/tags/sdk-%{SPIRV... +Source11: https://github.com/KhronosGroup/glslang/archive/%{glslang_version}/glslan... +Source12: https://github.com/KhronosGroup/Vulkan-Headers/archive/v%{vulkan_headers_... # Fix CFLAGS usage in CLI version Patch0: %{name}-1.56.1-unix_flags.patch -# Fix building with GCC 13 -# https://gitweb.gentoo.org/repo/gentoo.git/tree/games-emulation/snes9x/fil... -Patch1: %{name}-1.62.1-gcc13.patch +# Fix format strings +# Patch from Chimera Linux +Patch1: %{name}-1.63-format_strings.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -39,8 +43,8 @@ BuildRequires: desktop-file-utils BuildRequires: libappstream-glib Requires: hicolor-icon-theme -Provides: bundled(glslang) = 12.1.0 -Provides: bundled(spirv-cross) = 1.3.243.0 +Provides: bundled(spirv-cross) = %{SPIRV_Cross_version} +Provides: bundled(glslang) = %{glslang_version} %description Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES) @@ -65,9 +69,9 @@ This package contains a graphical user interface using GTK+. %setup -q -T -D -a 11 %setup -q -T -D -a 12 -mv -Tf glslang-12.1.0 external/glslang -mv -Tf SPIRV-Cross-sdk-1.3.243.0 external/SPIRV-Cross -mv -Tf Vulkan-Headers-1.3.242 external/vulkan-headers +mv -Tf SPIRV-Cross-sdk-%{SPIRV_Cross_version} external/SPIRV-Cross +mv -Tf glslang-%{glslang_version} external/glslang +mv -Tf Vulkan-Headers-%{vulkan_headers_version} external/vulkan-headers # Remove bundled libs rm -rf unzip @@ -133,6 +137,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml %changelog +* Thu Jul 11 2024 Andrea Musuruane <musuruan(a)gmail.com&gt; - 1.63-1 +- Updated to 1.63 + * Sun Feb 04 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 1.62.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index cc04c9e..0df3fdd 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (snes9x-1.62.3.tar.gz) = 005222bc054fbdfef92acc3ce5ad1f4b18eaff4382ab352d61e5c9c3fbe952ca085e964535e628730976f795c568e9e8751e6ef997f864c719c421d67d9e04db +SHA512 (snes9x-1.63.tar.gz) = c6f0edc64b673167812ebb5e972afed0d2a51234bb24779cb613cda6cac5580193c738e697199917735bb3bc621cb040796d448db44d0e57bdd781daf24055cf +SHA512 (SPIRV-Cross-1.3.261.1.tar.gz) = b0dcf9407a878b2d13ae38d4b9797c2b44246f76112a9865c8067d92a262a82cc0c62f1b24b462a48f29e623906f9f2553fb618647abae1b51f654e9eb26d102 SHA512 (glslang-12.1.0.tar.gz) = 1d40518d09579eb925b1e4375c9a581736cdb79aaf60d1ca6117e394386a8d2dc1dafd9a4a30d9381f063c1ea1f65fc0d5d9fcbbefa87a85423f87fd925747b0 -SHA512 (SPIRV-Cross-1.3.243.0.tar.gz) = 82b0d28ba8c5e9c7bf9e4fabfe07bbf00b4f058ddeea87c1af8dfa52affd55bd0130f5c430b264ec2c4682eef460fbbd1fe5b1db14e61786887634bb4e45ad8b -SHA512 (Vulkan-Headers-1.3.242.tar.gz) = 63ec56544f64f5bba575db64210b64e13f2180d16cacb63e72621e420f7cb54d60d4e987e64afb2d39d2fc181c7d49e1ca4874249298eef36d8dd311c89b260a +SHA512 (Vulkan-Headers-1.3.280.tar.gz) = 9f9db305eda58b7faaf16f2b80e071749e456b0b76649c1f5be0497fcf25fbe000a92c15307086ab2105c4c1024f587cce9b424553044f5d1148bf89fcbd7f65