From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 29EC715827B for ; Mon, 18 Aug 2025 12:50:31 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 8D1FE341A90 for ; Mon, 18 Aug 2025 12:50:25 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id C2C46110280; Mon, 18 Aug 2025 12:50:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id B6414110280 for ; Mon, 18 Aug 2025 12:50:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 69A41341A11 for ; Mon, 18 Aug 2025 12:50:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D3DAF336B for ; Mon, 18 Aug 2025 12:50:21 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1755521391.4a9aa01cabf5d5422d972ed0f7f9dcba6a6d3eac.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/snes9x/, games-emulation/snes9x/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/snes9x/files/snes9x-1.63-cmake4.patch games-emulation/snes9x/files/snes9x-1.63-compile.patch games-emulation/snes9x/files/snes9x-1.63-cstdint.patch games-emulation/snes9x/files/snes9x-1.63-flags.patch games-emulation/snes9x/snes9x-1.63.ebuild X-VCS-Directories: games-emulation/snes9x/files/ games-emulation/snes9x/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 4a9aa01cabf5d5422d972ed0f7f9dcba6a6d3eac X-VCS-Branch: master Date: Mon, 18 Aug 2025 12:50:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bdb7b6f1-5c51-4afc-bcc3-4e39ffd4207a X-Archives-Hash: 302080918e970f574480d0422b7b02ae commit: 4a9aa01cabf5d5422d972ed0f7f9dcba6a6d3eac Author: Ionen Wolkens gentoo org> AuthorDate: Mon Aug 18 12:15:22 2025 +0000 Commit: Ionen Wolkens gentoo 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 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 - #include - #include -+#include - #include - #include - -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 ++#include + #include 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