commit: e5ec76a59326b1cc11f426014910d2af97f45a7f Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> AuthorDate: Tue Aug 12 16:06:24 2025 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Tue Aug 12 16:06:39 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5ec76a5
games-emulation/snes9x: add 1.63 (bug #948021) Also add fix for bug #958599 that re-runs cmake_src_prepare Closes: https://bugs.gentoo.org/948021 Closes: https://bugs.gentoo.org/958599 Bug: https://bugs.gentoo.org/947259 Bug: https://bugs.gentoo.org/939837 Bug: https://bugs.gentoo.org/932500 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> games-emulation/snes9x/Manifest | 4 + .../snes9x/files/snes9x-1.63-flags.patch | 28 +++ .../files/snes9x-1.63-optional-wayland.patch | 21 +++ .../snes9x/files/snes9x-1.63-vulkan-fix.patch | 64 +++++++ games-emulation/snes9x/snes9x-1.63.ebuild | 190 +++++++++++++++++++++ 5 files changed, 307 insertions(+) diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest index 44814a48aea1..4048e5d22cf7 100644 --- a/games-emulation/snes9x/Manifest +++ b/games-emulation/snes9x/Manifest @@ -1,4 +1,8 @@ DIST glslang-6d41bb9c557c5a0eec61ffba1f775dc5f717a8f7.tar.gz 3694607 BLAKE2B c6ba30fc561c6053c3f685f2b7529053f56e0869e4c05013a1c59f39b4c97847c3e50c30859dce6f0c17c9f9bf21b96ebc04b510bcdc33f4ced87d892a36f94c SHA512 49efe8841bbe2d603d5dd03bdb273bb991ee6ea509081048c01b7c4de6d4cad42f223755e1cb391c426993fba72ed3878e28bcce8dd7f6eeb5adf873705b7d62 +DIST glslang-9c7fd1a33e5cecbe465e1cd70170167d5e40d398.tar.gz 3704453 BLAKE2B 147bf199ef1a9a678f82357915fc06eee356b049a14a0fc75dde3a33be66484b2cbfa86d92416c9d9d047fc168d24390df6f8c63205c68fd3cedcb29c707d674 SHA512 8226897c973d11dd7d4a59549d298acb3dc6f683c60ef4c824555be10f8cc114f99f23b01999c439c9eb9671f636e2f082b6c7d1cc6967eadfc91571d1cdc422 DIST snes9x-1.62.3.tar.gz 3423799 BLAKE2B 0eaea11d4f0fa03b01d7ae86a559ad76df31d6e5a485ee09f75ec81824296a2f3182da6180dd60eb4bb9722cd3d8ce6ac3e0c1ae7c7740f2828fde1231c19a2a SHA512 005222bc054fbdfef92acc3ce5ad1f4b18eaff4382ab352d61e5c9c3fbe952ca085e964535e628730976f795c568e9e8751e6ef997f864c719c421d67d9e04db +DIST snes9x-1.63.tar.gz 5134657 BLAKE2B bad963c9e2b7030c268337ec5bb8a6cca211093a9ec68019873bc92f75d604022abe16caa9da8e9f13d59d7813be9b7928b7a69ad6ac0a5577f5952b1688099b SHA512 c6f0edc64b673167812ebb5e972afed0d2a51234bb24779cb613cda6cac5580193c738e697199917735bb3bc621cb040796d448db44d0e57bdd781daf24055cf DIST spirv-cross-4e2fdb25671c742a9fbe93a6034eb1542244c7e1.tar.gz 1714902 BLAKE2B ae2b9816755679552c21b7f4446cda5b0626ba56143767445014b011234183afe55b4abbdf2a5849cad3d9e17871362bbac4da6b7969b578f564a8cbb3f3b269 SHA512 ec47b1d966006c6e654e84e7fa16124c774de3ca6fd508d3cfe0568e3df79eee3f5aeedfae1d744b99e162beeee23afe498249b2291091bc14c0357db304bebe +DIST spirv-cross-bccaa94db814af33d8ef05c153e7c34d8bd4d685.tar.gz 1745485 BLAKE2B 3ebad427f785296c2b983cebc562a1efe422fbd17eb449449641e4bef9f19aa42f56f27d77bf85aa6adc195bdc46a334b8c8fba5582a5e370543032128d0ee01 SHA512 c97a801fbaba78a724e8e8da96f59b054f01800aaa912065802295a132e5a9c0678c0ebef734bc2eced4d8afe834433364ede9a1d5efadcbace4e7c671b6825b +DIST vulkan-headers-577baa05033cf1d9236b3d078ca4b3269ed87a2b.tar.gz 2265390 BLAKE2B 2c8e258d56e596bd944fb9e7ecf71845ed3626cfc476dadabd50eeda4a44726094fcb1490430e689fb3e923aa0c128031ca3a037cca28d906833877297e2e91d SHA512 bdf4af1106d88ea338387b48fe43e2a35eeca5527131c4af6d098304f1f4601f6588f5c63f94b14defbb59ba6afe3c97a0e0b7d38ff3e744c11cdfa8a6cff452 DIST vulkan-headers-a3dd2655a3a68c2a67c55a0f8b77dcb8b166ada2.tar.gz 1832285 BLAKE2B 9278a17ede62f1a839ed230d2eefe3eb7ed46d3e25d4a44504f8d247c7b1c83d38166bec143f3b8e068d5c112585299d90ec16e9c41be6096c61f2eb5e127287 SHA512 b35541413efb5124691e0d13403acc00a85af51e3165828e892e90f059a7d7dc83f9bde43c6a7a1f471ae6eb8ec0155ee873adcc7afb537d5adbaccafcd7d849 diff --git a/games-emulation/snes9x/files/snes9x-1.63-flags.patch b/games-emulation/snes9x/files/snes9x-1.63-flags.patch new file mode 100644 index 000000000000..347e810aa231 --- /dev/null +++ b/games-emulation/snes9x/files/snes9x-1.63-flags.patch @@ -0,0 +1,28 @@ +Avoid forcing -O3 and let users set these as wanted. +--- a/libretro/Makefile ++++ b/libretro/Makefile +@@ -578,8 +578,8 @@ ifneq (,$(findstring msvc,$(platform))) + CFLAGS += -O2 -DNDEBUG + CXXFLAGS += -O2 -DNDEBUG + else +- CFLAGS += -O3 -DNDEBUG +- CXXFLAGS += -O3 -DNDEBUG ++ CFLAGS += -DNDEBUG ++ CXXFLAGS += -DNDEBUG + endif + + ifneq (,$(findstring msvc,$(platform))) +--- a/unix/configure.ac ++++ b/unix/configure.ac +@@ -64,11 +64,6 @@ AC_ARG_ENABLE([debug], + if test "x$enable_debug" = "xyes"; then + AC_S9X_COMPILER_FLAG([-g], [g]) + AC_S9X_COMPILER_FLAG([-O0], [o0]) +-else +- AC_S9X_COMPILER_FLAG([-O3], [o3], [ +- AC_S9X_COMPILER_FLAG([-O2], [o2], [ +- AC_S9X_COMPILER_FLAG([-O1], [o1])])]) +- AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer]) + fi + + AC_ARG_ENABLE([mtune], diff --git a/games-emulation/snes9x/files/snes9x-1.63-optional-wayland.patch b/games-emulation/snes9x/files/snes9x-1.63-optional-wayland.patch new file mode 100644 index 000000000000..99a76c47e868 --- /dev/null +++ b/games-emulation/snes9x/files/snes9x-1.63-optional-wayland.patch @@ -0,0 +1,21 @@ +USE_SLANG currently disregards whether USE_WAYLAND was used or not +and leads to trying to use wayland headers that may be missing. +--- a/gtk/CMakeLists.txt ++++ b/gtk/CMakeLists.txt +@@ -105,13 +105,15 @@ if(USE_SLANG) + list(APPEND INCLUDES "../external/glslang") + + list(APPEND DEFINES "VK_USE_PLATFORM_XLIB_KHR" +- "VK_USE_PLATFORM_WAYLAND_KHR" + "VULKAN_HPP_DISPATCH_LOADER_DYNAMIC=1" + "VULKAN_HPP_NO_NODISCARD_WARNINGS=1" + "VULKAN_HPP_NO_EXCEPTIONS=1" + "VMA_DYNAMIC_VULKAN_FUNCTIONS=1" + "VMA_STATIC_VULKAN_FUNCTIONS=0" + "IMGUI_IMPL_VULKAN_NO_PROTOTYPES") ++ if(USE_WAYLAND) ++ list(APPEND DEFINES "VK_USE_PLATFORM_WAYLAND_KHR") ++ endif() + list(APPEND INCLUDES ../external/vulkan-headers/include) + list(APPEND INCLUDES ../external/VulkanMemoryAllocator-Hpp/include) + list(APPEND INCLUDES ../external/stb) diff --git a/games-emulation/snes9x/files/snes9x-1.63-vulkan-fix.patch b/games-emulation/snes9x/files/snes9x-1.63-vulkan-fix.patch new file mode 100644 index 000000000000..9ddfbac1d938 --- /dev/null +++ b/games-emulation/snes9x/files/snes9x-1.63-vulkan-fix.patch @@ -0,0 +1,64 @@ +Backport of https://github.com/snes9xgit/snes9x/commit/5449e2d3c549c172f0e81397a9f2be19b800f902 +Fix Vulkan compilation errors. +--- a/vulkan/vulkan_context.cpp ++++ b/vulkan/vulkan_context.cpp +@@ -224,27 +224,33 @@ bool Context::init_device(int preferred_device) + }; + + auto device_list = instance->enumeratePhysicalDevices().value; +- physical_device = nullptr; ++ bool device_chosen = false; ++ physical_device = vk::PhysicalDevice(); + + if (preferred_device > -1 && + (size_t)preferred_device < device_list.size() && + check_extensions(required_extensions, device_list[preferred_device])) + { + physical_device = device_list[preferred_device]; ++ device_chosen = true; + } + +- if (physical_device == nullptr) ++ if (!device_chosen) + { + for (auto &device : device_list) + { + if (check_extensions(required_extensions, device)) + { + physical_device = device; ++ device_chosen = true; + break; + } + } + } + ++ if (!device_chosen) ++ return false; ++ + auto extension_properties = physical_device.enumerateDeviceExtensionProperties().value; + physical_device.getProperties(&physical_device_props); + +--- a/vulkan/vulkan_pipeline_image.cpp ++++ b/vulkan/vulkan_pipeline_image.cpp +@@ -1,3 +1,5 @@ ++#include <cassert> ++ + #include "vulkan_pipeline_image.hpp" + #include "slang_helpers.hpp" + +--- a/vulkan/vulkan_shader_chain.cpp ++++ b/vulkan/vulkan_shader_chain.cpp +@@ -1,3 +1,5 @@ ++#include <cassert> ++ + #include "vulkan_shader_chain.hpp" + #include "slang_helpers.hpp" + #include "stb_image.h" +--- a/vulkan/vulkan_texture.cpp ++++ b/vulkan/vulkan_texture.cpp +@@ -1,3 +1,5 @@ ++#include <cassert> ++ + #include "vulkan_texture.hpp" + #include "vulkan/vulkan_enums.hpp" + #include "slang_helpers.hpp" diff --git a/games-emulation/snes9x/snes9x-1.63.ebuild b/games-emulation/snes9x/snes9x-1.63.ebuild new file mode 100644 index 000000000000..c471c2e5994a --- /dev/null +++ b/games-emulation/snes9x/snes9x-1.63.ebuild @@ -0,0 +1,190 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..14} ) +inherit autotools cmake flag-o-matic python-any-r1 toolchain-funcs xdg + +# TODO: try unbundling, albeit compatibility with (and between) these +# tend to be volatile and it may not be the best idea "yet" +HASH_GLSLANG=9c7fd1a33e5cecbe465e1cd70170167d5e40d398 +HASH_SPIRV=bccaa94db814af33d8ef05c153e7c34d8bd4d685 +HASH_VULKAN=577baa05033cf1d9236b3d078ca4b3269ed87a2b + +DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator" +HOMEPAGE="https://github.com/snes9xgit/snes9x/"; +SRC_URI=" + https://github.com/snes9xgit/snes9x/archive/${PV}.tar.gz -> ${P}.tar.gz + gui? ( + https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz + -> glslang-${HASH_GLSLANG}.tar.gz + https://github.com/KhronosGroup/SPIRV-Cross/archive/${HASH_SPIRV}.tar.gz + -> spirv-cross-${HASH_SPIRV}.tar.gz + https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz + -> vulkan-headers-${HASH_VULKAN}.tar.gz + )" + +LICENSE=" + Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB + gui? ( Apache-2.0 CC0-1.0 BSD )" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="alsa debug gui libretro netplay oss portaudio pulseaudio wayland xinerama +xv" +RESTRICT="bindist" + +RDEPEND=" + media-libs/libpng:= + sys-libs/zlib:=[minizip] + x11-libs/libX11 + x11-libs/libXext + alsa? ( media-libs/alsa-lib ) + gui? ( + dev-cpp/cairomm:0 + dev-cpp/glibmm:2 + dev-cpp/gtkmm:3.0[wayland?] + dev-libs/glib:2 + dev-libs/libsigc++:2 + media-libs/libepoxy + media-libs/libsdl2[joystick] + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3[wayland?] + x11-libs/libXrandr + portaudio? ( media-libs/portaudio ) + pulseaudio? ( media-libs/libpulse ) + wayland? ( dev-libs/wayland ) + ) + libretro? ( !games-emulation/libretro-snes9x ) + xinerama? ( x11-libs/libXinerama ) + xv? ( x11-libs/libXv ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + virtual/pkgconfig + gui? ( ${PYTHON_DEPS} ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.63-flags.patch + "${FILESDIR}"/${PN}-1.63-optional-wayland.patch + "${FILESDIR}"/${PN}-1.63-vulkan-fix.patch +) + +pkg_setup() { + # used by bundled glslang + use gui && python-any-r1_pkg_setup +} + +src_prepare() { + if use gui; then + rmdir external/{glslang,SPIRV-Cross,vulkan-headers} || die + mv ../glslang-${HASH_GLSLANG} external/glslang || die + mv ../SPIRV-Cross-${HASH_SPIRV} external/SPIRV-Cross || die + mv ../Vulkan-Headers-${HASH_VULKAN} external/vulkan-headers || die + + CMAKE_USE_DIR="${S}/gtk" + cmake_src_prepare + + # https://bugs.gentoo.org/958599 + PATCHES= CMAKE_USE_DIR="${S}/external/SPIRV-Cross" cmake_src_prepare + else + default + fi + + pushd unix >/dev/null || die + eautoreconf + popd >/dev/null || die + + rm -r unzip || die +} + +src_configure() { + tc-export CC CXX # for libretro + + local econfargs=( + $(use_enable alsa sound-alsa) + $(use_enable debug debugger) + $(use_enable netplay) + $(use_enable xinerama) + $(use_enable xv xvideo) + --enable-gamepad + --enable-gzip + --enable-screenshot + --enable-zip + --disable-libyuv # unpackaged + --with-system-zip + ) + + pushd unix >/dev/null || die + econf "${econfargs[@]}" + popd >/dev/null || die + + if use gui; then + # bundled SPIRV-Cross fails with -Werror=odr + filter-lto + + local mycmakeargs=( + -DBUILD_SHARED_LIBS=no + -DDEBUGGER=$(usex debug) + -DUSE_ALSA=$(usex alsa) + -DUSE_OSS=$(usex oss) + -DUSE_PORTAUDIO=$(usex portaudio) + -DUSE_PULSEAUDIO=$(usex pulseaudio) + -DUSE_SYSTEMZIP=yes + -DUSE_WAYLAND=$(usex wayland) + -DUSE_XV=$(usex xv) + + # this controls both vulkan output and shader support, could be + # behind a USE but it currently fails to build if disabled and + # adds no dependencies given they are bundled (for now) + -DUSE_SLANG=yes + + # gets used for LOCALE/DATADIR too early (installs to /usr//locale) + -DCMAKE_INSTALL_DATAROOTDIR=share + ) + + cmake_src_configure + fi +} + +src_compile() { + if use libretro; then + emake -C libretro LTO= + # rebuild objects given libretro uses different defines (bug #791475) + rm *.o || die + fi + + emake -C unix + + use gui && cmake_src_compile +} + +src_test() { + # currently no tests, but don't run the cmake phase while unconfigured + use gui && cmake_src_test +} + +src_install() { + if use libretro; then + exeinto /usr/$(get_libdir)/libretro + doexe libretro/snes9x_libretro.so + fi + + dobin unix/snes9x + + local DOCS=( + README.md + docs/{changes,control-inputs,controls,snapshots}.txt + unix/snes9x.conf.default + ) + einstalldocs + + if use gui; then + DOCS=( AUTHORS ) + cmake_src_install + fi +}
