Merge branch 'blender-v2.83-release'

3 files changed, 33 insertions, 3 deletions

diff --git a/release/datafiles/colormanagement/config.ocio b/release/datafiles/colormanagement/config.ocio
index c224c2c3c2d..5ad937e3efb 100644
--- a/release/datafiles/colormanagement/config.ocio
+++ b/release/datafiles/colormanagement/config.ocio
@@ -33,9 +33,8 @@ roles:
   # Default color space sequencer is working in
   default_sequencer: sRGB
 
-  # Color spaces for color picking and texture painting (not internally supported yet)
+  # Distribution of colors in color picker
   color_picking: sRGB
-  texture_paint: Raw
 
   # Non-color data
   data: Non-Color
@@ -43,6 +42,13 @@ roles:
   # CIE XYZ color space
   XYZ: XYZ
 
+  # Specifed by OCIO, not used in Blender
+  color_timing: Filmic Log
+  compositing_log: Filmic Log
+  default: Linear
+  matte_paint: Linear
+  texture_paint: Linear
+
 displays:
   sRGB:
     - !<View> {name: Standard, colorspace: sRGB}
diff --git a/release/freedesktop/snap/blender-wrapper b/release/freedesktop/snap/blender-wrapper
new file mode 100755
index 00000000000..c116a4c2712
--- /dev/null
+++ b/release/freedesktop/snap/blender-wrapper
@@ -0,0 +1,19 @@
+# Disable ALSA and OSS as they are not available, and trying to initialize them
+# breaks sound in other apps. Use PulseAudio instead.
+export ALSOFT_DRIVERS=-oss,-alsa,
+export SDL_AUDIODRIVER=pulseaudio
+
+# Make PulseAudio socket available inside the snap-specific $XDG_RUNTIME_DIR
+# This is adapted from https://github.com/ubuntu/snapcraft-desktop-helpers,
+# in common/desktop-exports.
+mkdir -p $XDG_RUNTIME_DIR -m 700
+if [ -n "$XDG_RUNTIME_DIR" ]; then
+    pulsenative="pulse/native"
+    pulseaudio_sockpath="$XDG_RUNTIME_DIR/../$pulsenative"
+    if [ -S "$pulseaudio_sockpath" ]; then
+        export PULSE_SERVER="unix:${pulseaudio_sockpath}"
+    fi
+fi
+
+# Run Blender
+$SNAP/blender
diff --git a/release/freedesktop/snap/snapcraft.yaml.in b/release/freedesktop/snap/snapcraft.yaml.in
index a79d9ccc0a2..eb3ef97eba8 100644
--- a/release/freedesktop/snap/snapcraft.yaml.in
+++ b/release/freedesktop/snap/snapcraft.yaml.in
@@ -24,7 +24,7 @@ confinement: classic
 
 apps:
     blender:
-        command: ./blender
+        command: ./blender-wrapper
         desktop: ./blender.desktop
 
 version: '@VERSION@'
@@ -46,3 +46,8 @@ parts:
             - libxfixes3
             - libxrender1
             - libxxf86vm1
+    wrapper:
+        plugin: copy
+        source: .
+        files:
+            blender-wrapper: blender-wrapper