Add Resolve update helper

Rearrange filesystem permissions

.github/workflows/ci.yml

@@ -15,12 +15,16 @@ jobs:
       image: bilelmoussaoui/flatpak-github-actions:freedesktop-22.08
       options: --privileged
     steps:
+    - id: string
+      uses: ASzc/change-string-case-action@v6
+      with:
+        string: ${{ matrix.file }}
     - uses: actions/checkout@v3
       with:
         submodules: recursive
 
     - uses: flatpak/flatpak-github-actions/flatpak-builder@v6.1
       with:
-        bundle: com.blackmagic.${{ matrix.file }}
+        bundle: ${{ steps.string.outputs.lowercase }}.flatpak
         manifest-path: com.blackmagic.${{ matrix.file }}.yaml
         cache-key: flatpak-builder-${{ matrix.file }}-${{ github.sha }}

.gitignore

@@ -1,5 +1,6 @@
-build-dir
+.actrc
+.build-dir
 .idea
 venv
-repo
+.repo
-.flatpak-builder
+.flatpak-builder

README.md

@@ -53,6 +53,24 @@ flatpak build-bundle .repo resolve.flatpak com.blackmagic.ResolveStudio --runtim
 
 4. Enjoy.
 
+## udev rules (Resolve Studio)
+On some distros, you may need to add udev rules to enable Resolve Studio to access your USB licence key, otherwise Resolve will segfault at the "Checking Licences..." splash screen. An example udev rule is below:
+
+```
+# Allow Flatpak apps to access USB devices with vendor ID 096e (Feitan Technologies), needed by DaVinci Resolve Studio when using USB licence keys
+# Place this file in /etc/udev/rules.d/
+# Recommended file name: 99-davinci-usb.rules
+
+SUBSYSTEM=="usb", ATTR{idVendor}=="096e", TAG+="uaccess"
+SUBSYSTEM=="usb", ATTR{idVendor}=="096e", MODE="0664", GROUP="plugdev"
+```
+
+## Plugins
+Davinci Resolve Flatpak now supports bundling IOPlugins as Flatpak Extensions so they can be trivially installed.
+
+For an example; the publically available ffmpeg IOPlugin is available packaged as a Flatpak extension here:
+https://github.com/pobthebuilder/resolve-ffmpeg-plugin-flatpak
+
 ## Finding explicit Download IDs (for download_resolve.sh)
 #### Studio:
 

UPDATE-RESOLVE.md

@@ -0,0 +1,48 @@
+# DaVinci Resolve aktualisieren
+
+Im Ordner `resolve-flatpak` ausfuehren:
+
+```bash
+./update-resolve.sh
+```
+
+Das Skript aktualisiert die Bauanleitung, baut die neueste stabile
+Resolve-Version und aktualisiert danach die installierte Flatpak-Anwendung.
+
+## Einzelne Schritte
+
+Falls das Skript nicht funktioniert, koennen die folgenden Schritte einzeln
+ausgefuehrt werden.
+
+## 1. Bauanleitung aktualisieren
+
+```bash
+git fetch upstream main
+git merge --no-edit upstream/main
+git submodule update --init --recursive
+```
+
+## 2. Neueste stabile Resolve-Version bauen
+
+```bash
+flatpak-builder --install-deps-from=flathub --force-clean --repo=.repo .build-dir com.blackmagic.Resolve.yaml
+```
+
+Die neueste stabile Resolve-Version wird dabei automatisch ermittelt und
+heruntergeladen. Der Vorgang kann laenger dauern.
+
+## 3. Installierte Version aktualisieren
+
+```bash
+flatpak --user remote-modify --url="file://$(realpath .repo)" resolve-repo
+flatpak --user update com.blackmagic.Resolve
+```
+
+Die erste Zeile stellt sicher, dass `resolve-repo` auf den `.repo`-Ordner in
+diesem Projekt zeigt. Danach kann Resolve wie gewohnt gestartet werden.
+
+## Installierte Version kontrollieren
+
+```bash
+flatpak info com.blackmagic.Resolve
+```

com.blackmagic.Resolve.desktop

@@ -0,0 +1,22 @@
+[Desktop Entry]
+Type=Application
+Name=Davinci Resolve
+Icon=com.blackmagic.Resolve
+Exec=/app/bin/resolve.sh
+Actions=GetLogs;PanelSetup;RAWPlayer;RAWSpeedTest;
+
+[Desktop Action GetLogs]
+Exec=/app/scripts/script.getlogs.v4
+Name=Collect logs
+
+[Desktop Action PanelSetup]
+Exec="/app/DaVinci Resolve Panels Setup/DaVinci Resolve Panels Setup"
+Name=Resolve Panels Setup
+
+[Desktop Action RAWPlayer]
+Exec=/app/BlackmagicRAWPlayer/BlackmagicRAWPlayer
+Name=Blackmagic RAW Player
+
+[Desktop Action RAWSpeedTest]
+Exec=/app/BlackmagicRAWSpeedTest/BlackmagicRAWSpeedTest
+Name=Blackmagic RAW Speed Test

com.blackmagic.Resolve.yaml

@@ -4,7 +4,7 @@
 ####
 app-id: com.blackmagic.Resolve
 runtime: org.freedesktop.Platform
-runtime-version: &runtime-version '23.08'
+runtime-version: &runtime-version '25.08'
 sdk: org.freedesktop.Sdk
 finish-args:
   - --share=ipc
@@ -21,12 +21,15 @@ finish-args:
   - --filesystem=xdg-videos
   - --filesystem=/media
   - --filesystem=/run/media
+  - --filesystem=xdg-run/gvfs
   - --filesystem=/mnt
   - --persist=.local/share/DaVinciResolve
   - --persist=Videos/CacheClip
   - --persist=Videos/.gallery
   - --persist=Documents/BlackmagicDesign
   - --env=LD_PRELOAD=/lib/x86_64-linux-gnu/libglib-2.0.so.0 /lib/x86_64-linux-gnu/libgio-2.0.so.0 /lib/x86_64-linux-gnu/libgmodule-2.0.so.0 /lib/x86_64-linux-gnu/libgobject-2.0.so.0
+  - --env=RUSTICL_ENABLE=radeonsi,iris,nouveau
+#  - --env=OCL_ICD_VENDORS=rusticl.icd
 
 command: /app/bin/resolve.sh
 modules:
@@ -38,7 +41,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/besser82/libxcrypt.git
-        tag: v4.4.36
+        tag: v4.4.38
   - name: onetbb
     disabled: true
     buildsystem: cmake-ninja
@@ -48,7 +51,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/oneapi-src/oneTBB
-        tag: v2021.11.0
+        tag: v2022.2.0
 #  #Build libcxx and ship as a library with Resolve as BM is outdated and segfaults on some setups. Disabled by default.
 #  - name: libcxx
 #    disabled: true

com.blackmagic.ResolveStudio.desktop

@@ -0,0 +1,22 @@
+[Desktop Entry]
+Type=Application
+Name=Davinci Resolve Studio
+Icon=com.blackmagic.ResolveStudio
+Exec=/app/bin/resolve.sh
+Actions=GetLogs;PanelSetup;RAWPlayer;RAWSpeedTest;
+
+[Desktop Action GetLogs]
+Exec=/app/scripts/script.getlogs.v4
+Name=Collect logs
+
+[Desktop Action PanelSetup]
+Exec="/app/DaVinci Resolve Panels Setup/DaVinci Resolve Panels Setup"
+Name=Resolve Panels Setup
+
+[Desktop Action RAWPlayer]
+Exec=/app/BlackmagicRAWPlayer/BlackmagicRAWPlayer
+Name=Blackmagic RAW Player
+
+[Desktop Action RAWSpeedTest]
+Exec=/app/BlackmagicRAWSpeedTest/BlackmagicRAWSpeedTest
+Name=Blackmagic RAW Speed Test

com.blackmagic.ResolveStudio.yaml

@@ -4,14 +4,23 @@
 ####
 app-id: com.blackmagic.ResolveStudio
 runtime: org.freedesktop.Platform
-runtime-version: &runtime-version '23.08'
+runtime-version: &runtime-version '25.08'
 sdk: org.freedesktop.Sdk
+add-extensions:
+  com.blackmagic.ResolveStudio.ioplugin:
+    version: '1.0'
+    directory: IOPlugins
+    subdirectories: true
+    no-autodownload: true
+    autodelete: true
 finish-args:
   - --share=ipc
   - --share=network
   - --socket=pulseaudio
   - --socket=x11
   - --device=dri
+  - --device=usb
+  - --usb=vnd:096e
   - --filesystem=xdg-desktop
   - --filesystem=xdg-documents
   - --filesystem=xdg-download
@@ -28,6 +37,8 @@ finish-args:
   - --persist=Documents/BlackmagicDesign
   # https://www.reddit.com/r/Fedora/comments/12z32r1/davinci_resolve_libpango_undefined_symbol_g/
   # - --env=LD_PRELOAD=/lib/x86_64-linux-gnu/libglib-2.0.so.0 /lib/x86_64-linux-gnu/libgio-2.0.so.0 /lib/x86_64-linux-gnu/libgmodule-2.0.so.0 /lib/x86_64-linux-gnu/libgobject-2.0.so.0
+  - --env=RUSTICL_ENABLE=radeonsi,iris,nouveau
+#  - --env=OCL_ICD_VENDORS=rusticl.icd
 
 command: /app/bin/resolve.sh
 modules:
@@ -40,7 +51,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/besser82/libxcrypt.git
-        tag: v4.4.36
+        tag: v4.4.38
   - name: onetbb
     disabled: true
     buildsystem: cmake-ninja
@@ -50,7 +61,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/oneapi-src/oneTBB
-        tag: v2021.11.0
+        tag: v2022.2.0
   #Build libcxx and ship as a library with Resolve as BM is outdated and segfaults on some setups. Disabled by default.
   # - name: libcxx
   #  disabled: true

shell/setup_resolve.sh

@@ -46,8 +46,12 @@ find squashfs-root -type f -exec chmod a+r,u+w {} \;
 find squashfs-root -type d -exec chmod a+rx,u+w {} \;
 
 # Create directories
-mkdir -p ${PREFIX}/easyDCP ${PREFIX}/scripts ${PREFIX}/share ${PREFIX}/Fairlight ${PREFIX}/share/applications ${PREFIX}/share/icons/hicolor/128x128/apps ${PREFIX}/share/icons/hicolor/256x256/apps
+mkdir -p ${PREFIX}/easyDCP ${PREFIX}/scripts ${PREFIX}/share ${PREFIX}/Fairlight ${PREFIX}/share/applications ${PREFIX}/share/icons/hicolor/128x128/apps ${PREFIX}/share/icons/hicolor/256x256/apps "${PREFIX}/Apple Immersive/Calibration" "${PREFIX}/Extras"
-chmod 755 ${PREFIX}/easyDCP ${PREFIX}/scripts ${PREFIX}/share ${PREFIX}/Fairlight ${PREFIX}/share/applications ${PREFIX}/share/icons/hicolor/128x128/apps ${PREFIX}/share/icons/hicolor/256x256/apps
+chmod 755 ${PREFIX}/easyDCP ${PREFIX}/scripts ${PREFIX}/share ${PREFIX}/Fairlight ${PREFIX}/share/applications ${PREFIX}/share/icons/hicolor/128x128/apps ${PREFIX}/share/icons/hicolor/256x256/apps "${PREFIX}/Apple Immersive/Calibration" "${PREFIX}/Extras"
+
+# For extension points
+mkdir -p ${PREFIX}/IOPlugins
+chmod 755 ${PREFIX}/IOPlugins
 
 # Copy objects
 cp -rp squashfs-root/bin ${PREFIX}/

update-resolve.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+project_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+cd "$project_dir"
+
+echo "Aktualisiere die Flatpak-Bauanleitung ..."
+source_remote=origin
+if git remote get-url upstream >/dev/null 2>&1; then
+    source_remote=upstream
+fi
+git fetch "$source_remote" main
+git merge --no-edit "$source_remote/main"
+git submodule update --init --recursive
+
+echo "Baue die neueste stabile Version von DaVinci Resolve ..."
+flatpak-builder \
+    --install-deps-from=flathub \
+    --force-clean \
+    --repo=.repo \
+    .build-dir \
+    com.blackmagic.Resolve.yaml
+
+echo "Verbinde Flatpak mit dem lokalen Repository ..."
+repo_url="file://$(realpath .repo)"
+if flatpak --user remotes --columns=name | grep -Fxq resolve-repo; then
+    flatpak --user remote-modify --url="$repo_url" resolve-repo
+else
+    flatpak --user remote-add --no-gpg-verify resolve-repo "$repo_url"
+fi
+
+echo "Aktualisiere die installierte Anwendung ..."
+flatpak --user update --noninteractive com.blackmagic.Resolve
+
+echo "DaVinci Resolve wurde erfolgreich aktualisiert."