diff options
Diffstat (limited to 'games-emulation')
| -rw-r--r-- | games-emulation/mastergear-bin/Manifest | 2 | ||||
| -rw-r--r-- | games-emulation/mastergear-bin/mastergear-bin-4.7.ebuild (renamed from games-emulation/mastergear-bin/mastergear-bin-4.5.ebuild) | 3 | ||||
| -rw-r--r-- | games-emulation/openmsx/files/openmsx-16.0-libsdl-joystick-fix.patch | 66 | ||||
| -rw-r--r-- | games-emulation/openmsx/openmsx-16.0-r1.ebuild (renamed from games-emulation/openmsx/openmsx-16.0.ebuild) | 7 |
4 files changed, 74 insertions, 4 deletions
diff --git a/games-emulation/mastergear-bin/Manifest b/games-emulation/mastergear-bin/Manifest index 11f31c1de8a1..ba8069d494d2 100644 --- a/games-emulation/mastergear-bin/Manifest +++ b/games-emulation/mastergear-bin/Manifest @@ -1 +1 @@ -DIST MG45-Ubuntu-x86-bin.tgz 170508 BLAKE2B b7b3ae11569dd7f5ac0fd76c86d5d89b0179b804338b5ab40a60eab81c17d53b0071f68312fe53c6fcf0050b86d95dab75e1312a434bfb7c0dc927ef1355b2b5 SHA512 e90ade7f1dd894638bf5e5ca83229cc6673e879bff0f32aae112d2f1b56d4dabb287e1a5b59811185f6fea862fbc44bbe9a41b214e29d72355c31ba4df839ce4 +DIST MG47-Ubuntu-x86-bin.tgz 173067 BLAKE2B 2fe5b02f5f3e631e13018f3b6dc1174f00e81cc38696aed35bddbce30e22795184d71a837ce801d13a4bb100b85dfdcdd8ba213b2f447aa24d9962b1adecace5 SHA512 340038a161df1593f4ce8daa0ccf3a8cd562cf1d92d33926d3e2cf53eb6c7dd778d4c504b82f3b36394ea4beb28e7e51490e22e117dde5752a460988f0776914 diff --git a/games-emulation/mastergear-bin/mastergear-bin-4.5.ebuild b/games-emulation/mastergear-bin/mastergear-bin-4.7.ebuild index f4c9e3d4307e..f366832012d4 100644 --- a/games-emulation/mastergear-bin/mastergear-bin-4.5.ebuild +++ b/games-emulation/mastergear-bin/mastergear-bin-4.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,6 +19,7 @@ RDEPEND=">=sys-libs/glibc-2.15 || ( media-sound/pulseaudio media-sound/apulse )" S="${WORKDIR}" +QA_PREBUILT="usr/bin/mastergear" src_install() { newbin mg mastergear diff --git a/games-emulation/openmsx/files/openmsx-16.0-libsdl-joystick-fix.patch b/games-emulation/openmsx/files/openmsx-16.0-libsdl-joystick-fix.patch new file mode 100644 index 000000000000..ff4e4c31e0cd --- /dev/null +++ b/games-emulation/openmsx/files/openmsx-16.0-libsdl-joystick-fix.patch @@ -0,0 +1,66 @@ +From eb5ddae80bdc6793de42ee67dd72e2da9d632ba8 Mon Sep 17 00:00:00 2001 +From: Maarten ter Huurne <maarten@treewalker.org> +Date: Sat, 23 Jan 2021 03:25:38 +0100 +Subject: [PATCH] Fix compile errors and warnings when SDL_JOYSTICK_DISABLED is + defined + +If there is no base class, it's impossible to override the destructor. + +There were warning suppressors for 3 out of 5 arguments that are unused +when SDL_JOYSTICK_DISABLED is defined; I added the othe two. +--- + src/input/JoyMega.hh | 6 +++++- + src/input/Joystick.cc | 2 ++ + src/input/Joystick.hh | 8 ++++++-- + 3 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/src/input/JoyMega.hh b/src/input/JoyMega.hh +index 8422bcd2a..05371e27d 100644 +--- a/src/input/JoyMega.hh ++++ b/src/input/JoyMega.hh +@@ -25,7 +25,11 @@ public: + JoyMega(MSXEventDistributor& eventDistributor, + StateChangeDistributor& stateChangeDistributor, + SDL_Joystick* joystick); +- ~JoyMega() override; ++ ~JoyMega() ++#ifndef SDL_JOYSTICK_DISABLED ++ override ++#endif ++ ; + + #ifndef SDL_JOYSTICK_DISABLED + // Pluggable +diff --git a/src/input/Joystick.cc b/src/input/Joystick.cc +index 04b4826cd..90b344c42 100644 +--- a/src/input/Joystick.cc ++++ b/src/input/Joystick.cc +@@ -32,6 +32,8 @@ void Joystick::registerAll(MSXEventDistributor& eventDistributor, + #ifdef SDL_JOYSTICK_DISABLED + (void)eventDistributor; + (void)stateChangeDistributor; ++ (void)commandController; ++ (void)globalSettings; + (void)controller; + #else + for (auto i : xrange(SDL_NumJoysticks())) { +diff --git a/src/input/Joystick.hh b/src/input/Joystick.hh +index 18dd3c1c0..6a0f38d9d 100644 +--- a/src/input/Joystick.hh ++++ b/src/input/Joystick.hh +@@ -38,9 +38,13 @@ public: + Joystick(MSXEventDistributor& eventDistributor, + StateChangeDistributor& stateChangeDistributor, + CommandController& commandController, +- GlobalSettings& globalSettings, ++ GlobalSettings& globalSettings, + SDL_Joystick* joystick); +- ~Joystick() override; ++ ~Joystick() ++#ifndef SDL_JOYSTICK_DISABLED ++ override ++#endif ++ ; + + #ifndef SDL_JOYSTICK_DISABLED + // Pluggable diff --git a/games-emulation/openmsx/openmsx-16.0.ebuild b/games-emulation/openmsx/openmsx-16.0-r1.ebuild index 7d996cfb2dab..31e4a1a4a9cf 100644 --- a/games-emulation/openmsx/openmsx-16.0.ebuild +++ b/games-emulation/openmsx/openmsx-16.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,12 +14,13 @@ SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_${PV//./_} LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" +IUSE="+joystick" RDEPEND="dev-lang/tcl:0= media-libs/alsa-lib media-libs/libogg media-libs/libpng:0= - media-libs/libsdl2[sound,video] + media-libs/libsdl2[joystick=,sound,video] media-libs/libtheora media-libs/libvorbis media-libs/sdl2-ttf @@ -29,6 +30,8 @@ RDEPEND="dev-lang/tcl:0= DEPEND="${RDEPEND}" BDEPEND="${PYTHON_DEPS}" +PATCHES=( "${FILESDIR}/${P}-libsdl-joystick-fix.patch" ) + DOC_CONTENTS=" If you want to if you want to emulate real MSX systems and not only the free C-BIOS machines, put the system ROMs in one of |