diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-29 18:03:51 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-29 18:03:51 +0000 |
commit | d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (patch) | |
tree | 1814dd2b5bbf2e7639fdafbeef48d228cfaf5e9b /games-emulation/openmsx | |
parent | abaa75b10f899ada8dd05b23cc03205064394bc6 (diff) |
gentoo resync : 29.01.2021
Diffstat (limited to 'games-emulation/openmsx')
-rw-r--r-- | games-emulation/openmsx/Manifest | 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 |
3 files changed, 73 insertions, 3 deletions
diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest index ef6f9a21b08c..e466a1d35a68 100644 --- a/games-emulation/openmsx/Manifest +++ b/games-emulation/openmsx/Manifest @@ -1,3 +1,4 @@ +AUX openmsx-16.0-libsdl-joystick-fix.patch 2101 BLAKE2B b2381fe41d014106f87a11ccc8f5f301bf033d4ff281a11280b4b8459cf62f81c29a2d07220466ab7cb59005f14157857f3ff566e1f00ddfc104ba68b199dfd5 SHA512 f2aa3b1e69879db9a315e6485db67382228827caa2d362f9f1843a76741d2bb6f909ed05664d88608c01910914e3c40d2e5600a78b276111e242f51145e3c9cb DIST openmsx-16.0.tar.gz 3997584 BLAKE2B 040bb3f6ff0338740b5212aae21db2c97fcee0e8c8ada1bc84a59d94b1b72180c4b2d5eff8cc4ae84dd95bc77f121e15c2f818f1f2e05ba7dc4781b63770db38 SHA512 a06ec56a8a768356b628e59e587ec85898643b04379da5c72bbbd8e48a0533da34a451b7e4d2a2f540f14e6bbcf833534a1bdac9014ce0c35dfd4ca179618f48 -EBUILD openmsx-16.0.ebuild 2854 BLAKE2B 406a20e7831d8ada8911240c945331577e6eaaed31be72c4a03b60f7eeccd5d33f0096a386e2a053cf2ef82393f585f87acf3a4a2c734758c2e7084abacf2fac SHA512 8030615732d37b53c29541ec3e1dbe20dbb44fc97a96658cdb4bd18ef4f42239249734ad00a3f2664524fec8c82354fdeee7ed541d8010e2ff443579e3b9927d +EBUILD openmsx-16.0-r1.ebuild 2939 BLAKE2B 87c296bd3333fbf80db4fffc2601f786017392f1e942d327825f5d6d6cc82f4b0f05b3ef4e2be14e7b1b717265dac63532dc0fb42ddd67bbbc021fdfa85afd58 SHA512 fad7303210940a3592f83c48762350825fa6b6b670cc3f15e140e3e68b65b2665f5a55a5d6e730a6ec36ffe00d26e7261ee0e3da2fba82881841dba08d39d997 MISC metadata.xml 568 BLAKE2B 1bfc2740e73372e2e6583b5a7ee33e2354b1288543812728ae4d2a8b269ce55bb51a559a155d0331fe2e4f393ed9ff7d2a8a714fdad0c3ad0c592d4771296666 SHA512 bb481002ea3fc30faa397785a95c3092c343d8affd19ae31d1c6b3f5c980c4ad98024b40495e25598f85a1d295291ebdbe57cc1c4b1cbf0399619bee8f5335a3 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 30edf81cdd26..c3b639a0bf33 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 |