Merge pull request #198473 from bzizou/mame (f44ef648) · Commits · nix / nixpkgs

pkgs/applications/emulators/mame/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -45,13 +45,13 @@ let
		in
		stdenv.mkDerivation rec {
		pname = "mame";
		version = "0.243";
		version = "0.249";

		src = fetchFromGitHub {
		owner = "mamedev";
		repo = "mame";
		rev = "mame${builtins.replaceStrings [ "." ] [ "" ] version}";
		sha256 = "sha256-dUgYLNvgvolz9M0ySkGJIZjVMBQwejkxsZ6npg8rIqk=";
		sha256 = "sha256-im6y/E0pQxruX2kNXZLE3fHq+zXfsstnOoC1QvH4fd4=";
		};

		hardeningDisable = [ "fortify" ];

pkgs/applications/emulators/mame/emuopts.patch

+30 −27

Original line number	Diff line number	Diff line
		diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp
		index c42fcef848..d1bddae060 100644
		--- a/src/emu/emuopts.cpp
		+++ b/src/emu/emuopts.cpp
		@@ -36,16 +36,16 @@ const options_entry emu_options::s_option_entries[] =
		{ nullptr, nullptr, OPTION_HEADER, "CORE SEARCH PATH OPTIONS" },
		{ OPTION_HOMEPATH, ".", OPTION_STRING, "path to base folder for plugin data (read/write)" },
		{ OPTION_MEDIAPATH ";rp;biospath;bp", "roms", OPTION_STRING, "path to ROM sets and hard disk images" },
		- { OPTION_HASHPATH ";hash_directory;hash", "hash", OPTION_STRING, "path to software definition files" },
		- { OPTION_SAMPLEPATH ";sp", "samples", OPTION_STRING, "path to audio sample sets" },
		- { OPTION_ARTPATH, "artwork", OPTION_STRING, "path to artwork files" },
		- { OPTION_CTRLRPATH, "ctrlr", OPTION_STRING, "path to controller definitions" },
		- { OPTION_INIPATH, ".;ini;ini/presets", OPTION_STRING, "path to ini files" },
		- { OPTION_FONTPATH, ".", OPTION_STRING, "path to font files" },
		+ { OPTION_HASHPATH ";hash_directory;hash", "hash;@mame@/hash", OPTION_STRING, "path to software definition files" },
		+ { OPTION_SAMPLEPATH ";sp", "samples;@mame@/samples", OPTION_STRING, "path to audio sample sets" },
		+ { OPTION_ARTPATH, "artwork;@mame@/artwork", OPTION_STRING, "path to artwork files" },
		+ { OPTION_CTRLRPATH, "ctrlr;@mame@/ctrlr", OPTION_STRING, "path to controller definitions" },
		+ { OPTION_INIPATH, ".;ini;ini/presets;@mame@/ini/presets", OPTION_STRING, "path to ini files" },
		+ { OPTION_FONTPATH, ".;@mame@", OPTION_STRING, "path to font files" },
		{ OPTION_CHEATPATH, "cheat", OPTION_STRING, "path to cheat files" },
		{ OPTION_CROSSHAIRPATH, "crosshair", OPTION_STRING, "path to crosshair files" },
		- { OPTION_PLUGINSPATH, "plugins", OPTION_STRING, "path to plugin files" },
		- { OPTION_LANGUAGEPATH, "language", OPTION_STRING, "path to UI translation files" },
		+ { OPTION_PLUGINSPATH, "plugins;@mame@/plugins", OPTION_STRING, "path to plugin files" },
		+ { OPTION_LANGUAGEPATH, "language;@mame@/language", OPTION_STRING, "path to UI translation files" },
		{ OPTION_SWPATH, "software", OPTION_STRING, "path to loose software" },
		--- a/src/emu/emuopts.cpp 2022-10-29 15:05:18.591381088 +0200
		+++ b/src/emu/emuopts.cpp 2022-10-29 15:10:10.938037551 +0200
		@@ -39,16 +39,16 @@
		{ nullptr, nullptr, core_options::option_type::HEADER, "CORE SEARCH PATH OPTIONS" },
		{ OPTION_PLUGINDATAPATH, ".", core_options::option_type::STRING, "path to base folder for plugin data (read/write)" },
		{ OPTION_MEDIAPATH ";rp;biospath;bp", "roms", core_options::option_type::STRING, "path to ROM sets and hard disk images" },
		- { OPTION_HASHPATH ";hash_directory;hash", "hash", core_options::option_type::STRING, "path to software definition files" },
		- { OPTION_SAMPLEPATH ";sp", "samples", core_options::option_type::STRING, "path to audio sample sets" },
		- { OPTION_ARTPATH, "artwork", core_options::option_type::STRING, "path to artwork files" },
		- { OPTION_CTRLRPATH, "ctrlr", core_options::option_type::STRING, "path to controller definitions" },
		- { OPTION_INIPATH, ".;ini;ini/presets", core_options::option_type::STRING, "path to ini files" },
		- { OPTION_FONTPATH, ".", core_options::option_type::STRING, "path to font files" },
		+ { OPTION_HASHPATH ";hash_directory;hash", "hash;@mame@/hash", core_options::option_type::STRING, "path to software definition files" },
		+ { OPTION_SAMPLEPATH ";sp", "samples;@mame@/samples", core_options::option_type::STRING, "path to audio sample sets" },
		+ { OPTION_ARTPATH, "artwork;@mame@/artwork", core_options::option_type::STRING, "path to artwork files" },
		+ { OPTION_CTRLRPATH, "ctrlr;@mame@/ctrlr", core_options::option_type::STRING, "path to controller definitions" },
		+ { OPTION_INIPATH, ".;ini;ini/presets;@mame@/ini/presets", core_options::option_type::STRING, "path to ini files" },
		+ { OPTION_FONTPATH, ".;@mame@", core_options::option_type::STRING, "path to font files" },
		{ OPTION_CHEATPATH, "cheat", core_options::option_type::STRING, "path to cheat files" },
		{ OPTION_CROSSHAIRPATH, "crosshair", core_options::option_type::STRING, "path to crosshair files" },
		- { OPTION_PLUGINSPATH, "plugins", core_options::option_type::STRING, "path to plugin files" },
		- { OPTION_LANGUAGEPATH, "language", core_options::option_type::STRING, "path to UI translation files" },
		+ { OPTION_PLUGINSPATH, "plugins;@mame@/plugins", core_options::option_type::STRING, "path to plugin files" },
		+ { OPTION_LANGUAGEPATH, "language;@mame@/language", core_options::option_type::STRING, "path to UI translation files" },
		{ OPTION_SWPATH, "software", core_options::option_type::STRING, "path to loose software" },

		// output directory options
		@@ -1301,3 +1301,4 @@
		m_entry = entry;
		return entry;
		}
		+

Admin message