Merge branch 'main' into dev/ffmpeg-player

scripts/flatpak/com.orcaslicer.OrcaSlicer.yml

@@ -276,6 +276,12 @@ modules:
         sha256: 27b72ba2d5ff3d0a9814ad40d4cb88f8dc89a35491c0866d952473f8f9416b77
         dest: external-packages/Draco
 
+      # Assimp 5.4.3
+      - type: file
+        url: https://github.com/assimp/assimp/archive/refs/tags/v5.4.3.tar.gz
+        sha256: 66dfbaee288f2bc43172440a55d0235dfc7bf885dda6435c038e8000e79582cb
+        dest: external-packages/Assimp
+
       # OpenSSL 1.1.1w (GNOME SDK has 3.x; OrcaSlicer requires 1.1.x)
       - type: file
         url: https://github.com/openssl/openssl/archive/OpenSSL_1_1_1w.tar.gz
@@ -353,6 +359,7 @@ modules:
       - |
         cmake . -B build_flatpak \
           -DFLATPAK=ON \
+          -DORCA_TOOLS=ON \
           -DCMAKE_BUILD_TYPE=Release \
           -DCMAKE_PREFIX_PATH=/app \
           -DCMAKE_INSTALL_PREFIX=/app \
@@ -363,6 +370,13 @@ modules:
       - ./scripts/run_gettext.sh
       - cmake --build build_flatpak --target install -j$FLATPAK_BUILDER_N_JOBS
 
+      # Per-vendor preset caches. On the other platforms CI runs this script
+      # itself; the flatpak is built inside flatpak-builder and the generator
+      # only exists in here, so the swap is a build step instead, against the
+      # profiles the install above copied into /app.
+      - cmake --build build_flatpak --target generate_system_cache -j$FLATPAK_BUILDER_N_JOBS
+      - ./scripts/build_preset_cache.sh -n -b build_flatpak /app/share/OrcaSlicer/profiles
+
     cleanup:
       - /include
 
@@ -409,6 +423,9 @@ modules:
       - type: file
         path: ../run_gettext.sh
         dest: scripts
+      - type: file
+        path: ../build_preset_cache.sh
+        dest: scripts
 
       # AppData metainfo for GNOME Software & Co.
       - type: file