gentoo resync : 17.06.2021

3 files changed, 0 insertions, 77 deletions

diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest
index a8b801bff3b2..7896eb7fc640 100644
--- a/games-emulation/hatari/Manifest
+++ b/games-emulation/hatari/Manifest
@@ -1,5 +1,3 @@
-AUX hatari-2.2.1-default-rom.patch 698 BLAKE2B 5830bf75aa9039f0fda3f354bef50fa5dc6c7bea658c2f540a39f21f9b52fbb51447d1f1819ca3eebd248a93f7d255e9ef98a912aa908fbb15277a9ed106b853 SHA512 24659ea52cccb641010b08778608d87b4849b605b2825804f63f1285483605fdc2559f6ce6e17a5a71f801981c7bcf5d429dfc84f6dc6e5ed4cad9f1d957482f
-AUX hatari-2.2.1-joystick.patch 2172 BLAKE2B 67be6915d79612d851bcd617637e05d076f8a498194957a21ee6213c77fc0c7b718220afb0749bb2ccfa9322af34b020391fd8be9540dd1f7ed694f510215c2d SHA512 54b73d294dcc061abc4e037515f18bd0aa2e311c97010b687fce5cd90e427aac431bf820a1dd9ce2b2632e1662496e423582d80b1d55f23eef0734f03adfb2b8
 AUX hatari-2.3.1-caps5-include-path.patch 500 BLAKE2B 9462c680cf22368e06f37d313d0d0917b5904977ab0001fc3427bb8532d611481e0414c7a9c76a83f8c3a00691dd702c22a4c27eb3d1ef0a8bfbd5d48d636895 SHA512 53230cfbfc1904fba1af3d9a7554425d76e75f4a4fa51906ebfe12c9f178633bc63334036f3192643dfa2a3d51e5729c7932a58ca009902585a1653b44c28457
 AUX hatari-2.3.1-cmake-include-checksym.patch 388 BLAKE2B 45bc03fc6be8feae6d16083ea6fd5c2fbe1f63103c8a274e9e2104d39cb4050dd5cb0ac51e679fbb65c17d0e2df080245e0e5800f14578e956cbff2dd6c3e9f5 SHA512 b9afa6022e7be9dfe9ab47b791d5e7a64e835ae2098f5b04737b2ffc952598bc0e90a181609629d03f9568c8dcd4e5772cb96bd1416531ccba6c66a1d33c439e
 DIST hatari-2.3.1.tar.bz2 4334129 BLAKE2B f309a31cbf181135b02858ebefa4d70116e66d252ef5de03cffa8254c0e86e4eeebfbf626613103790fb803d08028b318721020b292ea748c79e4d008e6d503d SHA512 78a6c7d80bfcd9b3a85a82754f4180cfd906eb95c6a44c8fbb92c2a648dc9c21c74c9dd18db4783d87259a3061b39e639c54cdd6c033d83de1252afef811382f
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 c42f67f733c1..000000000000
--- 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 193bb7206c31..000000000000
--- 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: */