From fed9c34c4a802399392d6e4328e09b8ec723a348 Mon Sep 17 00:00:00 2001 From: Jason Flatt Date: Tue, 29 Nov 2022 07:36:51 -0800 Subject: [PATCH] Sync 0.250 --- org.mamedev.MAME.metainfo.xml | 1 + org.mamedev.MAME.yaml | 6 ++---- selgame.patch | 26 -------------------------- 3 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 selgame.patch diff --git a/org.mamedev.MAME.metainfo.xml b/org.mamedev.MAME.metainfo.xml index 4035c0b..7dae3c3 100644 --- a/org.mamedev.MAME.metainfo.xml +++ b/org.mamedev.MAME.metainfo.xml @@ -27,6 +27,7 @@ https://www.mamedev.org org.mamedev.MAME.desktop + diff --git a/org.mamedev.MAME.yaml b/org.mamedev.MAME.yaml index ea39f6c..9de7a82 100644 --- a/org.mamedev.MAME.yaml +++ b/org.mamedev.MAME.yaml @@ -57,8 +57,8 @@ modules: - cp -r samples/ ${FLATPAK_DEST}/share/mame/ sources: - type: archive - url: https://github.com/mamedev/mame/archive/refs/tags/mame0249.tar.gz - sha256: 93df1b954c2e6c0fe8b54b3662f642f77d7d460f42c0de0bac0b03ccb86756c4 + url: https://github.com/mamedev/mame/archive/refs/tags/mame0250.tar.gz + sha256: 949ec937b1df50af519f594d690832ca56342983f519b62a4be9c2c0b595d3ad - type: file path: mame16x16.png - type: file @@ -83,5 +83,3 @@ modules: path: floppy.patch - type: patch path: sound.patch - - type: patch - path: selgame.patch diff --git a/selgame.patch b/selgame.patch deleted file mode 100644 index 7702cda..0000000 --- a/selgame.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/frontend/mame/ui/selgame.cpp b/src/frontend/mame/ui/selgame.cpp -index 3ae7903b514..f944080fa9e 100644 ---- a/src/frontend/mame/ui/selgame.cpp -+++ b/src/frontend/mame/ui/selgame.cpp -@@ -423,13 +423,19 @@ void menu_select_game::populate(float &customtop, float &custombottom) - cloneof = false; - } - -- item_append(elem.description, cloneof ? FLAG_INVERT : 0, (void *)&info); -+ item_append(info.devicetype.empty() ? elem.description : info.longname, -+ cloneof ? FLAG_INVERT : 0, -+ (void *)&info); - } - else - { - if (old_item_selected == -1 && info.shortname == reselect_last::driver()) - old_item_selected = curitem; -- item_append(elem.description, info.devicetype, info.parentname.empty() ? 0 : FLAG_INVERT, (void *)&info); -+ -+ item_append(info.devicetype.empty() ? elem.description : info.longname, -+ info.devicetype, -+ info.parentname.empty() ? 0 : FLAG_INVERT, -+ (void *)&info); - } - curitem++; - });