5 files changed, 254 insertions, 0 deletions
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index f6f754f0e5b2..98f4637acd64 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,8 +1,16 @@
 AUX snes9x-1.53-cross-compile.patch 892 BLAKE2B 9fb806ad16d48d5f07f1ab84feb5f7eafa52a1157eb25675650f08c8fbab8a42318d3277efbdd45f03250df2e9187c76df43312f7ffb2f226423e757b5f6e91c SHA512 4867b9a3e3f2a65684157b26e4b0b63971d37ad5abb16125567e89bc4116482488416ca51d30f639ef63886b05431c56b75978fe073a4755c48988f5ea9eaee5
 AUX snes9x-1.59-build-system.patch 1303 BLAKE2B 48a349bc5d56fcf154faab76cf76fcbb98808ce7933ff5e6da2cbf2b22d62819367e2ac1224f66735108de44419375d6f6eb2c2a4a104a4d492148866b6e829e SHA512 abbd0bfea5ad23f652e8249adbdf1118a4efa2ed43301b1786bbd91a253e98fb7ff99f68ff62c128972fe0af47aee9fa48fa9e3218b0a33c9e68f468fbe2b9e8
 AUX snes9x-1.61-libretro-flags.patch 693 BLAKE2B 4f027c9278f866476ba0d2f0884fe105da31e40e7362dfece81d0cddaf74e411f8e6b1a59e4fbb41389a2829695e39ce29c5de29ae055f744feb9320fc9ef255 SHA512 b0851e9da76e9a05f1893014564e8833c72cf7025c4c9f9f44665374f1f69e44fd5400125459bca1656c7920e033b11e33e0a1a3fb0af8a25c1bd0b3db6870da
+AUX snes9x-1.62.1-flags.patch 606 BLAKE2B 5a315f88bf25c48ca0510535a0ccb0dd04052c8dac5fdd108799877d75c9232f1f0d1c9fbaf310f224a63fc7511d836398c369e4aeb4fc33e3148149970d3e51 SHA512 e67f102f2f0f93962a159bb15a5e51524dff829a538f53e58ea4b631ae849b2ad9ca8b7b7143a34265d0ceb6d60c07416e2a9afbcce74257a554629b65e7908b
+AUX snes9x-1.62.1-gcc13.patch 600 BLAKE2B bcbcea61810146bd23d3f1d5f556b654e1f98d215ac56a4ab71f757b01d7761023516bc4afcce5e89c0372168d95565f1d9834e0fb862e09f9b264c000534f01 SHA512 80fba03debf1a30ed5d2654cd759443f2e89d779d5f1771eaa85e4b6fe4ac5370e2c2cb33d2c6df297c257778bc2f8e75e91508873052241414b2858ac2bc69b
+AUX snes9x-1.62.1-optional-wayland.patch 718 BLAKE2B 5c2bbd791f9e910416f3debe693275c2945a572506156e7309ed960397f0a289361caaf2034e78b727b445a49193dc3c1faf6bf0285f1d95315bf5cea712f101 SHA512 6ff22754f7f36d49ad56d219be07c4359aae27c0cc216acb12efc7c525dd87ca32c92e1a2cf8d65d7acd2941fd10605dc790b53d7274b5b11f51bb6d94bde905
+DIST glslang-6d41bb9c557c5a0eec61ffba1f775dc5f717a8f7.tar.gz 3694607 BLAKE2B c6ba30fc561c6053c3f685f2b7529053f56e0869e4c05013a1c59f39b4c97847c3e50c30859dce6f0c17c9f9bf21b96ebc04b510bcdc33f4ced87d892a36f94c SHA512 49efe8841bbe2d603d5dd03bdb273bb991ee6ea509081048c01b7c4de6d4cad42f223755e1cb391c426993fba72ed3878e28bcce8dd7f6eeb5adf873705b7d62
 DIST snes9x-1.61-glslang.tar.gz 3188787 BLAKE2B 36ed327fbb2aec3657fe300b98f2e45cfe039596a64bca3076ecb079f7c33aa14ac09a96e5a174ad51faf0c4d585d82aaadec3d8209cf8d3ca55d70e316b1642 SHA512 de2ebc0cd89d22582c079006ac45a812e3aaaad9a44c77c68530aa1468fbc840c6ae25a4356d4e9fc697524cd721d26506d85bc35eac98452eabce0bc098b5a4
 DIST snes9x-1.61-spirv.tar.gz 676662 BLAKE2B ab18406c99e4e04c6c497b5f447dcaccb7d5a60f42bf1cea31afee04ee664e74916b32736c1aea1e7106494154e48e5cbe9b5d6a0652667c4d0e2020814cd9bd SHA512 bfa3cc944450db59a57a685eea12b0ed0b5059d55a092ac5cdf6f4dc03c1e2d2e62fa5a576156c772340e12136b10d7ed790bb35b4aece2ee8405e64f826e31b
 DIST snes9x-1.61.tar.gz 3016890 BLAKE2B 3e94dee5172bf48d2461a3a1403fc7e7fc8069df6dddf5b5e1da59ee140297bd0b7cee6948b5eb154c1eec38aebe3ab29a9fae3dfb4abdce41769d2ace43dee1 SHA512 8b644f5b7136e89fd222bcb430fc736c74a3e383d7e6c7f0880235f6fa4c0f77abbf02493f8d654a12e87701111643e33877bc21bb3dfcc9b82a056fa1b1d880
+DIST snes9x-1.62.2.tar.gz 3423557 BLAKE2B 8db25f47dd58816eab2bdaf56fc9f83636b8677d9dd37f97fcedd5ef8af12428f1cdd3c4b017569c4930e2616d60c9387e09c0fbe4427860ed1517e1de447458 SHA512 575ce2f46130dcec1eb0168008e64b9f664a694c60b12c4d5d416bde122e2861ca9d10a7597246cbeafe27c4122f24dc82612d585e7f2164fce8b9670100591e
+DIST spirv-cross-4e2fdb25671c742a9fbe93a6034eb1542244c7e1.tar.gz 1714902 BLAKE2B ae2b9816755679552c21b7f4446cda5b0626ba56143767445014b011234183afe55b4abbdf2a5849cad3d9e17871362bbac4da6b7969b578f564a8cbb3f3b269 SHA512 ec47b1d966006c6e654e84e7fa16124c774de3ca6fd508d3cfe0568e3df79eee3f5aeedfae1d744b99e162beeee23afe498249b2291091bc14c0357db304bebe
+DIST vulkan-headers-a3dd2655a3a68c2a67c55a0f8b77dcb8b166ada2.tar.gz 1832285 BLAKE2B 9278a17ede62f1a839ed230d2eefe3eb7ed46d3e25d4a44504f8d247c7b1c83d38166bec143f3b8e068d5c112585299d90ec16e9c41be6096c61f2eb5e127287 SHA512 b35541413efb5124691e0d13403acc00a85af51e3165828e892e90f059a7d7dc83f9bde43c6a7a1f471ae6eb8ec0155ee873adcc7afb537d5adbaccafcd7d849
 EBUILD snes9x-1.61.ebuild 3519 BLAKE2B aed7717315000d6ca7fbb25336b859b54a45a9af51ce7a5948dd28251ee98f6ea540d3390b75e2bed6e180fa80334e3fef757f37d61054252fc1cacabfb48bbb SHA512 eba8d739a0a7c2ad84714a0b5bc6f596fe676789d4d1447ceaf8121316a6b96b09a46f748f8b0a051c454479cce524f751615bf1776bcd4daf28168abb86a07f
+EBUILD snes9x-1.62.2.ebuild 4477 BLAKE2B ae2112b4fec31fea02b2ec16ce25a5c2640177491eaf8d874533e12eff936eac81b15f81fb09c9bfefe8cefc4868c3793f2113f211f1e65425360e059d27628d SHA512 d75067757b3085a39bd854faf63690eb10ddcb624c27d34f896be2b91c50e23515cdb7cc6f44b52bb13ba935f65296ab76fe29f26acea2b3875e2876c0120a9a
 MISC metadata.xml 608 BLAKE2B 9e770ccbcf8a5c12fccf33febd962f5f64f3378d9eabacaea208c28bed78fd909004a822e221bb6155bef1e2fd8908544075e57d3f48232fff2fb7c2c93cb7e4 SHA512 21718e0e03cad23eabd7e360ba347e77fef1e4af97945e3436b6d494cf5c1f8c7336d5987eda79c4b8359057ebe3d56fc41c0de66d227183470a19c34e393ff9
diff --git a/games-emulation/snes9x/files/snes9x-1.62.1-flags.patch b/games-emulation/snes9x/files/snes9x-1.62.1-flags.patch
new file mode 100644
index 000000000000..7b3b4dad399b
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.62.1-flags.patch
@@ -0,0 +1,24 @@
+Avoid forcing -O3 and let users set these as wanted.
+--- a/libretro/Makefile
++++ b/libretro/Makefile
+@@ -579,6 +579,6 @@
+    CXXFLAGS += -O2 -DNDEBUG
+ else
+-   CFLAGS += -O3 -DNDEBUG
+-   CXXFLAGS += -O3 -DNDEBUG
++   CFLAGS += -DNDEBUG
++   CXXFLAGS += -DNDEBUG
+ endif
+ 
+--- a/unix/configure.ac
++++ b/unix/configure.ac
+@@ -65,9 +65,4 @@
+ 	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
+ 
diff --git a/games-emulation/snes9x/files/snes9x-1.62.1-gcc13.patch b/games-emulation/snes9x/files/snes9x-1.62.1-gcc13.patch
new file mode 100644
index 000000000000..28945fd782fc
--- /dev/null
+++ b/games-emulation/snes9x/files/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/games-emulation/snes9x/files/snes9x-1.62.1-optional-wayland.patch b/games-emulation/snes9x/files/snes9x-1.62.1-optional-wayland.patch
new file mode 100644
index 000000000000..396f76a9d641
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.62.1-optional-wayland.patch
@@ -0,0 +1,16 @@
+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
+@@ -99,8 +99,10 @@
+ 
+     list(APPEND DEFINES "VK_USE_PLATFORM_XLIB_KHR"
+-                        "VK_USE_PLATFORM_WAYLAND_KHR"
+                         "VULKAN_HPP_DISPATCH_LOADER_DYNAMIC=1"
+                         "VMA_DYNAMIC_VULKAN_FUNCTIONS=1"
+                         "VMA_STATIC_VULKAN_FUNCTIONS=0")
++    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)
diff --git a/games-emulation/snes9x/snes9x-1.62.2.ebuild b/games-emulation/snes9x/snes9x-1.62.2.ebuild
new file mode 100644
index 000000000000..53678735c21a
--- /dev/null
+++ b/games-emulation/snes9x/snes9x-1.62.2.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+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=6d41bb9c557c5a0eec61ffba1f775dc5f717a8f7
+HASH_SPIRV=4e2fdb25671c742a9fbe93a6034eb1542244c7e1
+HASH_VULKAN=a3dd2655a3a68c2a67c55a0f8b77dcb8b166ada2
+
+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.62.1-flags.patch
+	"${FILESDIR}"/${PN}-1.62.1-gcc13.patch
+	"${FILESDIR}"/${PN}-1.62.1-optional-wayland.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
+	fi
+
+	if use gui; then
+		CMAKE_USE_DIR=${S}/gtk
+		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
+}