[gnome-build-meta/abderrahim/extensions-41] flatpak/{platform, sdk}.bst: sync extensions with freedesktop-sdk

[Marge Bot <marge-bot src gnome org>]

commit 8e3315ea153a3c392ea4d16c4198eba9d1a4f804
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Mon Sep 27 13:43:42 2021 +0100

    flatpak/{platform,sdk}.bst: sync extensions with freedesktop-sdk
    
    Fixes #426
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1315>

 elements/flatpak/platform.bst | 12 ++++++++++--
 elements/flatpak/sdk.bst      | 12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/elements/flatpak/platform.bst b/elements/flatpak/platform.bst
index 8fef8abf0..34a237c24 100644
--- a/elements/flatpak/platform.bst
+++ b/elements/flatpak/platform.bst
@@ -43,11 +43,18 @@ config:
       no-autodownload: "true"
       autodelete: "false"
       add-ld-path: "lib"
-      merge-dirs: "vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors;lib/dri;lib/d3d;vulkan/explicit_layer.d"
+      merge-dirs: 
"vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors;lib/dri;lib/d3d;vulkan/explicit_layer.d;vulkan/implicit_layer.d"
       download-if: "active-gl-driver"
       enable-if: "active-gl-driver"
       autoprune-unless: active-gl-driver
 
+    Extension org.freedesktop.Platform.VulkanLayer:
+      version: "%{freedesktop-sdk-flatpak-branch}"
+      directory: "lib/extensions/vulkan"
+      subdirectories: "true"
+      no-autodownload: "true"
+      merge-dirs: "share/vulkan/implicit_layer.d;share/vulkan/explicit_layer.d;"
+
     Extension org.freedesktop.Platform.Timezones:
       directory: share/zoneinfo
       version: '%{freedesktop-sdk-flatpak-branch}'
@@ -78,11 +85,12 @@ config:
       no-autodownload: 'true'
       add-ld-path: lib
       download-if: have-intel-gpu
-      version: '%{freedesktop-sdk-flatpak-branch}'
       autoprune-unless: have-intel-gpu
+      version: '%{freedesktop-sdk-flatpak-branch}'
 
     Extension org.freedesktop.Platform.openh264:
       directory: '%{lib}/openh264'
+      versions: '2.0beta;2.0'
       version: '2.0'
       add-ld-path: extra
       autodelete: 'false'
diff --git a/elements/flatpak/sdk.bst b/elements/flatpak/sdk.bst
index 37161435f..d9fc6ecb7 100644
--- a/elements/flatpak/sdk.bst
+++ b/elements/flatpak/sdk.bst
@@ -54,11 +54,18 @@ config:
       no-autodownload: "true"
       autodelete: "false"
       add-ld-path: "lib"
-      merge-dirs: "vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors;lib/dri;lib/d3d;vulkan/explicit_layer.d"
+      merge-dirs: 
"vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors;lib/dri;lib/d3d;vulkan/explicit_layer.d;vulkan/implicit_layer.d"
       download-if: "active-gl-driver"
       enable-if: "active-gl-driver"
       autoprune-unless: active-gl-driver
 
+    Extension org.freedesktop.Platform.VulkanLayer:
+      version: "%{freedesktop-sdk-flatpak-branch}"
+      directory: "lib/extensions/vulkan"
+      subdirectories: "true"
+      no-autodownload: "true"
+      merge-dirs: "share/vulkan/implicit_layer.d;share/vulkan/explicit_layer.d;"
+
     Extension org.freedesktop.Platform.Timezones:
       directory: share/zoneinfo
       version: '%{freedesktop-sdk-flatpak-branch}'
@@ -86,6 +93,7 @@ config:
     Extension org.freedesktop.Platform.openh264:
       directory: '%{lib}/openh264'
       add-ld-path: extra
+      versions: '2.0beta;2.0'
       version: '2.0'
       autodelete: 'false'
 
@@ -101,8 +109,8 @@ config:
       autodelete: 'false'
       no-autodownload: 'true'
       download-if: have-intel-gpu
-      version: '%{freedesktop-sdk-flatpak-branch}'
       autoprune-unless: have-intel-gpu
+      version: '%{freedesktop-sdk-flatpak-branch}'
 
     (?):
     - arch in ["x86_64", "aarch64"]: