gentoo resync : 17.06.2021

6 files changed, 78 insertions, 77 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index b2d8bae33c43..d22110588d10 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
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: */
diff --git a/games-emulation/mednafen/Manifest b/games-emulation/mednafen/Manifest
index 9458f74aa3db..5739133a7dd7 100644
--- a/games-emulation/mednafen/Manifest
+++ b/games-emulation/mednafen/Manifest
@@ -1,3 +1,5 @@
 DIST mednafen-1.26.1.tar.xz 3319756 BLAKE2B d306a0754ed0c64a99cee4eacfa47f5f46ca059026bfc2ef6bfff4be82e914a2882a864538c8cb6bb948cdb9bd53651d931b033446015ad06be309893a2bfef7 SHA512 c91db3967c09a475fcd3410eb6892a99f3cf2ca2c5a78173669aa52c2e588819595d1d140e0c1888f48885327a9381c64cfb8f2074be8067984a4414c6f282bf
+DIST mednafen-1.27.1.tar.xz 3363540 BLAKE2B f74c251300af2348db00d68ef2cd998bdf4d6fb06873e03e0027d836b5b1217901b1e2cf922877b1db4c278ba4cc2674e4875a17fff52a3b8be5a447670a6385 SHA512 f55d86baa8c77fc98aae63a38235eb64f64131f180c40ed1ac7cd2ad845230348fbba05643eb5e6af203e56c39c8011b632d2bcecbd2c9f2c19b2447f6b99e83
 EBUILD mednafen-1.26.1.ebuild 1840 BLAKE2B 76cf933b913f945bd4b294bd62fed963d7be591c2b96573b4c305f270d3afe13f2b17d8ac188a7744157db70cf764784feddcf0fca3311c241295d5a0fe61d5a SHA512 7f238e60c44156bc5a4fe31f3e9b4cb66a813ff1e06cb2ebc03417cd92a18172fd7efed7b1f5e8c49bc4c663b44ab521736153ee8c4c1d3c4bef6a4499bf7391
+EBUILD mednafen-1.27.1.ebuild 1823 BLAKE2B 81c33f8a2e85ede29f08b00f6e17bfba4fdd0f6ec3a907b819369d56f593dfbb470a758d517f33e83af992782725b1ba45c61df88b976429fe8eef35c138210c SHA512 d31c0792213c3f0afee5e10e1739be73e5da3279cf06665dc6f1f638a0637d705eec22f6a8fef83d340377050450bd2ea08d3d3823dcaa57c558e87c496b7f87
 MISC metadata.xml 331 BLAKE2B a6dd34f1551387663808754c93520d4fd44d6c157c3d8d8ad60cf001b983d4d90f1ccd08110a83bec70418affcbd8eac831d8fcc19b62790fc90ee5a294242bb SHA512 f6259726b46f1e16136941bbaae5c46e4627a9fc428d43232efd59abe0678caf226acf43ea484f668b4dbf82658d2f4b2828402eb2305006189b50d4fd7691e3
diff --git a/games-emulation/mednafen/mednafen-1.27.1.ebuild b/games-emulation/mednafen/mednafen-1.27.1.ebuild
new file mode 100644
index 000000000000..ff0f36561a36
--- /dev/null
+++ b/games-emulation/mednafen/mednafen-1.27.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic pax-utils toolchain-funcs
+
+DESCRIPTION="Argument-driven multi-system emulator utilizing OpenGL and SDL"
+HOMEPAGE="https://mednafen.github.io/"
+SRC_URI="https://mednafen.github.io/releases/files/${P}.tar.xz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa cpu_flags_ppc_altivec flac jack"
+
+RDEPEND="
+	dev-libs/lzo:2
+	dev-libs/trio
+	media-libs/libsdl2[joystick,opengl,video]
+	media-libs/tremor
+	media-sound/musepack-tools
+	sys-libs/zlib:=[minizip]
+	virtual/libintl
+	alsa? ( media-libs/alsa-lib )
+	flac? ( media-libs/flac )
+	jack? ( virtual/jack )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# don't let the build system mess with CFLAGS more than necessary,
+	# most are questionable (see README.PORTING/configure.ac comments)
+	# -fwrapv: kept for bug #539992
+	sed -e '/CC_OPT.*CODEGEN_FLAGS/{/-fwrapv/!d}' \
+		-e '/CC_OPT.*NO_STACK_PROTECTOR_FLAGS/d' \
+		-e '/CC_OPT.*OPTIMIZER_FLAGS/c\:' \
+		-e '/CC_OPT.*-mtune.*SS_EXTRA_FLAGS/d' \
+		-i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# disable unnecessary warnings not to confuse users (see src/types.h)
+	append-cppflags -DMDFN_DISABLE_{NO_OPT,PICPIE}_ERRWARN
+
+	local myeconfargs=(
+		$(use_enable alsa)
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable jack)
+		$(use_with flac libflac)
+		--with-external-{lzo,mpcdec,tremor,trio}
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	local DOCS=(
+		ChangeLog
+		Documentation/{cheats.txt,fname_format.txt,modules.def,settings.def}
+	)
+	local HTML_DOCS=( Documentation/*.{css,html,png} )
+
+	default
+
+	pax-mark m "${ED}"/usr/bin/mednafen
+}