From dc189e107b7044dfebe196c9948689441f0d886d Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 23 Jul 2024 17:07:50 +0900 Subject: [PATCH] MANIFEST: moved component libraries into /app/retrodeck/lib --- net.retrodeck.retrodeck.yml | 48 ++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 0e45f759..19acc9fa 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -332,8 +332,8 @@ modules: - name: retrodeck-es-de buildsystem: simple build-commands: - - mkdir -p "${FLATPAK_DEST}/usr/local/lib" - - mv "files/lib/"* "${FLATPAK_DEST}/usr/local/lib" + - mkdir -p "${FLATPAK_DEST}/retrodeck/lib" + - mv "files/lib/"* "${FLATPAK_DEST}/retrodeck/lib" - cp -r files/* "${FLATPAK_DEST}" - chmod +x "${FLATPAK_DEST}/bin/"* sources: @@ -365,8 +365,8 @@ modules: - cp -r ./RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/* "${FLATPAK_DEST}/share/libretro/" - chmod +x ./*.AppImage - ./*.AppImage --appimage-extract - - mkdir -p "${FLATPAK_DEST}/usr/local/lib" - - mv "squashfs-root/usr/lib/"* "${FLATPAK_DEST}/usr/local/lib" + - mkdir -p "${FLATPAK_DEST}/retrodeck/lib" + - mv "squashfs-root/usr/lib/"* "${FLATPAK_DEST}/retrodeck/lib" - cp -r squashfs-root/usr/* "${FLATPAK_DEST}" sources: - type: archive @@ -446,8 +446,8 @@ modules: - name: retrodeck-ppsspp buildsystem: simple build-commands: - - mkdir -p "${FLATPAK_DEST}/usr/local/lib" - - mv "files/lib/"* "${FLATPAK_DEST}/usr/local/lib" + - mkdir -p "${FLATPAK_DEST}/retrodeck/lib" + - mv "files/lib/"* "${FLATPAK_DEST}/retrodeck/lib" - cp -r files/* "${FLATPAK_DEST}" - chmod +x "${FLATPAK_DEST}/bin/"* sources: @@ -467,8 +467,8 @@ modules: - chmod +x *.AppImage - ./*.AppImage --appimage-extract #- rm -f /app/lib/libselinux.so.1 # TODO this rfile is breaking the build, we need it? Error: cp: /app/lib/libselinux.so.1: no version information available (required by cp) - - mkdir -p "${FLATPAK_DEST}/usr/local/lib" - - mv "squashfs-root/usr/lib/"* "${FLATPAK_DEST}/usr/local/lib" + - mkdir -p "${FLATPAK_DEST}/retrodeck/lib" + - mv "squashfs-root/usr/lib/"* "${FLATPAK_DEST}/retrodeck/lib" - cp -r squashfs-root/usr/* "${FLATPAK_DEST}" sources: - type: file @@ -484,9 +484,9 @@ modules: - name: retrodeck-dolphin buildsystem: simple build-commands: - - mkdir -p "${FLATPAK_DEST}/usr/local/lib" + - mkdir -p "${FLATPAK_DEST}/retrodeck/lib" - rm -rf "files/lib/debug" - - mv "files/lib/"* "${FLATPAK_DEST}/usr/local/lib" + - mv "files/lib/"* "${FLATPAK_DEST}/retrodeck/lib" - cp -r files/* "${FLATPAK_DEST}" - chmod +x "${FLATPAK_DEST}/bin/"* sources: @@ -502,9 +502,9 @@ modules: - name: retrodeck-primehack buildsystem: simple build-commands: - - mkdir -p "${FLATPAK_DEST}/usr/local/lib" + - mkdir -p "${FLATPAK_DEST}/retrodeck/lib" - rm -rf "files/lib/debug" "files/lib/pkgconfig" # TODO: we need them? - - mv "files/lib/"* "${FLATPAK_DEST}/usr/local/lib" + - mv "files/lib/"* "${FLATPAK_DEST}/retrodeck/lib" - cp -r files/* "${FLATPAK_DEST}" - chmod +x "${FLATPAK_DEST}/bin/"* sources: @@ -522,9 +522,9 @@ modules: build-commands: - chmod +x *.AppImage - ./*.AppImage --appimage-extract - - mkdir -p "${FLATPAK_DEST}/usr/local/lib" + - mkdir -p "${FLATPAK_DEST}/retrodeck/lib" - mkdir -p ${FLATPAK_DEST}/lib/ffmpeg # Needed for a ffmpeg bufgix - - mv "squashfs-root/usr/lib/"* "${FLATPAK_DEST}/usr/local/lib" + - mv "squashfs-root/usr/lib/"* "${FLATPAK_DEST}/retrodeck/lib" - cp -r squashfs-root/usr/bin* "${FLATPAK_DEST}/bin" - cp -r squashfs-root/usr/share* "${FLATPAK_DEST}/share" #TODO: - cp -r squashfs-root/usr/optional* # maybe already included in flatpak runtime @@ -560,8 +560,8 @@ modules: build-commands: - chmod +x *.AppImage - ./*.AppImage --appimage-extract - - mkdir -p "${FLATPAK_DEST}/usr/local/lib" - - mv "squashfs-root/usr/lib/"* "${FLATPAK_DEST}/usr/local/lib" + - mkdir -p "${FLATPAK_DEST}/retrodeck/lib" + - mv "squashfs-root/usr/lib/"* "${FLATPAK_DEST}/retrodeck/lib" - cp -r squashfs-root/usr/* "${FLATPAK_DEST}" sources: - type: file @@ -578,9 +578,9 @@ modules: build-commands: - chmod +x *.AppImage - ./*.AppImage --appimage-extract - - mkdir -p "${FLATPAK_DEST}/usr/local/lib" + - mkdir -p "${FLATPAK_DEST}/retrodeck/lib" - rm -rf "squashfs-root/usr/lib/girepository-1.0" # causes issues, I think we already have this - - mv "squashfs-root/usr/lib/"* "${FLATPAK_DEST}/usr/local/lib" + - mv "squashfs-root/usr/lib/"* "${FLATPAK_DEST}/retrodeck/lib" - cp -r squashfs-root/usr/* "${FLATPAK_DEST}" #TODO: do we need this wrapper? squashfs-root/apprun-hooks/linuxdeploy-plugin-gtk.sh sources: @@ -618,9 +618,9 @@ modules: - name: retrodeck-solarus buildsystem: simple build-commands: - - mkdir -p "${FLATPAK_DEST}/usr/local/lib" + - mkdir -p "${FLATPAK_DEST}/retrodeck/lib" - rm -rf "files/lib/debug" "files/lib/pkgconfig" # TODO: we need them? - - mv "files/lib/"* "${FLATPAK_DEST}/usr/local/lib" + - mv "files/lib/"* "${FLATPAK_DEST}/retrodeck/lib" - cp -r files/* "${FLATPAK_DEST}" - chmod +x "${FLATPAK_DEST}/bin/"* sources: @@ -637,11 +637,11 @@ modules: - name: retrodeck-gzdoom buildsystem: simple build-commands: - - mkdir -p "${FLATPAK_DEST}/usr/local/lib" + - mkdir -p "${FLATPAK_DEST}/retrodeck/lib" - rm -rf files/lib/cmake - rm -rf files/lib/debug - rm -rf files/lib/pkgconfig - - mv "files/lib/"* "${FLATPAK_DEST}/usr/local/lib" + - mv "files/lib/"* "${FLATPAK_DEST}/retrodeck/lib" - cp -r files/* "${FLATPAK_DEST}" - chmod +x "${FLATPAK_DEST}/bin/"* sources: @@ -689,8 +689,8 @@ modules: build-commands: - chmod +x *.AppImage - ./*.AppImage --appimage-extract - - mkdir -p "${FLATPAK_DEST}/usr/local/lib" - - mv "squashfs-root/usr/lib/"* "${FLATPAK_DEST}/usr/local/lib" + - mkdir -p "${FLATPAK_DEST}/retrodeck/lib" + - mv "squashfs-root/usr/lib/"* "${FLATPAK_DEST}/retrodeck/lib" - cp -r squashfs-root/usr/* "${FLATPAK_DEST}/" sources: - type: file