pyrox.dev
Merge pull request #198473 from bzizou/mame
mame: 0.243 -> 0.249
authored by Thiago Kenji Okada and committed by GitHub f44ef648 e39caa6b
+2
-2
pkgs/applications/emulators/mame/default.nix
+2
-2
pkgs/applications/emulators/mame/default.nix
···
45
45
in
46
46
stdenv.mkDerivation rec {
47
47
pname = "mame";
48
-
version = "0.243";
48
+
version = "0.249";
49
49
50
50
src = fetchFromGitHub {
51
51
owner = "mamedev";
52
52
repo = "mame";
53
53
rev = "mame${builtins.replaceStrings [ "." ] [ "" ] version}";
54
-
sha256 = "sha256-dUgYLNvgvolz9M0ySkGJIZjVMBQwejkxsZ6npg8rIqk=";
54
+
sha256 = "sha256-im6y/E0pQxruX2kNXZLE3fHq+zXfsstnOoC1QvH4fd4=";
55
55
};
56
56
57
57
hardeningDisable = [ "fortify" ];
+30
-27
pkgs/applications/emulators/mame/emuopts.patch
+30
-27
pkgs/applications/emulators/mame/emuopts.patch
···
1
-
diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp
2
-
index c42fcef848..d1bddae060 100644
3
-
--- a/src/emu/emuopts.cpp
4
-
+++ b/src/emu/emuopts.cpp
5
-
@@ -36,16 +36,16 @@ const options_entry emu_options::s_option_entries[] =
6
-
{ nullptr, nullptr, OPTION_HEADER, "CORE SEARCH PATH OPTIONS" },
7
-
{ OPTION_HOMEPATH, ".", OPTION_STRING, "path to base folder for plugin data (read/write)" },
8
-
{ OPTION_MEDIAPATH ";rp;biospath;bp", "roms", OPTION_STRING, "path to ROM sets and hard disk images" },
9
-
- { OPTION_HASHPATH ";hash_directory;hash", "hash", OPTION_STRING, "path to software definition files" },
10
-
- { OPTION_SAMPLEPATH ";sp", "samples", OPTION_STRING, "path to audio sample sets" },
11
-
- { OPTION_ARTPATH, "artwork", OPTION_STRING, "path to artwork files" },
12
-
- { OPTION_CTRLRPATH, "ctrlr", OPTION_STRING, "path to controller definitions" },
13
-
- { OPTION_INIPATH, ".;ini;ini/presets", OPTION_STRING, "path to ini files" },
14
-
- { OPTION_FONTPATH, ".", OPTION_STRING, "path to font files" },
15
-
+ { OPTION_HASHPATH ";hash_directory;hash", "hash;@mame@/hash", OPTION_STRING, "path to software definition files" },
16
-
+ { OPTION_SAMPLEPATH ";sp", "samples;@mame@/samples", OPTION_STRING, "path to audio sample sets" },
17
-
+ { OPTION_ARTPATH, "artwork;@mame@/artwork", OPTION_STRING, "path to artwork files" },
18
-
+ { OPTION_CTRLRPATH, "ctrlr;@mame@/ctrlr", OPTION_STRING, "path to controller definitions" },
19
-
+ { OPTION_INIPATH, ".;ini;ini/presets;@mame@/ini/presets", OPTION_STRING, "path to ini files" },
20
-
+ { OPTION_FONTPATH, ".;@mame@", OPTION_STRING, "path to font files" },
21
-
{ OPTION_CHEATPATH, "cheat", OPTION_STRING, "path to cheat files" },
22
-
{ OPTION_CROSSHAIRPATH, "crosshair", OPTION_STRING, "path to crosshair files" },
23
-
- { OPTION_PLUGINSPATH, "plugins", OPTION_STRING, "path to plugin files" },
24
-
- { OPTION_LANGUAGEPATH, "language", OPTION_STRING, "path to UI translation files" },
25
-
+ { OPTION_PLUGINSPATH, "plugins;@mame@/plugins", OPTION_STRING, "path to plugin files" },
26
-
+ { OPTION_LANGUAGEPATH, "language;@mame@/language", OPTION_STRING, "path to UI translation files" },
27
-
{ OPTION_SWPATH, "software", OPTION_STRING, "path to loose software" },
1
+
--- a/src/emu/emuopts.cpp 2022-10-29 15:05:18.591381088 +0200
2
+
+++ b/src/emu/emuopts.cpp 2022-10-29 15:10:10.938037551 +0200
3
+
@@ -39,16 +39,16 @@
4
+
{ nullptr, nullptr, core_options::option_type::HEADER, "CORE SEARCH PATH OPTIONS" },
5
+
{ OPTION_PLUGINDATAPATH, ".", core_options::option_type::STRING, "path to base folder for plugin data (read/write)" },
6
+
{ OPTION_MEDIAPATH ";rp;biospath;bp", "roms", core_options::option_type::STRING, "path to ROM sets and hard disk images" },
7
+
- { OPTION_HASHPATH ";hash_directory;hash", "hash", core_options::option_type::STRING, "path to software definition files" },
8
+
- { OPTION_SAMPLEPATH ";sp", "samples", core_options::option_type::STRING, "path to audio sample sets" },
9
+
- { OPTION_ARTPATH, "artwork", core_options::option_type::STRING, "path to artwork files" },
10
+
- { OPTION_CTRLRPATH, "ctrlr", core_options::option_type::STRING, "path to controller definitions" },
11
+
- { OPTION_INIPATH, ".;ini;ini/presets", core_options::option_type::STRING, "path to ini files" },
12
+
- { OPTION_FONTPATH, ".", core_options::option_type::STRING, "path to font files" },
13
+
+ { OPTION_HASHPATH ";hash_directory;hash", "hash;@mame@/hash", core_options::option_type::STRING, "path to software definition files" },
14
+
+ { OPTION_SAMPLEPATH ";sp", "samples;@mame@/samples", core_options::option_type::STRING, "path to audio sample sets" },
15
+
+ { OPTION_ARTPATH, "artwork;@mame@/artwork", core_options::option_type::STRING, "path to artwork files" },
16
+
+ { OPTION_CTRLRPATH, "ctrlr;@mame@/ctrlr", core_options::option_type::STRING, "path to controller definitions" },
17
+
+ { OPTION_INIPATH, ".;ini;ini/presets;@mame@/ini/presets", core_options::option_type::STRING, "path to ini files" },
18
+
+ { OPTION_FONTPATH, ".;@mame@", core_options::option_type::STRING, "path to font files" },
19
+
{ OPTION_CHEATPATH, "cheat", core_options::option_type::STRING, "path to cheat files" },
20
+
{ OPTION_CROSSHAIRPATH, "crosshair", core_options::option_type::STRING, "path to crosshair files" },
21
+
- { OPTION_PLUGINSPATH, "plugins", core_options::option_type::STRING, "path to plugin files" },
22
+
- { OPTION_LANGUAGEPATH, "language", core_options::option_type::STRING, "path to UI translation files" },
23
+
+ { OPTION_PLUGINSPATH, "plugins;@mame@/plugins", core_options::option_type::STRING, "path to plugin files" },
24
+
+ { OPTION_LANGUAGEPATH, "language;@mame@/language", core_options::option_type::STRING, "path to UI translation files" },
25
+
{ OPTION_SWPATH, "software", core_options::option_type::STRING, "path to loose software" },
28
26
29
27
// output directory options
28
+
@@ -1301,3 +1301,4 @@
29
+
m_entry = entry;
30
+
return entry;
31
+
}
32
+
+