[gentoo-commits] repo/gentoo:master commit in: games-emulation/snes9x/, games-emulation/snes9x/files/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     4a9aa01cabf5d5422d972ed0f7f9dcba6a6d3eac
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 18 12:15:22 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Aug 18 12:49:51 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a9aa01c

games-emulation/snes9x: fixup ebuild

* Don't apply the cstdint patch if USE=-gui given the files are missing
* CFLAGS += bit is not needed given @S9XFLGS@ includes our flags
* Not sure where the cmake 4.0 minimum came from, drop it
* Use original flags.patch, it's identical to previous version
* Drop 2nd cmake_src_prepare and backport the fix properly instead

Hopefully not overlooked anything else from the recent changes.

Closes: https://bugs.gentoo.org/958599
Closes: https://bugs.gentoo.org/961564
Closes: https://bugs.gentoo.org/961706
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../snes9x/files/snes9x-1.63-cmake4.patch          |  7 +++++
 .../snes9x/files/snes9x-1.63-compile.patch         | 35 ----------------------
 .../snes9x/files/snes9x-1.63-cstdint.patch         |  7 +++++
 .../snes9x/files/snes9x-1.63-flags.patch           | 28 -----------------
 games-emulation/snes9x/snes9x-1.63.ebuild          | 22 +++++++-------
 5 files changed, 26 insertions(+), 73 deletions(-)

diff --git a/games-emulation/snes9x/files/snes9x-1.63-cmake4.patch b/games-emulation/snes9x/files/snes9x-1.63-cmake4.patch
new file mode 100644
index 000000000000..7739341b8fd8
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.63-cmake4.patch
@@ -0,0 +1,7 @@
+https://bugs.gentoo.org/958599
+https://github.com/KhronosGroup/SPIRV-Cross/commit/82331a2ca9
+--- a/external/SPIRV-Cross/CMakeLists.txt
++++ b/external/SPIRV-Cross/CMakeLists.txt
+@@ -22 +22 @@
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.10)

diff --git a/games-emulation/snes9x/files/snes9x-1.63-compile.patch b/games-emulation/snes9x/files/snes9x-1.63-compile.patch
deleted file mode 100644
index 23efcbf2ea8a..000000000000
--- a/games-emulation/snes9x/files/snes9x-1.63-compile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/external/glslang/SPIRV/SpvBuilder.h b/external/glslang/SPIRV/SpvBuilder.h
-index 02e9cf40..f5d9c2c6 100644
---- a/external/glslang/SPIRV/SpvBuilder.h
-+++ b/external/glslang/SPIRV/SpvBuilder.h
-@@ -61,6 +61,7 @@ namespace spv {
- #include <set>
- #include <sstream>
- #include <stack>
-+#include <cstdint>
- #include <unordered_map>
- #include <map>
-
-diff --git a/unix/Makefile.in b/unix/Makefile.in
-index a87cd079..7c78a0a5 100644
---- a/unix/Makefile.in
-+++ b/unix/Makefile.in
-@@ -37,7 +37,7 @@ GASM       = @CXX@
- INCLUDES   += -I. -I.. -I../apu/ -I../apu/bapu -I../jma/ -I../filter/
-
- CCFLAGS    = @S9XFLGS@ @S9XDEFS@ $(DEFS)
--CFLAGS     = $(CCFLAGS)
-+CFLAGS     += $(CCFLAGS)
-
- .SUFFIXES: .o .cpp .c .cc .h .m .i .s .obj
- 
-diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt
-index 6d13d493..ef56eea2 100644
---- a/gtk/CMakeLists.txt
-+++ b/gtk/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.18)
-+cmake_minimum_required(VERSION 4.0)
- project(snes9x-gtk VERSION 1.63)
-
- option(USE_SLANG "Build support for Vulkan output and .slangp shaders" ON)

diff --git a/games-emulation/snes9x/files/snes9x-1.63-cstdint.patch b/games-emulation/snes9x/files/snes9x-1.63-cstdint.patch
new file mode 100644
index 000000000000..f052eb6df1f2
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.63-cstdint.patch
@@ -0,0 +1,7 @@
+https://github.com/KhronosGroup/glslang/commit/e40c14a3e007
+--- a/external/glslang/SPIRV/SpvBuilder.h
++++ b/external/glslang/SPIRV/SpvBuilder.h
+@@ -58,2 +58,3 @@
+ #include <algorithm>
++#include <cstdint>
+ #include <map>

diff --git a/games-emulation/snes9x/files/snes9x-1.63-flags.patch b/games-emulation/snes9x/files/snes9x-1.63-flags.patch
deleted file mode 100644
index 347e810aa231..000000000000
--- a/games-emulation/snes9x/files/snes9x-1.63-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/snes9x-1.63.ebuild b/games-emulation/snes9x/snes9x-1.63.ebuild
index f2585b46c09e..dfb2a67da159 100644
--- a/games-emulation/snes9x/snes9x-1.63.ebuild
+++ b/games-emulation/snes9x/snes9x-1.63.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..14} )
+PYTHON_COMPAT=( python3_{11..14} )
 inherit autotools cmake flag-o-matic python-any-r1 toolchain-funcs xdg
 
 # TODO: try unbundling, albeit compatibility with (and between) these
@@ -23,11 +23,13 @@ SRC_URI="
 			-> 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 )"
+	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"
@@ -69,10 +71,9 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.63-flags.patch
+	"${FILESDIR}"/${PN}-1.62.1-flags.patch
 	"${FILESDIR}"/${PN}-1.63-optional-wayland.patch
-	"${FILESDIR}"/${PN}-1.63-vulkan-fix.patch
-	"${FILESDIR}"/${PN}-1.63-compile.patch
+	"${FILESDIR}"/${P}-vulkan-fix.patch
 )
 
 pkg_setup() {
@@ -87,11 +88,12 @@ src_prepare() {
 		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
+		# these modify the above, so need to be done here (both upstreamed)
+		eapply "${FILESDIR}"/${P}-cstdint.patch
+		eapply "${FILESDIR}"/${P}-cmake4.patch
 
-		# https://bugs.gentoo.org/958599
-		PATCHES= CMAKE_USE_DIR="${S}/external/SPIRV-Cross" cmake_src_prepare
+		CMAKE_USE_DIR=${S}/gtk
+		cmake_src_prepare
 	else
 		default
 	fi