Merge branch 'main' into main

README.md

@@ -53,6 +53,18 @@ 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"
+```
+
 ## Finding explicit Download IDs (for download_resolve.sh)
 #### Studio:
 

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 '24.08'
 sdk: org.freedesktop.Sdk
 finish-args:
   - --share=ipc
@@ -27,6 +27,8 @@ finish-args:
   - --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:

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,7 +4,7 @@
 ####
 app-id: com.blackmagic.ResolveStudio
 runtime: org.freedesktop.Platform
-runtime-version: &runtime-version '23.08'
+runtime-version: &runtime-version '24.08'
 sdk: org.freedesktop.Sdk
 finish-args:
   - --share=ipc
@@ -12,6 +12,8 @@ finish-args:
   - --socket=pulseaudio
   - --socket=x11
   - --device=dri
+  - --device=usb
+  - --usb=vnd:096e
   - --filesystem=xdg-desktop
   - --filesystem=xdg-documents
   - --filesystem=xdg-download
@@ -28,6 +30,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:

shell/setup_resolve.sh

@@ -46,8 +46,8 @@ 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"
 
 # Copy objects
 cp -rp squashfs-root/bin ${PREFIX}/