commit: 4ef984d3161709689705389eaffb1e198cc516d3
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 14 21:01:51 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 21:19:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ef984d3
games-emulation/snes9x: drop 1.61
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/snes9x/Manifest | 3 -
.../snes9x/files/snes9x-1.53-cross-compile.patch | 38 -----
.../snes9x/files/snes9x-1.59-build-system.patch | 40 ------
.../snes9x/files/snes9x-1.61-libretro-flags.patch | 25 ----
games-emulation/snes9x/metadata.xml | 1 -
games-emulation/snes9x/snes9x-1.61.ebuild | 153 ---------------------
6 files changed, 260 deletions(-)
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 87bd2f99144e..44814a48aea1 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,7 +1,4 @@
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.3.tar.gz 3423799 BLAKE2B
0eaea11d4f0fa03b01d7ae86a559ad76df31d6e5a485ee09f75ec81824296a2f3182da6180dd60eb4bb9722cd3d8ce6ac3e0c1ae7c7740f2828fde1231c19a2a
SHA512
005222bc054fbdfef92acc3ce5ad1f4b18eaff4382ab352d61e5c9c3fbe952ca085e964535e628730976f795c568e9e8751e6ef997f864c719c421d67d9e04db
DIST spirv-cross-4e2fdb25671c742a9fbe93a6034eb1542244c7e1.tar.gz 1714902
BLAKE2B
ae2b9816755679552c21b7f4446cda5b0626ba56143767445014b011234183afe55b4abbdf2a5849cad3d9e17871362bbac4da6b7969b578f564a8cbb3f3b269
SHA512
ec47b1d966006c6e654e84e7fa16124c774de3ca6fd508d3cfe0568e3df79eee3f5aeedfae1d744b99e162beeee23afe498249b2291091bc14c0357db304bebe
DIST vulkan-headers-a3dd2655a3a68c2a67c55a0f8b77dcb8b166ada2.tar.gz 1832285
BLAKE2B
9278a17ede62f1a839ed230d2eefe3eb7ed46d3e25d4a44504f8d247c7b1c83d38166bec143f3b8e068d5c112585299d90ec16e9c41be6096c61f2eb5e127287
SHA512
b35541413efb5124691e0d13403acc00a85af51e3165828e892e90f059a7d7dc83f9bde43c6a7a1f471ae6eb8ec0155ee873adcc7afb537d5adbaccafcd7d849
diff --git a/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch
b/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch
deleted file mode 100644
index 7a0fe8a8bde8..000000000000
--- a/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/unix/configure.ac
-+++ b/unix/configure.ac
-@@ -4,7 +4,7 @@ AC_REVISION([$Revision: 1.1 $])
-
- AC_CONFIG_SRCDIR([unix.cpp])
-
--AC_CANONICAL_TARGET
-+AC_CANONICAL_HOST
-
- AC_PROG_CC
- AC_PROG_CXX
-@@ -38,7 +38,7 @@ AC_DEFUN([AC_S9X_COMPILER_FLAG],
- return (argc);
- }
- ],
-- [snes9x_cv_option_$2="yes"], [snes9x_cv_option_$2="no"])
-+ [snes9x_cv_option_$2="yes"], [snes9x_cv_option_$2="no"],
[snes9x_cv_option_$2="yes"])
- ])
-
- CXXFLAGS="[$]OLD_CXXFLAGS"
-@@ -94,7 +94,7 @@ AC_MSG_CHECKING([whether the OS is Linux])
-
- AC_CACHE_VAL([snes9x_cv_linux_os],
- [
-- case "$target" in
-+ case "$host" in
- *-*-linux*)
- snes9x_cv_linux_os="yes"
- ;;
-@@ -332,7 +332,7 @@ AC_DEFUN([AC_S9X_CHECK_SAR],
- return (i < 0 ? 0 : 1);
- }
- ],
-- [snes9x_sar_$1="yes"], [snes9x_sar_$1="no"])
-+ [snes9x_sar_$1="yes"], [snes9x_sar_$1="no"], [snes9x_sar_$1=$GCC])
-
- CXXFLAGS="[$]OLD_CXXFLAGS"
-
diff --git a/games-emulation/snes9x/files/snes9x-1.59-build-system.patch
b/games-emulation/snes9x/files/snes9x-1.59-build-system.patch
deleted file mode 100644
index 2d8f9f05e59f..000000000000
--- a/games-emulation/snes9x/files/snes9x-1.59-build-system.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- snes9x-1.59/unix/configure.ac
-+++ snes9x-1.59/unix/configure.ac
-@@ -56,37 +56,6 @@
- # *** Execution begins here ***
- # *****************************
-
--# Test what compiler flags we should use.
--
--AC_ARG_ENABLE([debug],
-- [AS_HELP_STRING([--enable-debug],
-- [leave debug information in the final binary (default: no)])],
-- [], [enable_debug="no"])
--
--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],
-- [AS_HELP_STRING([--enable-mtune],
-- [use the specified value for the -mtune/-mcpu flag (default:
no)])],
-- [], [enable_mtune="no"])
--
--if test "x$enable_mtune" != "xno"; then
-- AC_S9X_COMPILER_FLAG([-mtune="$enable_mtune"], [mtune],
-- [
-- AC_MSG_WARN([-mtune failed, trying -mcpu...])
-- AC_S9X_COMPILER_FLAG([-mcpu="$enable_mtune"], [mcpu],
-- [AC_MSG_ERROR([Please specify a working value for
--enable-mtune.])])
-- ])
--fi
--
- AC_S9X_COMPILER_FLAG([-fno-exceptions], [no_exceptions])
- AC_S9X_COMPILER_FLAG([-fno-rtti], [no_rtti])
- AC_S9X_COMPILER_FLAG([-pedantic], [pedantic])
diff --git a/games-emulation/snes9x/files/snes9x-1.61-libretro-flags.patch
b/games-emulation/snes9x/files/snes9x-1.61-libretro-flags.patch
deleted file mode 100644
index 297c7d78257d..000000000000
--- a/games-emulation/snes9x/files/snes9x-1.61-libretro-flags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-CXXFLAGS is used as a "common" flags variable and passed to CFLAGS,
-but want to use user's CFLAGS for CC rather than CXXFLAGS. Workaround
-with a temporary variable and also drop -O3/lto from defaults.
---- a/libretro/Makefile
-+++ b/libretro/Makefile
-@@ -4,3 +4,5 @@
-
--LTO ?= -flto
-+LTO :=
-+ORIG_CXXFLAGS := $(CXXFLAGS)
-+CXXFLAGS :=
- SPACE :=
-@@ -580,4 +582,4 @@
- else
-- CFLAGS += -O3 -DNDEBUG
-- CXXFLAGS += -O3 -DNDEBUG
-+ CFLAGS += -DNDEBUG
-+ CXXFLAGS += -DNDEBUG
- endif
-@@ -612,3 +614,4 @@
- CXXFLAGS += -DRIGHTSHIFT_IS_SAR -D__LIBRETRO__ -DALLOW_CPU_OVERCLOCK
--CFLAGS := $(CXXFLAGS)
-+CFLAGS := $(CXXFLAGS) $(CFLAGS)
-+CXXFLAGS += $(ORIG_CXXFLAGS)
- CFLAGS += -DHAVE_STDINT_H
diff --git a/games-emulation/snes9x/metadata.xml
b/games-emulation/snes9x/metadata.xml
index 8f63c2fe45fa..32c1701b6637 100644
--- a/games-emulation/snes9x/metadata.xml
+++ b/games-emulation/snes9x/metadata.xml
@@ -6,7 +6,6 @@
<name>Gentoo Games Project</name>
</maintainer>
<use>
- <flag name="glslang">Build support for slang-type shaders</flag>
<flag name="libretro">Build libretro port</flag>
<flag name="netplay">Enable playing ROMs over the network (not
recommended)</flag>
</use>
diff --git a/games-emulation/snes9x/snes9x-1.61.ebuild
b/games-emulation/snes9x/snes9x-1.61.ebuild
deleted file mode 100644
index 7300fb65bb2a..000000000000
--- a/games-emulation/snes9x/snes9x-1.61.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools meson toolchain-funcs xdg
-
-GLSLANG_COMMIT="bcf6a2430e99e8fc24f9f266e99316905e6d5134"
-SPIRV_COMMIT="1458bae62ec67ea7d12c5a13b740e23ed4bb226c"
-
-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? ( glslang? (
-
https://github.com/KhronosGroup/glslang/archive/${GLSLANG_COMMIT}.tar.gz ->
${P}-glslang.tar.gz
-
https://github.com/KhronosGroup/SPIRV-Cross/archive/${SPIRV_COMMIT}.tar.gz ->
${P}-spirv.tar.gz
- ) )"
-
-LICENSE="
- Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB
- gui? ( glslang? ( Apache-2.0 BSD ) )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="alsa debug glslang gui libretro netplay opengl oss png portaudio
pulseaudio wayland xinerama +xv"
-REQUIRED_USE="glslang? ( gui opengl )"
-RESTRICT="bindist test" # has no tests but can lead to bug #737044
-
-RDEPEND="
- 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/libsdl2[joystick]
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3[wayland?]
- x11-libs/libXrandr
- x11-misc/xdg-utils
- opengl? ( media-libs/libepoxy )
- portaudio? ( media-libs/portaudio )
- pulseaudio? ( media-sound/pulseaudio )
- wayland? ( dev-libs/wayland )
- )
- libretro? ( !games-emulation/libretro-snes9x )
- png? ( media-libs/libpng:= )
- xinerama? ( x11-libs/libXinerama )
- xv? ( x11-libs/libXv )"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
- opengl? ( media-libs/libglvnd )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.53-cross-compile.patch
- "${FILESDIR}"/${PN}-1.59-build-system.patch
- "${FILESDIR}"/${PN}-1.61-libretro-flags.patch
-)
-
-src_prepare() {
- if use gui && use glslang; then
- rmdir shaders/{glslang,SPIRV-Cross} || die
- mv ../glslang-${GLSLANG_COMMIT} shaders/glslang || die
- mv ../SPIRV-Cross-${SPIRV_COMMIT} shaders/SPIRV-Cross || die
- fi
-
- default
-
- rm -r unzip || die
-
- cd unix || die
- eautoreconf
-}
-
-src_configure() {
- tc-export CC CXX # for libretro
-
- local econfargs=(
- $(use_enable alsa sound-alsa)
- $(use_enable debug debugger)
- $(use_enable netplay)
- $(use_enable png screenshot)
- $(use_enable xinerama)
- $(use_enable xv xvideo)
- --enable-gamepad
- --enable-gzip
- --enable-zip
- --with-system-zip
- )
-
- cd unix || die
- econf "${econfargs[@]}"
-
- if use gui; then
- local emesonargs=(
- $(meson_use alsa)
- $(meson_use debug debugger)
- $(meson_use glslang slang) # TODO?: unbundle
- $(meson_use opengl)
- $(meson_use oss)
- $(meson_use png screenshot)
- $(meson_use portaudio)
- $(meson_use pulseaudio)
- $(meson_use wayland)
- $(meson_use xv)
- -Dsystem-zip=true
- -Dzlib=true
- )
-
- EMESON_SOURCE=${S}/gtk
- meson_src_configure
- fi
-}
-
-src_compile() {
- if use libretro; then
- emake -C libretro
- # rebuild objects given libretro uses different defines (bug
#791475)
- rm *.o || die
- fi
-
- emake -C unix
-
- use gui && meson_src_compile
-}
-
-src_install() {
- if use libretro; then
- exeinto /usr/$(get_libdir)/libretro
- doexe libretro/snes9x_libretro.so
- fi
-
- dobin unix/${PN}
-
- local DOCS=(
- README.md
- docs/{changes,control-inputs,controls,snapshots}.txt
- unix/snes9x.conf.default
- )
- einstalldocs
-
- if use gui; then
- meson_src_install
- dodoc gtk/AUTHORS
- fi
-}
