[gentoo-commits] repo/gentoo:master commit in: games-emulation/hatari/files/

[gentoo-commits] repo/gentoo:master commit in: games-emulation/hatari/files/

[Ionen Wolkens]

commit:     12e018257ac178d689924fc09fa116aa07fa906d
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Jun 16 18:17:13 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Jun 16 18:28:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12e01825

games-emulation/hatari: remove unused patches

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/21272
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../hatari/files/hatari-2.2.1-default-rom.patch    | 16 ------
 .../hatari/files/hatari-2.2.1-joystick.patch       | 59 ----------------------
 2 files changed, 75 deletions(-)

diff --git a/games-emulation/hatari/files/hatari-2.2.1-default-rom.patch b/games-emulation/hatari/files/hatari-2.2.1-default-rom.patch
deleted file mode 100644
index c42f67f733c..00000000000
--- a/games-emulation/hatari/files/hatari-2.2.1-default-rom.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Use etos512k.img from the emutos package rather than tos.img.
-
-diff -Naur a/src/configuration.c b/src/configuration.c
---- a/src/configuration.c	2019-02-08 08:30:11.000000000 +0000
-+++ b/src/configuration.c	2019-11-10 21:19:31.712605716 +0000
-@@ -841,8 +841,8 @@
- 	ConfigureParams.Sound.YmVolumeMixing = YM_TABLE_MIXING;
- 
- 	/* Set defaults for Rom */
--	sprintf(ConfigureParams.Rom.szTosImageFileName, "%s%ctos.img",
--	        Paths_GetDataDir(), PATHSEP);
-+	sprintf(ConfigureParams.Rom.szTosImageFileName, "%s%c..%cemutos%cetos512k.img",
-+	        Paths_GetDataDir(), PATHSEP, PATHSEP, PATHSEP);
- 	ConfigureParams.Rom.bPatchTos = true;
- 	strcpy(ConfigureParams.Rom.szCartridgeImageFileName, "");
- 

diff --git a/games-emulation/hatari/files/hatari-2.2.1-joystick.patch b/games-emulation/hatari/files/hatari-2.2.1-joystick.patch
deleted file mode 100644
index 193bb7206c3..00000000000
--- a/games-emulation/hatari/files/hatari-2.2.1-joystick.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-https://bugs.gentoo.org/689538
-
-diff -ruN hatari-2.1.0.old/src/gui-sdl/sdlgui.c hatari-2.1.0/src/gui-sdl/sdlgui.c
---- hatari-2.1.0.old/src/gui-sdl/sdlgui.c	2018-02-07 18:33:56.000000000 +0000
-+++ hatari-2.1.0/src/gui-sdl/sdlgui.c	2019-07-08 23:55:50.481270799 +0100
-@@ -1329,12 +1329,28 @@
- 				}
- 				break;
- 
-+			 case SDL_JOYHATMOTION:
-+				if (sdlEvent.jhat.value & SDL_HAT_LEFT)
-+					retbutton = SDLGui_HandleShortcut(dlg, SG_SHORTCUT_LEFT);
-+				else if (sdlEvent.jhat.value & SDL_HAT_RIGHT)
-+					retbutton = SDLGui_HandleShortcut(dlg, SG_SHORTCUT_RIGHT);
-+				if (sdlEvent.jhat.value & SDL_HAT_UP)
-+				{
-+					SDLGui_RemoveFocus(dlg, focused);
-+					focused = SDLGui_FocusNext(dlg, focused, -1);
-+				}
-+				else if (sdlEvent.jhat.value & SDL_HAT_DOWN)
-+				{
-+					SDLGui_RemoveFocus(dlg, focused);
-+					focused = SDLGui_FocusNext(dlg, focused, +1);
-+				}
-+				break;
-+
- 			 case SDL_JOYBUTTONDOWN:
- 				retbutton = SDLGui_HandleSelection(dlg, focused, focused);
- 				break;
- 
- 			 case SDL_JOYBALLMOTION:
--			 case SDL_JOYHATMOTION:
- 			 case SDL_MOUSEMOTION:
- 				break;
- 
-diff -ruN hatari-2.1.0.old/src/joy.c hatari-2.1.0/src/joy.c
---- hatari-2.1.0.old/src/joy.c	2018-02-07 18:33:56.000000000 +0000
-+++ hatari-2.1.0/src/joy.c	2019-07-09 14:46:36.502410790 +0100
-@@ -199,9 +199,20 @@
-  */
- static bool Joy_ReadJoystick(int nSdlJoyID, JOYREADING *pJoyReading)
- {
-+	unsigned hat = SDL_JoystickGetHat(sdlJoystick[nSdlJoyID], 0);
-+
- 	/* Joystick is OK, read position from the configured joystick axis */
- 	pJoyReading->XPos = SDL_JoystickGetAxis(sdlJoystick[nSdlJoyID], pJoyReading->XAxisID);
- 	pJoyReading->YPos = SDL_JoystickGetAxis(sdlJoystick[nSdlJoyID], pJoyReading->YAxisID);
-+	/* Similarly to other emulators that support hats, override axis readings with hats */
-+	if (hat & SDL_HAT_LEFT)
-+		pJoyReading->XPos = -32768;
-+	if (hat & SDL_HAT_RIGHT)
-+		pJoyReading->XPos = 32767;
-+	if (hat & SDL_HAT_UP)
-+		pJoyReading->YPos = -32768;
-+	if (hat & SDL_HAT_DOWN)
-+		pJoyReading->YPos = 32767;
- 	/* Sets bit #0 if button #1 is pressed: */
- 	pJoyReading->Buttons = SDL_JoystickGetButton(sdlJoystick[nSdlJoyID], 0);
- 	/* Sets bit #1 if button #2 is pressed: */