update

Author: Geocld

flatpak/io.github.Geocld.XStreaming.yml

@@ -1,9 +1,9 @@
-app-id: io.github.Geocld.XStreaming
+app-id: io.github.Geocld.XStreamingDesktop
 runtime: org.freedesktop.Platform
-runtime-version: '23.08'
+runtime-version: '24.08'
 sdk: org.freedesktop.Sdk
 base: org.electronjs.Electron2.BaseApp
-base-version: '23.08'
+base-version: '24.08'
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.node18
 command: run.sh
@@ -30,10 +30,15 @@ modules:
         npm_config_offline: 'true'
         yarn_config_cache: /run/build/XStreaming/flatpak-node/yarn-mirror
     build-commands:
-      - cp -a ../extralib/extralib -t /app/
-      - gunzip /app/extralib/libLLVM-16.0.6.so.gz
-      - cp -a ../extralib/reduceSoFiles.sh -t /app/extralib
-      - pushd /app/extralib && ln -s libLLVM-16.0.6.so libLLVM-16.so && chmod +x reduceSoFiles.sh && ./reduceSoFiles.sh && popd
+      - |
+        if [ "$FLATPAK_ARCH" = "x86_64" ]; then
+          cp -a ../extralib/extralib -t /app/
+          gunzip /app/extralib/libLLVM-16.0.6.so.gz
+          cp -a ../extralib/reduceSoFiles.sh -t /app/extralib
+          pushd /app/extralib && ln -s libLLVM-16.0.6.so libLLVM-16.so && chmod +x reduceSoFiles.sh && ./reduceSoFiles.sh && popd
+        else
+          echo "Skipping x86_64 specific libraries for $FLATPAK_ARCH architecture"
+        fi
       - yarn --offline
       - yarn run flatpak-build --offline -- --linux
       # Add icon, metadata and desktop file
@@ -59,6 +64,8 @@ modules:
         url: https://github.com/Originalimoc/amd-patched-mesa
         dest: extralib
         commit: "a70058baf35f1823613f2577c30a477e93cd106a"
+        only-arches:
+          - x86_64
       - yarn-sources.json
       - type: inline
         dest-filename: .yarnrc
@@ -69,9 +76,9 @@ modules:
       - type: script
         dest-filename: run.sh
         commands:
-          - export LIBGL_DRIVERS_PATH=/app/extralib/dri:/usr/lib/x86_64-linux-gnu/dri/intel-vaapi-driver:/usr/lib/x86_64-linux-gnu/GL/default/lib/dri/:${LIBGL_DRIVERS_PATH}
-          - export LIBVA_DRIVERS_PATH=/app/extralib/dri:/usr/lib/x86_64-linux-gnu/dri/intel-vaapi-driver:/usr/lib/x86_64-linux-gnu/GL/default/lib/dri/:${LIBVA_DRIVERS_PATH}
-          - export VK_ICD_FILENAMES=/app/extralib/icd.d/intel_icd.x86_64.json:/app/extralib/icd.d/radeon_icd.x86_64.json:/app/extralib/icd.d/virtio_icd.x86_64.json:/app/extralib/icd.d/intel_hasvk_icd.x86_64.json:/app/extralib/icd.d/lvp_icd.x86_64.json:${VK_ICD_FILENAMES}
+          - export LIBGL_DRIVERS_PATH=/app/extralib/dri:/usr/lib/$FLATPAK_ARCH-linux-gnu/dri:/usr/lib/$FLATPAK_ARCH-linux-gnu/GL/default/lib/dri/:${LIBGL_DRIVERS_PATH}
+          - export LIBVA_DRIVERS_PATH=/app/extralib/dri:/usr/lib/$FLATPAK_ARCH-linux-gnu/dri:/usr/lib/$FLATPAK_ARCH-linux-gnu/GL/default/lib/dri/:${LIBVA_DRIVERS_PATH}
+          - export VK_ICD_FILENAMES=/app/extralib/icd.d/intel_icd.$FLATPAK_ARCH.json:/app/extralib/icd.d/radeon_icd.$FLATPAK_ARCH.json:/app/extralib/icd.d/virtio_icd.$FLATPAK_ARCH.json:/app/extralib/icd.d/intel_hasvk_icd.$FLATPAK_ARCH.json:/app/extralib/icd.d/lvp_icd.$FLATPAK_ARCH.json:${VK_ICD_FILENAMES}
           - export LD_LIBRARY_PATH=/app/extralib:${LD_LIBRARY_PATH}
           - echo runtime LD_LIBRARY_PATH = $LD_LIBRARY_PATH
           - echo runtime ARCH = $(uname -m)-$(uname -s | tr '[:upper:]' '[:lower:]')

main/helpers/xcloudapi.ts

@@ -428,7 +428,7 @@ export default class xCloudApi {
             }
 
             const pattern = new RegExp(
-              /a=candidate:(?<foundation>\d+) (?<component>\d+) UDP (?<priority>\d+) (?<ip>[^\s]+) (?<port>\d+) (?<the_rest>.*)/
+              /^(?:a=)?candidate:(?<foundation>\d+) (?<component>\d+) (?<protocol>\w+) (?<priority>\d+) (?<ip>[^\s]+) (?<port>\d+) (?<the_rest>.*)/
             );
 
             const lst = [];