[gnome-build-meta/abderrahim/fdsdk-20.08.1-38: 1/3] flatpak/{platform, sdk}.bst: sync with freedesktop-sdk

[Abderrahim Kitouni <akitouni src gnome org>]

commit 9b0506404c418a168d4049affbdc1da0706f1f7e
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Thu Oct 8 11:00:53 2020 +0100

    flatpak/{platform,sdk}.bst: sync with freedesktop-sdk
    
    Fixes #333

 elements/flatpak/platform.bst | 16 +++++++++-------
 elements/flatpak/sdk.bst      | 19 ++++++++++---------
 2 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/elements/flatpak/platform.bst b/elements/flatpak/platform.bst
index db8bed68d..8fef8abf0 100644
--- a/elements/flatpak/platform.bst
+++ b/elements/flatpak/platform.bst
@@ -1,10 +1,7 @@
 kind: flatpak_image
-depends:
-- filename: flatpak/platform-image.bst
-  type: build
-- filename: integration/platform-integration.bst
-  junction: freedesktop-sdk.bst
-  type: build
+build-depends:
+- flatpak/platform-image.bst
+- freedesktop-sdk.bst:integration/platform-integration.bst
 
 variables:
   # Obtain the versions of the flatpak extensions
@@ -16,6 +13,7 @@ config:
   - debug
   - docs
   - locale
+
   metadata:
     Runtime:
       name: org.gnome.Platform
@@ -26,6 +24,8 @@ config:
       GI_TYPELIB_PATH: /app/lib/girepository-1.0
       GST_PLUGIN_SYSTEM_PATH: 
/app/lib/gstreamer-1.0:/usr/lib/extensions/gstreamer-1.0:%{libdir}/gstreamer-1.0
       XDG_DATA_DIRS: /app/share:/usr/share:/usr/share/runtime/share:/run/host/user-share:/run/host/share
+      ALSA_CONFIG_DIR: /usr/share/alsa
+      ALSA_CONFIG_PATH: /usr/share/alsa/alsa-flatpak.conf
 
     Extension org.gnome.Platform.Locale:
       directory: share/runtime/locale
@@ -46,6 +46,7 @@ config:
       merge-dirs: "vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors;lib/dri;lib/d3d;vulkan/explicit_layer.d"
       download-if: "active-gl-driver"
       enable-if: "active-gl-driver"
+      autoprune-unless: active-gl-driver
 
     Extension org.freedesktop.Platform.Timezones:
       directory: share/zoneinfo
@@ -78,9 +79,10 @@ config:
       add-ld-path: lib
       download-if: have-intel-gpu
       version: '%{freedesktop-sdk-flatpak-branch}'
+      autoprune-unless: have-intel-gpu
 
     Extension org.freedesktop.Platform.openh264:
       directory: '%{lib}/openh264'
+      version: '2.0'
       add-ld-path: extra
       autodelete: 'false'
-      version: '2.0'
diff --git a/elements/flatpak/sdk.bst b/elements/flatpak/sdk.bst
index 238176a64..920954943 100644
--- a/elements/flatpak/sdk.bst
+++ b/elements/flatpak/sdk.bst
@@ -1,13 +1,8 @@
 kind: flatpak_image
-depends:
-- filename: flatpak/sdk-image.bst
-  type: build
-- filename: integration/sdk-integration.bst
-  junction: freedesktop-sdk.bst
-  type: build
-- filename: integration/linker-debuginfo.bst
-  junction: freedesktop-sdk.bst
-  type: build
+build-depends:
+- flatpak/sdk-image.bst
+- freedesktop-sdk.bst:integration/sdk-integration.bst
+- freedesktop-sdk.bst:integration/linker-debuginfo.bst
 
 variables:
   # Obtain the versions of the flatpak extensions
@@ -19,6 +14,7 @@ config:
   - debug
   - docs
   - locale
+
   metadata:
     Runtime:
       name: org.gnome.Sdk
@@ -29,6 +25,8 @@ config:
       GI_TYPELIB_PATH: /app/lib/girepository-1.0
       GST_PLUGIN_SYSTEM_PATH: 
/app/lib/gstreamer-1.0:/usr/lib/extensions/gstreamer-1.0:%{libdir}/gstreamer-1.0
       XDG_DATA_DIRS: /app/share:/usr/share:/usr/share/runtime/share:/run/host/user-share:/run/host/share
+      ALSA_CONFIG_DIR: /usr/share/alsa
+      ALSA_CONFIG_PATH: /usr/share/alsa/alsa-flatpak.conf
 
     Extension org.gnome.Sdk.Debug:
       directory: lib/debug
@@ -58,6 +56,7 @@ config:
       merge-dirs: "vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors;lib/dri;lib/d3d;vulkan/explicit_layer.d"
       download-if: "active-gl-driver"
       enable-if: "active-gl-driver"
+      autoprune-unless: active-gl-driver
 
     Extension org.freedesktop.Platform.Timezones:
       directory: share/zoneinfo
@@ -87,6 +86,7 @@ config:
       directory: '%{lib}/openh264'
       add-ld-path: extra
       version: '2.0'
+      autodelete: 'false'
 
     Extension org.freedesktop.Sdk.Extension:
       subdirectories: 'true'
@@ -101,6 +101,7 @@ config:
       no-autodownload: 'true'
       download-if: have-intel-gpu
       version: '%{freedesktop-sdk-flatpak-branch}'
+      autoprune-unless: have-intel-gpu
 
     (?):
     - arch in ["x86_64", "aarch64"]: