diff --git a/0.245-asserts.patch b/0.245-asserts.patch deleted file mode 100644 index 36568a4..0000000 --- a/0.245-asserts.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/frontend/mame/ui/selgame.cpp b/src/frontend/mame/ui/selgame.cpp -index 07b8d03d043..bcdd49239cc 100644 ---- a/src/frontend/mame/ui/selgame.cpp -+++ b/src/frontend/mame/ui/selgame.cpp -@@ -442,7 +442,7 @@ void menu_select_game::populate(float &customtop, float &custombottom) - item_append(_("System Settings"), 0, (void *)(uintptr_t)CONF_MACHINE); - skip_main_items = 3; - -- if (m_prev_selected && !have_prev_selected) -+ if (m_prev_selected && !have_prev_selected && item_count() > 0) - m_prev_selected = item(0).ref(); - } - else -diff --git a/src/frontend/mame/ui/selsoft.cpp b/src/frontend/mame/ui/selsoft.cpp -index da4ad722f2f..051b09b4fcf 100644 ---- a/src/frontend/mame/ui/selsoft.cpp -+++ b/src/frontend/mame/ui/selsoft.cpp -@@ -397,7 +397,7 @@ menu_select_software::~menu_select_software() - - void menu_select_software::handle(event const *ev) - { -- if (m_prev_selected == nullptr) -+ if (m_prev_selected == nullptr && item_count() > 0) - m_prev_selected = item(0).ref(); - - // FIXME: everything above here used run before events were processed diff --git a/README.md b/README.md index b5c59c9..ce6df01 100644 --- a/README.md +++ b/README.md @@ -33,3 +33,7 @@ Currently these are the patches applied: `ldopts.patch` enables an option for the linker to strip debug symbols. `use-system-lib-flac.patch` works around FORTIFY_SOURCE compiler option that causes errors in the included libflac. + +### Running + +A default minimal ini file is in the sandboxed /etc/mame/mame.ini. Run MAME from the command line with the -createconfig argument to create a new mame.ini in your home directory. Modify this new mame.ini to configure MAME. diff --git a/mame.ini b/mame.ini new file mode 100644 index 0000000..891e06c --- /dev/null +++ b/mame.ini @@ -0,0 +1,33 @@ +# +# CORE SEARCH PATH OPTIONS +# +homepath $HOME/.mame +rompath /app/share/mame/roms +hashpath /app/share/mame/hash +samplepath /app/share/mame/samples +artpath /app/share/mame/artwork +ctrlrpath /app/share/mame/ctrlr +inipath $HOME/.mame +fontpath /app/bin/ +cheatpath /app/share/mame/cheat +crosshairpath /app/share/mame/crosshair +pluginspath /app/share/mame/plugins +languagepath /app/share/mame/language +swpath /app/share/mame/software + +# +# CORE OUTPUT DIRECTORY OPTIONS +# +cfg_directory $HOME/.mame/cfg +nvram_directory $HOME/.mame/nvram +input_directory $HOME/.mame/inp +state_directory $HOME/.mame/sta +snapshot_directory $HOME/.mame/snap +diff_directory $HOME/.mame/diff +comment_directory $HOME/.mame/comments +share_directory $HOME/.mame/share + +# +# OSD VIDEO OPTIONS +# +video opengl diff --git a/org.mamedev.MAME.yaml b/org.mamedev.MAME.yaml index 079f6b1..fd22ec9 100644 --- a/org.mamedev.MAME.yaml +++ b/org.mamedev.MAME.yaml @@ -22,11 +22,12 @@ modules: no-debuginfo: true strip: true build-commands: - - make #-j ${FLATPAK_BUILDER_N_JOBS} + - make -j ${FLATPAK_BUILDER_N_JOBS} - install -Dm 0755 mame /app/bin/mame - install -Dm 0644 ${FLATPAK_ID}.desktop /app/share/applications/${FLATPAK_ID}.desktop - install -Dm 0644 ${FLATPAK_ID}.metainfo.xml /app/share/metainfo/${FLATPAK_ID}.metainfo.xml - install -Dm 0644 mame128x128.png /app/share/icons/hicolor/128x128/apps/${FLATPAK_ID}.png + - install -Dm 0644 mame.ini /app/etc/mame/mame.ini - cp COPYING /app/bin/ - cp uismall.bdf /app/bin/ - mkdir -p /app/share/mame/ @@ -45,17 +46,17 @@ modules: - cp -r samples/ /app/share/mame/ sources: - type: archive - url: https://github.com/mamedev/mame/archive/refs/tags/mame0245.tar.gz - sha256: 3b6ea528c9b6d6a5bfec289c4c5ee0282eea00836f4c261336923597b89b95bc + url: https://github.com/mamedev/mame/archive/refs/tags/mame0246.tar.gz + sha256: 293c8f4b550694e0f6aa21165d7f7be9aa3a5284d957265c4e7469159a71b5d5 - type: file path: mame128x128.png - type: file path: org.mamedev.MAME.desktop - type: file path: org.mamedev.MAME.metainfo.xml + - type: file + path: mame.ini - type: patch path: use-system-lib-flac.patch - type: patch path: ldopts.patch - - type: patch - path: 0.245-asserts.patch