Merge pull request #4 from flathub/247-2

Remove ini patch

README.md

@@ -28,4 +28,4 @@ An explanation for some of the options included in the `org.mamedev.MAME.yaml' m
 
 ### Configuring
 
-Default ini paths include the home '\~/.mame' directory and two relative paths '.' and 'ini'.  The relative paths are not helpful inside the sandbox, and the '\~/.mame' contents shouldn't be overwritten with each new MAME release.  Instead the default ini search path is patched to '$HOME/.mame;/app/share/mame/ini'.  This will allow a default base ini in '/app/share/mame/ini/mame.ini' and can be overridden in '\~/.mame/mame.ini'.
+The default ini paths include the home `~/.mame` directory and two relative paths '.' and 'ini'.  The relative paths are not helpful inside the sandbox, and the `~/.mame` contents shouldn't be overwritten with each new MAME release.  Instead the default ini search path is patched to `$HOME/.mame;/app/share/mame/ini`.  This will allow a default base ini in `/app/share/mame/ini/mame.ini` and can be overridden in `~/.mame/mame.ini`.

inipath.patch

@@ -1,13 +0,0 @@
-diff --git a/src/osd/sdl/sdlmain.cpp b/src/osd/sdl/sdlmain.cpp
-index f238c7bd..dd6f2e4f 100644
---- a/src/osd/sdl/sdlmain.cpp
-+++ b/src/osd/sdl/sdlmain.cpp
-@@ -58,7 +58,7 @@
- #elif defined(SDLMAME_MACOSX)
- 	#define INI_PATH "$HOME/Library/Application Support/APP_NAME;$HOME/.APP_NAME;.;ini"
- #else
--	#define INI_PATH "$HOME/.APP_NAME;.;ini"
-+	#define INI_PATH "$HOME/.APP_NAME;/app/share/APP_NAME/ini"
- #endif // MACOSX
- #endif // INI_PATH
- 

org.mamedev.MAME.yaml

@@ -22,7 +22,11 @@ modules:
       no-debuginfo: true
       strip: true
     build-commands:
-      - make -j ${FLATPAK_BUILDER_N_JOBS} USE_SYSTEM_LIB_FLAC=1 LDOPTS=-Wl,-s
+      - make
+          -j ${FLATPAK_BUILDER_N_JOBS}
+          USE_SYSTEM_LIB_FLAC=1
+          SDL_INI_PATH='$$HOME/.APP_NAME;/app/share/APP_NAME/ini'
+          LDOPTS=-Wl,-s
       - install -Dm 0755 mame ${FLATPAK_DEST}/bin/mame
       - install -Dm 0644 ${FLATPAK_ID}.desktop ${FLATPAK_DEST}/share/applications/${FLATPAK_ID}.desktop
       - install -Dm 0644 ${FLATPAK_ID}.metainfo.xml ${FLATPAK_DEST}/share/metainfo/${FLATPAK_ID}.metainfo.xml
@@ -74,5 +78,3 @@ modules:
         path: org.mamedev.MAME.metainfo.xml
       - type: file
         path: mame.ini
-      - type: patch
-        path: inipath.patch