From ea8c0a6ccc9335702a358bf3ad5b08531b4c5721 Mon Sep 17 00:00:00 2001 From: Jason Flatt Date: Thu, 30 Jun 2022 10:24:10 -0700 Subject: [PATCH] Update to 0.245 release, removed multiple project licenses --- 0.244-ptrdiff_t.patch | 12 ------------ 0.244-selgame-assert-when-zero.patch | 13 ------------- README.md | 2 -- org.mamedev.MAME.metainfo.xml | 3 +-- org.mamedev.MAME.yaml | 8 ++------ 5 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 0.244-ptrdiff_t.patch delete mode 100644 0.244-selgame-assert-when-zero.patch diff --git a/0.244-ptrdiff_t.patch b/0.244-ptrdiff_t.patch deleted file mode 100644 index e3c0b16..0000000 --- a/0.244-ptrdiff_t.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/lib/netlist/plib/ppmf.h b/src/lib/netlist/plib/ppmf.h -index b188ca0c..e037fc28 100644 ---- a/src/lib/netlist/plib/ppmf.h -+++ b/src/lib/netlist/plib/ppmf.h -@@ -82,6 +82,7 @@ namespace plib { - - #include - #include // uintptr_t -+#include - #include - #include - diff --git a/0.244-selgame-assert-when-zero.patch b/0.244-selgame-assert-when-zero.patch deleted file mode 100644 index 9da8e3e..0000000 --- a/0.244-selgame-assert-when-zero.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/frontend/mame/ui/selgame.cpp b/src/frontend/mame/ui/selgame.cpp -index abda7047..89642d88 100644 ---- a/src/frontend/mame/ui/selgame.cpp -+++ b/src/frontend/mame/ui/selgame.cpp -@@ -164,7 +164,7 @@ void menu_select_game::menu_activated() - - void menu_select_game::handle(event const *ev) - { -- if (!m_prev_selected) -+ if (!m_prev_selected && item_count() > 0) - m_prev_selected = item(0).ref(); - - // if I have to select software, force software list submenu diff --git a/README.md b/README.md index b7c30e6..b5c59c9 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,6 @@ An explanation for some of the options included in the `org.mamedev.MAME.yaml' m Currently these are the patches applied: -`0.244-ptrdiff_t.patch` includes `` header to find `ptrdiff_t` type in the 0.244 release. - `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. diff --git a/org.mamedev.MAME.metainfo.xml b/org.mamedev.MAME.metainfo.xml index 3677320..c0a01ae 100644 --- a/org.mamedev.MAME.metainfo.xml +++ b/org.mamedev.MAME.metainfo.xml @@ -2,8 +2,7 @@ org.mamedev.MAME CC0-1.0 - GPL-2.0 - BSD-3-Clause + GPL-2.0-or-later MAME MAME is a multi-purpose emulation framework. diff --git a/org.mamedev.MAME.yaml b/org.mamedev.MAME.yaml index df8d0bb..0e79895 100644 --- a/org.mamedev.MAME.yaml +++ b/org.mamedev.MAME.yaml @@ -45,19 +45,15 @@ modules: - cp -r samples/ /app/share/mame/ sources: - type: archive - url: https://github.com/mamedev/mame/archive/refs/tags/mame0244.tar.gz - sha256: 843c917edc46008a27b439a1fc66fc12a27c84e55e08753b963789e5614cebf7 + url: https://github.com/mamedev/mame/archive/refs/tags/mame0245.tar.gz + sha256: 3b6ea528c9b6d6a5bfec289c4c5ee0282eea00836f4c261336923597b89b95bc - type: file path: mame128x128.png - type: file path: org.mamedev.MAME.desktop - type: file path: org.mamedev.MAME.metainfo.xml - - type: patch - path: 0.244-ptrdiff_t.patch - type: patch path: use-system-lib-flac.patch - type: patch path: ldopts.patch - - type: patch - path: 0.244-selgame-assert-when-zero.patch