From f3f3ebc5e2a2049eef93c5f52eb971bc7081a132 Mon Sep 17 00:00:00 2001 From: Stelios Tsampas Date: Thu, 21 Mar 2024 01:43:02 +0200 Subject: [PATCH 1/3] Fix fake reaper splitting input with spaces --- umu/reaper | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/umu/reaper b/umu/reaper index ada7c1b7..ac62cde5 100755 --- a/umu/reaper +++ b/umu/reaper @@ -1,5 +1,7 @@ #!/usr/bin/env sh # Fake reaper file to avoid errors while running from source -args="$*" -cmd=${args#* -- } -$cmd \ No newline at end of file +while [ "$1" != "--" ]; do + shift +done +shift +"$@" From 64caafc17b0fbd3180c937638767859c46ae5dda Mon Sep 17 00:00:00 2001 From: Stelios Tsampas Date: Thu, 21 Mar 2024 02:02:08 +0200 Subject: [PATCH 2/3] Use main repo version for reaper, since the module is tracked by the repo already --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0c414821..db281072 100644 --- a/Makefile.in +++ b/Makefile.in @@ -29,8 +29,8 @@ endif umu/umu_version.json: umu/umu_version.json.in $(info :: Updating $(@) ) cp $(<) $(<).tmp - sed 's|##umu_version##|$(shell git describe --always --long --tags)|g' -i $(<).tmp - sed 's|##REAPER_VERSION##|$(shell git -C subprojects/reaper describe --always --long --tags)|g' -i $(<).tmp + sed 's|##UMU_VERSION##|$(shell git describe --always --long --tags)|g' -i $(<).tmp + sed 's|##REAPER_VERSION##|$(shell git describe --always --long --tags)|g' -i $(<).tmp mv $(<).tmp $(@) .PHONY: version From 4b19aef6203eb2817f8fa532af57779216022069 Mon Sep 17 00:00:00 2001 From: Stelios Tsampas Date: Thu, 21 Mar 2024 11:20:29 +0200 Subject: [PATCH 3/3] Fix packaging issues due to rename --- Makefile.in | 2 +- .../org.openwinecomponents.umu.launcher.yml | 183 ------------------ umu/umu_version.json.in | 4 +- 3 files changed, 3 insertions(+), 186 deletions(-) delete mode 100644 flatpak/org.openwinecomponents.umu.launcher.yml diff --git a/Makefile.in b/Makefile.in index db281072..3c64857a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -141,7 +141,7 @@ release: $(RELEASEDIR) | version $(info :: Creating source distribution for release ) mkdir -p $(<) rm -rf umu/__pycache__ - cp -r umu flatpak subprojects Makefile.in configure.sh README.md LICENSE $(<) + cp -r umu packaging subprojects Makefile.in configure.sh README.md LICENSE $(<) tar -cvzf $(<).tar.gz $(<) diff --git a/flatpak/org.openwinecomponents.umu.launcher.yml b/flatpak/org.openwinecomponents.umu.launcher.yml deleted file mode 100644 index fc30c8a1..00000000 --- a/flatpak/org.openwinecomponents.umu.launcher.yml +++ /dev/null @@ -1,183 +0,0 @@ -id: org.openwinecomponents.umu.launcher -runtime: org.freedesktop.Platform -runtime-version: &runtime-version '23.08' -x-gl-version: &gl-version '1.4' -x-gl-versions: &gl-versions 23.08;23.08-extra;1.4 -x-gl-merge-dirs: &gl-merge-dirs vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors;lib/dri;lib/d3d;vulkan/explicit_layer.d;vulkan/implicit_layer.d -sdk: org.freedesktop.Sdk -command: umu-run -separate-locales: false - -sdk-extensions: - - org.freedesktop.Sdk.Compat.i386 - - org.freedesktop.Sdk.Extension.toolchain-i386 - -finish-args: - - --allow=devel - - --allow=multiarch - - --device=all - - --allow=bluetooth - - --allow=per-app-dev-shm - - --env=PATH=/app/bin:/app/utils/bin:/usr/bin:/usr/lib/extensions/vulkan/MangoHud/bin:/usr/lib/extensions/vulkan/gamescope/bin:/usr/lib/extensions/vulkan/OBSVkCapture/bin - - --filesystem=xdg-data/lutris:rw - - --filesystem=xdg-data/Steam:rw - - --filesystem=xdg-data/applications:rw - - --filesystem=~/.steam:rw - - --filesystem=~/Games:rw - - --filesystem=~/.local/share:rw - - --filesystem=~/.var/app/com.valvesoftware.Steam:rw - - --filesystem=~/.var/app/org.openwinecomponents.umu.launcher:rw - - --filesystem=xdg-documents - - --filesystem=xdg-desktop - - --env=TZ= - - --unset-env=TZ - - --env=LC_ADDRESS=C - - --env=LC_COLLATE=C - - --env=LC_MONETARY=C - - --env=LC_MEASUREMENT=C - - --env=LC_NAME=C - - --env=LC_NUMERIC=C - - --env=LC_TELEPHONE=C - - --env=SDL_VIDEODRIVER= - - --unset-env=SDL_VIDEODRIVER - - --env=DBUS_FATAL_WARNINGS=0 - - --env=XDG_CONFIG_DIRS=/etc/xdg:/usr/lib/x86_64-linux-gnu/GL:/usr/lib/i386-linux-gnu/GL - # Wine uses UDisks2 to enumerate disk drives - - --system-talk-name=org.freedesktop.UDisks2 - # should fix access to SD card on the deck - - --filesystem=/run/media - # There are still quite a few users using /mnt/ for external drives - - --filesystem=/mnt - # should fix steamdeck controler navigation - - --filesystem=/run/udev:ro - # should fix discord rich presence - - --filesystem=xdg-run/app/com.discordapp.Discord:create - - --persist=. - - --share=ipc - - --socket=wayland - - --socket=x11 - - --socket=pulseaudio - - --share=network - - --talk-name=org.freedesktop.Notifications - - --talk-name=org.kde.StatusNotifierWatcher - # Required for bwrap to work - - --talk-name=org.freedesktop.portal.Background - -add-extensions: - org.freedesktop.Platform.Compat.i386: - directory: lib/i386-linux-gnu - version: *runtime-version - - org.freedesktop.Platform.Compat.i386.Debug: - directory: lib/debug/lib/i386-linux-gnu - version: *runtime-version - no-autodownload: true - - org.freedesktop.Platform.GL32: - directory: lib/i386-linux-gnu/GL - version: *gl-version - versions: *gl-versions - subdirectories: true - no-autodownload: true - autodelete: false - add-ld-path: lib - merge-dirs: *gl-merge-dirs - download-if: active-gl-driver - enable-if: active-gl-driver - autoprune-unless: active-gl-driver - - org.freedesktop.Platform.GL32.Debug: - directory: lib/debug/lib/i386-linux-gnu/GL - version: *gl-version - versions: *gl-versions - subdirectories: true - no-autodownload: true - merge-dirs: *gl-merge-dirs - enable-if: active-gl-driver - autoprune-unless: active-gl-driver - - org.freedesktop.Platform.VAAPI.Intel.i386: - directory: lib/i386-linux-gnu/dri/intel-vaapi-driver - version: *runtime-version - versions: *runtime-version - autodelete: false - no-autodownload: true - add-ld-path: lib - download-if: have-intel-gpu - autoprune-unless: have-intel-gpu - - org.freedesktop.Platform.ffmpeg-full: - directory: lib/ffmpeg - add-ld-path: . - version: *runtime-version - no-autodownload: true - autodelete: false - - org.freedesktop.Platform.ffmpeg_full.i386: - directory: lib32/ffmpeg - add-ld-path: . - version: *runtime-version - no-autodownload: true - autodelete: false - - com.valvesoftware.Steam.CompatibilityTool: - subdirectories: true - directory: share/steam/compatibilitytools.d - version: stable - versions: stable;beta;test - no-autodownload: true - autodelete: true - - com.valvesoftware.Steam.Utility: - subdirectories: true - directory: utils - version: stable - versions: stable;beta;test - add-ld-path: lib - merge-dirs: bin;lib/python3.10/site-packages;share/vulkan/explicit_layer.d;share/vulkan/implicit_layer.d;share/steam/compatibilitytools.d; - no-autodownload: true - autodelete: true - -modules: - # --- umu --- - - name: umu-run - buildsystem: simple - build-commands: - - install -D umu-run-cli /app/bin/umu-run - - install -D umu-launcher.tar.gz /app/share/umu/umu-launcher.tar.gz - sources: - - type: file - path: umu-run-cli - - type: file - url: https://github.com/Open-Wine-Components/umu-launcher/releases/download/0.1-RC3/umu-launcher.tar.gz - sha256: e25c4dd0636d04e7c8c534cf3c5bbdca5ae0d49f146ee8395306174700899952 - - - name: platform-bootstrap - buildsystem: simple - build-commands: - - | - set -e - mkdir -p /app/bin - mkdir -p /app/lib/i386-linux-gnu - mkdir -p /app/lib/i386-linux-gnu/GL - mkdir -p /app/lib/i386-linux-gnu/dri/intel-vaapi-driver - mkdir -p /app/lib/debug/lib/i386-linux-gnu - mkdir -p /app/lib/debug/lib/i386-linux-gnu/GL - install -Dm644 -t /app/etc ld.so.conf - mkdir -p /app/lib{,32}/ffmpeg - mkdir -p /app/share/steam/compatibilitytools.d - mkdir -p /app/utils /app/share/vulkan - ln -srv /app/{utils/,}share/vulkan/explicit_layer.d - ln -srv /app/{utils/,}share/vulkan/implicit_layer.d - mkdir -p /app/links/lib - ln -srv /app/lib /app/links/lib/x86_64-linux-gnu - ln -srv /app/lib32 /app/links/lib/i386-linux-gnu - sources: - - type: inline - dest-filename: ld.so.conf - contents: | - # We just make any GL32 extension have higher priority - include /run/flatpak/ld.so.conf.d/app-*-org.freedesktop.Platform.GL32.*.conf - /app/lib32 - /app/lib/i386-linux-gnu - /lib64 diff --git a/umu/umu_version.json.in b/umu/umu_version.json.in index a8a5bdcb..473089e1 100644 --- a/umu/umu_version.json.in +++ b/umu/umu_version.json.in @@ -1,8 +1,8 @@ { "umu": { "versions": { - "launcher": "##umu_version##", - "runner": "##umu_version##", + "launcher": "##UMU_VERSION##", + "runner": "##UMU_VERSION##", "runtime_platform": "sniper_platform_0.20240125.75305", "reaper": "##REAPER_VERSION##", "pressure_vessel": "v0.20240212.0"