Fixed some paths, added some modules, code cleanup.

This commit is contained in:
XargonWan 2022-03-23 17:12:26 +01:00
parent 058d0256a4
commit 1874f8c331

View file

@ -2,8 +2,8 @@ app-id: com.xargon.retrodeck
runtime: org.kde.Platform runtime: org.kde.Platform
runtime-version: '5.15-21.08' runtime-version: '5.15-21.08'
sdk: org.kde.Sdk sdk: org.kde.Sdk
command: retrodeck.sh #command: /app/retrodeck/retrodeck.sh
# command: retroarch command: retroarch
finish-args: finish-args:
- --socket=x11 - --socket=x11
@ -17,7 +17,8 @@ finish-args:
- --talk-name=org.freedesktop.ScreenSaver - --talk-name=org.freedesktop.ScreenSaver
- --talk-name=org.freedesktop.PowerManagement.Inhibit - --talk-name=org.freedesktop.PowerManagement.Inhibit
- --talk-name=org.freedesktop.login1 - --talk-name=org.freedesktop.login1
#- --env=PATH=/app/bin:/usr/bin:/app/usr/bin #- --env=LD_LIBRARY_PATH=/app/lib
#- --env=PATH=/app/bin:/usr/bin
modules: modules:
@ -31,14 +32,28 @@ modules:
url: https://github.com/refi64/unappimage url: https://github.com/refi64/unappimage
commit: d7f86f2a0d7ec3a69211125207d5f127386b849a commit: d7f86f2a0d7ec3a69211125207d5f127386b849a
- name: rsync
buildsystem: autotools
config-opts:
- --disable-zstd
- --disable-xxhash
- --disable-md2man
sources:
- type: git
url: https://github.com/WayneD/rsync.git
tag: v3.2.3
commit: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
cleanup:
- /share/man
- name: retroarch - name: retroarch
buildsystem: simple buildsystem: simple
build-commands: build-commands:
- ls -l
- pwd
- unappimage ./RetroArch-Linux-x86_64.AppImage - unappimage ./RetroArch-Linux-x86_64.AppImage
- mv ./squashfs-root/usr /app/usr - ls -ln ./squashfs-root/usr/bin/
- ln -s /app/usr/bin/retroarch /app/bin/retroarch - rsync -avPr --ignore-existing --remove-source-files ./squashfs-root/usr/ /app/
- mkdir -p /app/retrodeck/retroarch/.config
- mv RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/* /app/retrodeck/retroarch/.config/
cleanup: cleanup:
- RetroArch-Linux-x86_64.AppImage* - RetroArch-Linux-x86_64.AppImage*
sources: sources:
@ -48,13 +63,10 @@ modules:
- name: retroarch-assets - name: retroarch-assets
builsystem: simple builsystem: simple
#no-autogen: true
make-install-args: make-install-args:
- PREFIX=/app - PREFIX=/app
post-install: post-install:
- mkdir -p /app/config/retroarch/assets/ - cp -rf ./* /app/retrodeck/retroarch/.config/assets/
- mv -f ./* /app/config/retroarch/assets/
#- rm -f Automatic/README.md
cleanup: ['*'] cleanup: ['*']
sources: sources:
- type: archive - type: archive
@ -85,7 +97,7 @@ modules:
- name: retroarch-cores - name: retroarch-cores
buildsystem: simple buildsystem: simple
build-commands: build-commands:
- install -Dm755 ./RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores/* -t /var/config/retroarch/cores - cp ./RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores/* /app/retrodeck/retroarch/.config/cores/
cleanup: cleanup:
- RetroArch_cores.7z - RetroArch_cores.7z
sources: sources:
@ -107,9 +119,9 @@ modules:
buildsystem: simple buildsystem: simple
build-commands: build-commands:
- unappimage ./yuzu*.AppImage - unappimage ./yuzu*.AppImage
- mkdir -p /app/retrodeck/emulators/yuzu - mkdir -p /app/retrodeck/yuzu
- mv ./squashfs-root /app/retrodeck/emulators/yuzu - mv ./squashfs-root /app/retrodeck/yuzu
- ln -s ./usr/bin/yuzu /app/usr/bin - ln -s ./usr/bin/yuzu /app/bin
# TODO: see how are the files and implement, edit the yuzu.sh script # TODO: see how are the files and implement, edit the yuzu.sh script
cleanup: ['*'] cleanup: ['*']
sources: sources:
@ -192,25 +204,25 @@ modules:
# TODO 351elec-es-packages batocera-config batocera-scraper batocera-settings runemu.py setsettings.py # TODO 351elec-es-packages batocera-config batocera-scraper batocera-settings runemu.py setsettings.py
- name: glibc #- name: glibc
buildsystem: simple # buildsystem: simple
build-commands: # build-commands:
- tar --use-compress-program=unzstd -xvf glibc-2.35-3-x86_64.pkg.tar.zst # - tar --use-compress-program=unzstd -xvf glibc-2.35-3-x86_64.pkg.tar.zst
- cp -r usr/lib/* /app/lib/ # - cp -r usr/lib/* /app/lib/
cleanup: ['*'] # cleanup: ['*']
sources: # sources:
- type: file # - type: file
path: glibc-2.35-3-x86_64.pkg.tar.zst # path: glibc-2.35-3-x86_64.pkg.tar.zst
- name: lib32-glibc #- name: lib32-glibc
buildsystem: simple # buildsystem: simple
build-commands: # build-commands:
- tar --use-compress-program=unzstd -xvf lib32-glibc-2.35-3-x86_64.pkg.tar.zst # - tar --use-compress-program=unzstd -xvf lib32-glibc-2.35-3-x86_64.pkg.tar.zst
- cp -r usr/lib/* /app/lib/ # - cp -r usr/lib/* /app/lib/
cleanup: ['*'] # cleanup: ['*']
sources: # sources:
- type: file # - type: file
path: lib32-glibc-2.35-3-x86_64.pkg.tar.zst # path: lib32-glibc-2.35-3-x86_64.pkg.tar.zst
- name: retrodeck - name: retrodeck
buildsystem: simple buildsystem: simple
@ -331,20 +343,17 @@ modules:
- install -Dm755 es_* -t /app/emulationstation - install -Dm755 es_* -t /app/emulationstation
- pwd - rm -f /app/retrodeck/retroarch/.config/retroarch.cfg
- ls -l - mv retroarch.cfg /app/retrodeck/retroarch/.config/
- rm -f /var/config/retroarch/retroarch.cfg
- mkdir -p /var/config/retroarch
#- mv retroarch.cfg /var/config/retroarch/ - not working, looking for a fix
- install -Dm755 emulationstation -t /app/emulationstation - install -Dm755 emulationstation -t /app/emulationstation
- ln -s /app/emulationstation/emulationstation /app/bin/emulationstation - ln -s /app/emulationstation/emulationstation /app/bin/emulationstation
- mkdir -p /app/retrodeck/storage/.config/ - mkdir -p /app/retrodeck/.config/
- touch /app/retrodeck/storage/.config/.OS_ARCH - touch /app/retrodeck/.config/.OS_ARCH
- echo "DECK" >> /app/retrodeck/storage/.config/.OS_ARCH - echo "DECK" >> /app/retrodeck/.config/.OS_ARCH
- cp lib*.so.* /app/lib/ #- cp lib*.so.* /app/lib/
# move other files (check old install script) # move other files (check old install script)
cleanup: ['*'] cleanup: ['*']
@ -363,39 +372,39 @@ modules:
path: retroarch.cfg path: retroarch.cfg
- type: dir - type: dir
path: emulationstation path: emulationstation
- type: file #- type: file
path: libfreeimage.so.3 # path: libfreeimage.so.3
- type: file #- type: file
path: libvlc.so.5 # path: libvlc.so.5
- type: file #- type: file
path: libGLU.so.1 # path: libGLU.so.1
- type: file #- type: file
path: libjpeg.so.8 # path: libjpeg.so.8
- type: file #- type: file
path: libjxrglue.so.0 # path: libjxrglue.so.0
- type: file #- type: file
path: libOpenEXR-3_1.so.30 # path: libOpenEXR-3_1.so.30
- type: file #- type: file
path: libIex-3_1.so.30 # path: libIex-3_1.so.30
- type: file #- type: file
path: libImath-3_1.so.29 # path: libImath-3_1.so.29
- type: file #- type: file
path: libraw.so.20 # path: libraw.so.20
- type: file #- type: file
path: libvlccore.so.9 # path: libvlccore.so.9
- type: file #- type: file
path: libjpegxr.so.0 # path: libjpegxr.so.0
- type: file #- type: file
path: libIlmThread-3_1.so.30 # path: libIlmThread-3_1.so.30
- type: file #- type: file
path: libjasper.so.4 # path: libjasper.so.4
- type: file #- type: file
path: libidn.so.12 # path: libidn.so.12
- type: file #- type: file
path: libc.so.6 # path: libc.so.6
- type: file #- type: file
path: libcurl.so.4 # path: libcurl.so.4
- type: file
path: ld-linux-x86-64.so.2
# create desktop entry # create desktop entry