| 1 |
commit: 12e018257ac178d689924fc09fa116aa07fa906d |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Wed Jun 16 18:17:13 2021 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 16 18:28:40 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12e01825 |
| 7 |
|
| 8 |
games-emulation/hatari: remove unused patches |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
| 11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/21272 |
| 13 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 14 |
|
| 15 |
.../hatari/files/hatari-2.2.1-default-rom.patch | 16 ------ |
| 16 |
.../hatari/files/hatari-2.2.1-joystick.patch | 59 ---------------------- |
| 17 |
2 files changed, 75 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
deleted file mode 100644 |
| 21 |
index c42f67f733c..00000000000 |
| 22 |
--- a/games-emulation/hatari/files/hatari-2.2.1-default-rom.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,16 +0,0 @@ |
| 25 |
-Use etos512k.img from the emutos package rather than tos.img. |
| 26 |
- |
| 27 |
-diff -Naur a/src/configuration.c b/src/configuration.c |
| 28 |
---- a/src/configuration.c 2019-02-08 08:30:11.000000000 +0000 |
| 29 |
-+++ b/src/configuration.c 2019-11-10 21:19:31.712605716 +0000 |
| 30 |
-@@ -841,8 +841,8 @@ |
| 31 |
- ConfigureParams.Sound.YmVolumeMixing = YM_TABLE_MIXING; |
| 32 |
- |
| 33 |
- /* Set defaults for Rom */ |
| 34 |
-- sprintf(ConfigureParams.Rom.szTosImageFileName, "%s%ctos.img", |
| 35 |
-- Paths_GetDataDir(), PATHSEP); |
| 36 |
-+ sprintf(ConfigureParams.Rom.szTosImageFileName, "%s%c..%cemutos%cetos512k.img", |
| 37 |
-+ Paths_GetDataDir(), PATHSEP, PATHSEP, PATHSEP); |
| 38 |
- ConfigureParams.Rom.bPatchTos = true; |
| 39 |
- strcpy(ConfigureParams.Rom.szCartridgeImageFileName, ""); |
| 40 |
- |
| 41 |
|
| 42 |
diff --git a/games-emulation/hatari/files/hatari-2.2.1-joystick.patch b/games-emulation/hatari/files/hatari-2.2.1-joystick.patch |
| 43 |
deleted file mode 100644 |
| 44 |
index 193bb7206c3..00000000000 |
| 45 |
--- a/games-emulation/hatari/files/hatari-2.2.1-joystick.patch |
| 46 |
+++ /dev/null |
| 47 |
@@ -1,59 +0,0 @@ |
| 48 |
-https://bugs.gentoo.org/689538 |
| 49 |
- |
| 50 |
-diff -ruN hatari-2.1.0.old/src/gui-sdl/sdlgui.c hatari-2.1.0/src/gui-sdl/sdlgui.c |
| 51 |
---- hatari-2.1.0.old/src/gui-sdl/sdlgui.c 2018-02-07 18:33:56.000000000 +0000 |
| 52 |
-+++ hatari-2.1.0/src/gui-sdl/sdlgui.c 2019-07-08 23:55:50.481270799 +0100 |
| 53 |
-@@ -1329,12 +1329,28 @@ |
| 54 |
- } |
| 55 |
- break; |
| 56 |
- |
| 57 |
-+ case SDL_JOYHATMOTION: |
| 58 |
-+ if (sdlEvent.jhat.value & SDL_HAT_LEFT) |
| 59 |
-+ retbutton = SDLGui_HandleShortcut(dlg, SG_SHORTCUT_LEFT); |
| 60 |
-+ else if (sdlEvent.jhat.value & SDL_HAT_RIGHT) |
| 61 |
-+ retbutton = SDLGui_HandleShortcut(dlg, SG_SHORTCUT_RIGHT); |
| 62 |
-+ if (sdlEvent.jhat.value & SDL_HAT_UP) |
| 63 |
-+ { |
| 64 |
-+ SDLGui_RemoveFocus(dlg, focused); |
| 65 |
-+ focused = SDLGui_FocusNext(dlg, focused, -1); |
| 66 |
-+ } |
| 67 |
-+ else if (sdlEvent.jhat.value & SDL_HAT_DOWN) |
| 68 |
-+ { |
| 69 |
-+ SDLGui_RemoveFocus(dlg, focused); |
| 70 |
-+ focused = SDLGui_FocusNext(dlg, focused, +1); |
| 71 |
-+ } |
| 72 |
-+ break; |
| 73 |
-+ |
| 74 |
- case SDL_JOYBUTTONDOWN: |
| 75 |
- retbutton = SDLGui_HandleSelection(dlg, focused, focused); |
| 76 |
- break; |
| 77 |
- |
| 78 |
- case SDL_JOYBALLMOTION: |
| 79 |
-- case SDL_JOYHATMOTION: |
| 80 |
- case SDL_MOUSEMOTION: |
| 81 |
- break; |
| 82 |
- |
| 83 |
-diff -ruN hatari-2.1.0.old/src/joy.c hatari-2.1.0/src/joy.c |
| 84 |
---- hatari-2.1.0.old/src/joy.c 2018-02-07 18:33:56.000000000 +0000 |
| 85 |
-+++ hatari-2.1.0/src/joy.c 2019-07-09 14:46:36.502410790 +0100 |
| 86 |
-@@ -199,9 +199,20 @@ |
| 87 |
- */ |
| 88 |
- static bool Joy_ReadJoystick(int nSdlJoyID, JOYREADING *pJoyReading) |
| 89 |
- { |
| 90 |
-+ unsigned hat = SDL_JoystickGetHat(sdlJoystick[nSdlJoyID], 0); |
| 91 |
-+ |
| 92 |
- /* Joystick is OK, read position from the configured joystick axis */ |
| 93 |
- pJoyReading->XPos = SDL_JoystickGetAxis(sdlJoystick[nSdlJoyID], pJoyReading->XAxisID); |
| 94 |
- pJoyReading->YPos = SDL_JoystickGetAxis(sdlJoystick[nSdlJoyID], pJoyReading->YAxisID); |
| 95 |
-+ /* Similarly to other emulators that support hats, override axis readings with hats */ |
| 96 |
-+ if (hat & SDL_HAT_LEFT) |
| 97 |
-+ pJoyReading->XPos = -32768; |
| 98 |
-+ if (hat & SDL_HAT_RIGHT) |
| 99 |
-+ pJoyReading->XPos = 32767; |
| 100 |
-+ if (hat & SDL_HAT_UP) |
| 101 |
-+ pJoyReading->YPos = -32768; |
| 102 |
-+ if (hat & SDL_HAT_DOWN) |
| 103 |
-+ pJoyReading->YPos = 32767; |
| 104 |
- /* Sets bit #0 if button #1 is pressed: */ |
| 105 |
- pJoyReading->Buttons = SDL_JoystickGetButton(sdlJoystick[nSdlJoyID], 0); |
| 106 |
- /* Sets bit #1 if button #2 is pressed: */ |
Archives