From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9AE691382C5 for ; Sun, 24 Jan 2021 23:08:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ABE6FE0817; Sun, 24 Jan 2021 23:08:51 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 81104E0817 for ; Sun, 24 Jan 2021 23:08:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 43615340A98 for ; Sun, 24 Jan 2021 23:08:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F094347 for ; Sun, 24 Jan 2021 23:08:48 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1611529549.1d17bdd5ca9abdc95eaf9c132a6706d70c10ae7c.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/openmsx/files/, games-emulation/openmsx/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/openmsx/files/openmsx-16.0-libsdl-joystick-fix.patch games-emulation/openmsx/openmsx-16.0-r1.ebuild games-emulation/openmsx/openmsx-16.0.ebuild X-VCS-Directories: games-emulation/openmsx/ games-emulation/openmsx/files/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 1d17bdd5ca9abdc95eaf9c132a6706d70c10ae7c X-VCS-Branch: master Date: Sun, 24 Jan 2021 23:08:48 +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: 2b049311-95c9-4fa7-ac4b-b2f848fe4106 X-Archives-Hash: ba464db9de7012eb86cc0a7150c04031 commit: 1d17bdd5ca9abdc95eaf9c132a6706d70c10ae7c Author: John Helmert III posteo net> AuthorDate: Sat Jan 23 02:54:53 2021 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sun Jan 24 23:05:49 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d17bdd5 games-emulation/openmsx: fix build failure with libsdl2[-joystick] Closes: https://bugs.gentoo.org/766552 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: John Helmert III posteo.net> Closes: https://github.com/gentoo/gentoo/pull/19187 Signed-off-by: James Le Cuirot gentoo.org> .../files/openmsx-16.0-libsdl-joystick-fix.patch | 66 ++++++++++++++++++++++ ...{openmsx-16.0.ebuild => openmsx-16.0-r1.ebuild} | 7 ++- 2 files changed, 71 insertions(+), 2 deletions(-) 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 00000000000..ff4e4c31e0c --- /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 +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 similarity index 94% rename from games-emulation/openmsx/openmsx-16.0.ebuild rename to games-emulation/openmsx/openmsx-16.0-r1.ebuild index 30edf81cdd2..c3b639a0bf3 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