Putting this back, initial configuration failed

2025-01-31 16:05:37 +00:00 · 2022-08-01 12:48:39 -07:00 · 2022-08-01 12:48:39 -07:00 · 658cc63c36
parent b3e5dcd93f
commit 658cc63c36
3 changed files with 33 additions and 73 deletions
--- a/README.md
+++ b/README.md
@ -33,7 +33,3 @@ 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.
--- a/mame.ini
+++ b/mame.ini
@ -1,33 +0,0 @@
-#
-# 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;/app/share/mame/ini
-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
--- a/org.mamedev.MAME.yaml
+++ b/org.mamedev.MAME.yaml
@ -23,40 +23,37 @@ modules:
      strip: true
    build-commands:
      - 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/bin/mame.ini
-      - cp COPYING /app/bin/
-      - cp uismall.bdf /app/bin/
-      - mkdir -p /app/share/mame/
-      - cp -r artwork/ /app/share/mame/
-      - cp -r bgfx/ /app/share/mame/
-      - cp -r ctrlr/ /app/share/mame/
-      - mkdir -p /app/share/mame/docs/
-      - cp -r docs/legal/ /app/share/mame/docs/
-      - cp -r docs/man/ /app/share/mame/docs
-      - cp -r hash/ /app/share/mame/
-      - cp -r hlsl/ /app/share/mame/
-      - cp -r ini/ /app/share/mame/
-      - cp -r language/ /app/share/mame/
-      - cp -r plugins/ /app/share/mame/
-      - cp -r roms/ /app/share/mame/
-      - cp -r samples/ /app/share/mame/
+      - 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
+      - install -Dm 0644 mame128x128.png ${FLATPAK_DEST}/share/icons/hicolor/128x128/apps/${FLATPAK_ID}.png
+      - cp COPYING ${FLATPAK_DEST}/bin/
+      - cp uismall.bdf ${FLATPAK_DEST}/bin/
+      - mkdir -p ${FLATPAK_DEST}/share/mame/
+      - cp -r artwork/ ${FLATPAK_DEST}/share/mame/
+      - cp -r bgfx/ ${FLATPAK_DEST}/share/mame/
+      - cp -r ctrlr/ ${FLATPAK_DEST}/share/mame/
+      - mkdir -p ${FLATPAK_DEST}/share/mame/docs/
+      - cp -r docs/legal/ ${FLATPAK_DEST}/share/mame/docs/
+      - cp -r docs/man/ ${FLATPAK_DEST}/share/mame/docs
+      - cp -r hash/ ${FLATPAK_DEST}/share/mame/
+      - cp -r hlsl/ ${FLATPAK_DEST}/share/mame/
+      - cp -r ini/ ${FLATPAK_DEST}/share/mame/
+      - cp -r language/ ${FLATPAK_DEST}/share/mame/
+      - cp -r plugins/ ${FLATPAK_DEST}/share/mame/
+      - cp -r roms/ ${FLATPAK_DEST}/share/mame/
+      - cp -r samples/ ${FLATPAK_DEST}/share/mame/
    sources:
-    - type: archive
-      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: archive
+        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: patch
+        path: use-system-lib-flac.patch
+      - type: patch
+        path: ldopts.patch