commit 80d4c8ce33cbe378aff52b77c149fa9320d137d9 Author: Andrea Musuruane <musuruan(a)gmail.com&gt; Date: Sat Aug 12 16:12:46 2023 +0200 Updated to 1.62.3 .gitignore | 4 +++ snes9x-1.60-gcc11.patch | 47 ------------------------------------ snes9x-1.60-soundsync.patch | 22 ----------------- snes9x-1.62.1-gcc13.patch | 20 +++++++++++++++ snes9x.spec | 59 +++++++++++++++++++++++++++------------------ sources | 5 +++- 6 files changed, 63 insertions(+), 94 deletions(-) --- diff --git a/.gitignore b/.gitignore index d7f2421..1fae7ae 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,7 @@ snes9x-1.53-src.tar.bz2 /snes9x-1.58.tar.gz /snes9x-1.59.2.tar.gz /snes9x-1.60.tar.gz +/snes9x-1.62.3.tar.gz +/glslang-12.1.0.tar.gz +/SPIRV-Cross-1.3.243.0.tar.gz +/Vulkan-Headers-1.3.242.tar.gz diff --git a/snes9x-1.62.1-gcc13.patch b/snes9x-1.62.1-gcc13.patch new file mode 100644 index 0000000..28945fd --- /dev/null +++ b/snes9x-1.62.1-gcc13.patch @@ -0,0 +1,20 @@ +Partly a backport from +https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/commit/29d492b60c8 +--- a/external/VulkanMemoryAllocator-Hpp/include/vk_mem_alloc.h ++++ b/external/VulkanMemoryAllocator-Hpp/include/vk_mem_alloc.h +@@ -2615,4 +2615,8 @@ + #endif + ++#if VMA_STATS_STRING_ENABLED ++ #include <cstdio> // For snprintf ++#endif ++ + /******************************************************************************* + CONFIGURATION SECTION +--- a/vulkan/slang_shader.hpp ++++ b/vulkan/slang_shader.hpp +@@ -1,3 +1,4 @@ + #pragma once ++#include <cstdint> + #include <string> + #include <vector> diff --git a/snes9x.spec b/snes9x.spec index 9015654..314b957 100644 --- a/snes9x.spec +++ b/snes9x.spec @@ -1,24 +1,24 @@ Summary: Super Nintendo Entertainment System emulator Name: snes9x -Version: 1.60 -Release: 11%{?dist} +Version: 1.62.3 +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... # Fix CFLAGS usage in CLI version Patch0: %{name}-1.56.1-unix_flags.patch -# Don't set soundsync on with no way to disable -# https://github.com/snes9xgit/snes9x/issues/530 -# https://github.com/snes9xgit/snes9x/commit/54a961d8ca57c5d81a5f2d4e274333... -Patch1: %{name}-1.60-soundsync.patch -# Fix building with GCC 11 -# https://github.com/snes9xgit/snes9x/issues/698 -# https://github.com/snes9xgit/snes9x/commit/7f6d9d6432d912cd90763c64f7c922... -Patch2: %{name}-1.60-gcc11.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 BuildRequires: gcc-c++ -BuildRequires: meson +BuildRequires: cmake BuildRequires: autoconf BuildRequires: zlib-devel BuildRequires: libpng-devel @@ -27,15 +27,11 @@ BuildRequires: libXrandr-devel BuildRequires: libGL-devel BuildRequires: nasm BuildRequires: intltool -BuildRequires: gtk3-devel +BuildRequires: gtkmm30-devel BuildRequires: libglade2-devel BuildRequires: SDL2-devel BuildRequires: libxml2-devel -%if 0%{?fedora} >= 30 -BuildRequires: minizip-compat-devel -%else -BuildRequires: minizip-devel -%endif +BuildRequires: minizip-compat-devel BuildRequires: portaudio-devel BuildRequires: alsa-lib-devel BuildRequires: pulseaudio-libs-devel @@ -43,6 +39,9 @@ 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 + %description Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES) emulator. It basically allows you to play most games designed for the SNES @@ -62,6 +61,13 @@ This package contains a graphical user interface using GTK+. %prep %autosetup -p1 +%setup -q -T -D -a 10 +%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 # Remove bundled libs rm -rf unzip @@ -70,8 +76,10 @@ rm -rf unzip %build # Build GTK version pushd gtk -%meson -%meson_build +%cmake \ + -DCMAKE_INSTALL_LOCALEDIR:PATH=share/locale \ + -DBUILD_SHARED_LIBS:BOOL=OFF +%cmake_build popd # Build CLI version @@ -87,7 +95,7 @@ popd %install # Install GTK version pushd gtk -%meson_install +%cmake_install popd # Install CLI version @@ -99,9 +107,9 @@ desktop-file-validate \ %{buildroot}%{_datadir}/applications/%{name}-gtk.desktop # Install AppData file -install -d %{buildroot}%{_datadir}/metainfo -install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml +install -d %{buildroot}%{_metainfodir} +install -p -m 644 %{SOURCE1} %{buildroot}%{_metainfodir} +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml %find_lang %{name}-gtk @@ -119,12 +127,15 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata %doc gtk/AUTHORS %{_bindir}/%{name}-gtk %{_datadir}/%{name} -%{_datadir}/metainfo/%{name}-gtk.appdata.xml %{_datadir}/applications/%{name}-gtk.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.* +%{_metainfodir}/%{name}-gtk.appdata.xml %changelog +* Sat Aug 12 2023 Andrea Musuruane <musuruan(a)gmail.com&gt; - 1.62.3-1 +- Updated to 1.62.3 + * Thu Aug 03 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 1.60-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 397a32d..cc04c9e 100644 --- a/sources +++ b/sources @@ -1 +1,4 @@ -1e0d5d5209b8018080bca0aa5da02dff snes9x-1.60.tar.gz +SHA512 (snes9x-1.62.3.tar.gz) = 005222bc054fbdfef92acc3ce5ad1f4b18eaff4382ab352d61e5c9c3fbe952ca085e964535e628730976f795c568e9e8751e6ef997f864c719c421d67d9e04db +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