commit: 8cbbf1e4a6225bc442f94b3183de9ffddf68d00e
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 11:03:22 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 11:42:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cbbf1e4
games-emulation/snes9x: drop 1.60
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
games-emulation/snes9x/Manifest | 1 -
.../snes9x/files/snes9x-1.60-gcc11.patch | 47 -------
games-emulation/snes9x/snes9x-1.60.ebuild | 139 ---------------------
3 files changed, 187 deletions(-)
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 67367eddc376..85d1edc3c9f2 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,4 +1,3 @@
-DIST snes9x-1.60.tar.gz 2863228 BLAKE2B
0ac3bdd2403221f1013e2b5438aacc4e7d361e943ac7edc56f8ef22827d81484e0b162b84f739ce0f68fe58021124275fd908ccdde99e1e1d6d6c9c0a6e3d17b
SHA512
840b006a8fbd479fd5ceb2d94af4ef6470c5e27a3e6c8ddb0dffc8d3e51f465669144cd428bfce28b2ed4f68e70d8f252f2d8a2cae602ba797791d7e483c14c9
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
diff --git a/games-emulation/snes9x/files/snes9x-1.60-gcc11.patch
b/games-emulation/snes9x/files/snes9x-1.60-gcc11.patch
deleted file mode 100644
index 453771f5139c..000000000000
--- a/games-emulation/snes9x/files/snes9x-1.60-gcc11.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 7f6d9d6432d912cd90763c64f7c92270b3e6c182 Mon Sep 17 00:00:00 2001
-From: gocha <gocha...@gmail.com>
-Date: Sun, 19 Jan 2020 12:48:06 +0900
-Subject: [PATCH] win32: fix compilation error in vs2019
-
----
- conffile.cpp | 2 +-
- conffile.h | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/conffile.cpp b/conffile.cpp
-index 817afae7f..fa7de3fa2 100644
---- a/conffile.cpp
-+++ b/conffile.cpp
-@@ -452,7 +452,7 @@ void ConfigFile::ClearLines()
- }
- }
-
--bool ConfigFile::ConfigEntry::section_then_key_less::operator()(const
ConfigEntry &a, const ConfigEntry &b) {
-+bool ConfigFile::ConfigEntry::section_then_key_less::operator()(const
ConfigEntry &a, const ConfigEntry &b) const{
- if(curConfigFile && a.section!=b.section){
- const int sva = curConfigFile->GetSectionSize(a.section);
- const int svb = curConfigFile->GetSectionSize(b.section);
-diff --git a/conffile.h b/conffile.h
-index ba69812df..d92128cba 100644
---- a/conffile.h
-+++ b/conffile.h
-@@ -90,7 +90,7 @@ class ConfigFile {
- mutable bool used;
-
- struct section_then_key_less {
-- bool operator()(const ConfigEntry &a, const ConfigEntry &b);
-+ bool operator()(const ConfigEntry &a, const ConfigEntry &b) const;
- };
-
- struct key_less {
-@@ -101,8 +101,8 @@ class ConfigFile {
- };
-
- struct line_less {
-- bool operator()(const ConfigEntry &a, const ConfigEntry &b){
-- if(a.line==b.line) return (b.val.empty() &&
!a.val.empty()) || a.key<b.key;
-+ bool operator()(const ConfigEntry &a, const ConfigEntry &b) const{
-+ if(a.line==b.line) return (b.val.empty() && !a.val.empty())
|| a.key<b.key;
- if(b.line<0) return true;
- if(a.line<0) return false;
- return a.line<b.line;
diff --git a/games-emulation/snes9x/snes9x-1.60.ebuild
b/games-emulation/snes9x/snes9x-1.60.ebuild
deleted file mode 100644
index b44ac4ece5bf..000000000000
--- a/games-emulation/snes9x/snes9x-1.60.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic meson xdg
-
-DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
-HOMEPAGE="https://github.com/snes9xgit/snes9x";
-SRC_URI="https://github.com/snes9xgit/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB Info-ZIP"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="alsa debug gtk libretro multilib netplay opengl oss png pulseaudio
portaudio wayland xinerama +xv"
-RESTRICT="bindist"
-
-RDEPEND="
- gtk? (
- dev-libs/glib:2
- media-libs/libsdl2[joystick]
- >=x11-libs/gtk+-3.22:3[wayland?]
- x11-libs/libXrandr
- x11-misc/xdg-utils
- alsa? ( media-libs/alsa-lib )
- opengl? (
- media-libs/libepoxy
- virtual/opengl
- )
- portaudio? ( >=media-libs/portaudio-19_pre )
- pulseaudio? ( media-sound/pulseaudio )
- xv? ( x11-libs/libXv )
- wayland? ( dev-libs/wayland )
- )
- !gtk? ( x11-libs/libXv )
- libretro? ( !!games-emulation/libretro-snes9x )
- png? ( media-libs/libpng:0= )
- sys-libs/zlib:=[minizip]
- xinerama? ( x11-libs/libXinerama )
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/libX11
- x11-libs/libXext"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${P}/unix"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.53-cross-compile.patch
- "${FILESDIR}"/${PN}-1.59-build-system.patch
- "${FILESDIR}"/${PN}-1.60-gcc11.patch
-)
-
-src_prepare() {
- cd "${WORKDIR}/${P}" || die
- rm -r unzip || die
- default
- cd unix || die
- eautoreconf
- if use gtk ; then
- export EMESON_SOURCE="${WORKDIR}/${P}/gtk"
- fi
-}
-
-src_configure() {
- append-ldflags -Wl,-z,noexecstack
-
- # build breaks when zlib/zip support is disabled
- local myeconfargs=(
- --enable-gamepad
- --enable-gzip
- --enable-zip
- --with-system-zip
- $(use_enable debug debugger)
- $(use_enable netplay)
- $(use_enable png screenshot)
- $(use_enable xinerama)
- )
- econf "${myeconfargs[@]}"
-
- if use gtk; then
- local emesonargs=(
- -Dalsa="$(usex alsa true false)"
- -Ddebugger="$(usex debug true false)"
- -Dgtk2=false
- -Dgtk3=true
- -Dopengl="$(usex opengl true false)"
- -Doss="$(usex oss true false)"
- -Dportaudio="$(usex portaudio true false)"
- -Dpulseaudio="$(usex pulseaudio true false)"
- -Dscreenshot="$(usex png true false)"
- -Dsystem-zip=true
- -Dxv="$(usex xv true false)"
- -Dzlib=true
- -Dwayland="$(usex wayland true false)"
- )
- meson_src_configure
- fi
-}
-
-src_compile() {
- use libretro && emake -C ../libretro
- emake
- use gtk && meson_src_compile
-}
-
-src_install() {
- dobin ${PN}
-
- dodoc ../docs/{changes,control-inputs,controls,snapshots}.txt
- dodoc snes9x.conf.default
-
- if use libretro ; then
- cd "${WORKDIR}/${PF}/libretro/"
- dolib.so snes9x_libretro.so
- fi
-
- if use gtk ; then
- meson_src_install
- dodoc ../gtk/AUTHORS
- fi
-
- HTML_DOCS="${WORKDIR}/${PF}/docs/*.html"
- einstalldocs
-}
-
-pkg_preinst() {
- use gtk && xdg_pkg_preinst
-}
-
-pkg_postinst() {
- use gtk && xdg_pkg_postinst
-}
-
-pkg_postrm() {
- use gtk && xdg_pkg_postrm
-}
