From f424cf68b11843a97d0408aab09caf82d36504d7 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 26 Jun 2024 17:36:50 +0900 Subject: [PATCH] TEST: trying to solve the libflac issue --- mame-module.yml | 10 +++++ manifest-header.yml | 3 +- net.retrodeck.mame.yml | 88 ------------------------------------------ 3 files changed, 12 insertions(+), 89 deletions(-) delete mode 100644 net.retrodeck.mame.yml diff --git a/mame-module.yml b/mame-module.yml index 6ecc83d..2c147ec 100644 --- a/mame-module.yml +++ b/mame-module.yml @@ -1,5 +1,15 @@ modules: + # needed for MAME suit (so chdman) + - name: libFLAC + buildsystem: cmake-ninja + config-opts: + - -Dbuildtype=release + sources: + - type: archive + url: https://downloads.xiph.org/releases/flac/flac-1.4.3.tar.xz + sha256: 6c58e69cd22348f441b861092b825e591d0b822e106de6eb0ee4d05d27205b70 + # https://github.com/flathub/org.mamedev.MAME/blob/master/org.mamedev.MAME.yaml - name: mame buildsystem: simple diff --git a/manifest-header.yml b/manifest-header.yml index d890a7e..5cf7d5b 100644 --- a/manifest-header.yml +++ b/manifest-header.yml @@ -1,6 +1,7 @@ app-id: net.retrodeck.mame runtime: org.kde.Platform -runtime-version: "6.7" +# runtime-version: "6.5" +runtime-version: 5.15-23.08 # maybe solving the libflac issue? sdk: org.kde.Sdk command: /app/bin/mame diff --git a/net.retrodeck.mame.yml b/net.retrodeck.mame.yml deleted file mode 100644 index b0274b0..0000000 --- a/net.retrodeck.mame.yml +++ /dev/null @@ -1,88 +0,0 @@ -app-id: net.retrodeck.mame -runtime: org.kde.Platform -runtime-version: "6.5" -sdk: org.kde.Sdk -sdk-extensions: - - org.freedesktop.Sdk.Extension.llvm16 -command: /app/bin/mame - -finish-args: - - --socket=fallback-x11 - - --socket=wayland - - --socket=pulseaudio - - --share=ipc - - --share=network - - --device=all - - --filesystem=home - - --filesystem=/run/media - - --filesystem=/media - - --filesystem=home/.var/app/com.valvesoftware.Steam - - --allow=multiarch - - --talk-name=org.freedesktop.ScreenSaver - - --talk-name=org.freedesktop.PowerManagement.Inhibit - - --talk-name=org.freedesktop.login1.Manager - - --talk-name=org.freedesktop.portal.Flatpak.UpdateMonitor - - --filesystem=xdg-run/app/com.discordapp.Discord:create - #- --filesystem=xdg-config/gtk-3.0:ro #not needed as we got --filesystem=home - # Dolphin - - --allow=bluetooth - # PPSSPP - # It allows an SDL application to specify its window class, which can be useful for window managers and desktop environments to identify and group similar windows - - --env=SDL_VIDEO_X11_WMCLASS=net.retrodeck.mame - - --env=SDL_VIDEO_WAYLAND_WMCLASS=net.retrodeck.mame - # XEMU - Fixes issues with openSUSE systems, QEMU_AUDIO_DRV is defined as "pa" causing xemu to not launch - - --unset-env=QEMU_AUDIO_DRV - -modules: - - # https://sdlmame.wallyweek.org/download/ - - name: mame - buildsystem: simple - build-options: - no-debuginfo: true - strip: true - env: - CC: clang - CXX: clang++ - LD: lld - build-commands: - - make - -j ${FLATPAK_BUILDER_N_JOBS} - CFLAGS+=-Wno-error=restrict - USE_QTDEBUG=0 - USE_WAYLAND=1 - TOOLS=1 - 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 0755 chdman ${FLATPAK_DEST}/bin/chdman - - 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/ - - install -Dm 0644 mame.ini ${FLATPAK_DEST}/share/mame/ini/mame.ini - - 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/mame0261.tar.gz - sha256: 51d5ce1563897709ceb7a924c31a70cc5ff2bec466aab8d0cc9ff3cc72b38899 - - type: file - path: mame-patches/mame.ini - - type: patch - path: mame-patches/floppy.patch - - type: patch - path: mame-patches/sound.patch - - type: patch - path: mame-patches/ym3802.patch