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

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

commit 7b9450bff1347cc96ff7f5c2956e1da32eb4169a
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Sat Jan 15 13:28:58 2022 +0100

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

 elements/flatpak/platform.bst | 5 +++--
 elements/flatpak/sdk.bst      | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/elements/flatpak/platform.bst b/elements/flatpak/platform.bst
index 34a237c24..1c03fbd66 100644
--- a/elements/flatpak/platform.bst
+++ b/elements/flatpak/platform.bst
@@ -26,11 +26,12 @@ config:
       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
+      __EGL_EXTERNAL_PLATFORM_CONFIG_DIRS: 
/etc/egl/egl_external_platform.d:/usr/%{lib}/GL/egl/egl_external_platform.d:/usr/share/egl/egl_external_platform.d
 
     Extension org.gnome.Platform.Locale:
       directory: share/runtime/locale
 
-    # Copied from sdk/elements/platform.bst from freedesktop-sdk because
+    # Copied from elements/flatpak-images/platform.bst from freedesktop-sdk because
     # bst doesn't support inheriting extensions.
     # When syncing, skip the Locale extension, and add the freedesktop-sdk
     # version to extensions that don't have a version
@@ -43,7 +44,7 @@ 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;vulkan/implicit_layer.d"
+      merge-dirs: 
"vulkan/icd.d;glvnd/egl_vendor.d;egl/egl_external_platform.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
diff --git a/elements/flatpak/sdk.bst b/elements/flatpak/sdk.bst
index d9fc6ecb7..ef18e78e6 100644
--- a/elements/flatpak/sdk.bst
+++ b/elements/flatpak/sdk.bst
@@ -28,6 +28,7 @@ config:
       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
+      __EGL_EXTERNAL_PLATFORM_CONFIG_DIRS: 
/etc/egl/egl_external_platform.d:/usr/%{lib}/GL/egl/egl_external_platform.d:/usr/share/egl/egl_external_platform.d
 
     Extension org.gnome.Sdk.Debug:
       directory: lib/debug
@@ -40,7 +41,7 @@ config:
     Extension org.gnome.Sdk.Locale:
       directory: share/runtime/locale
 
-    # Copied from sdk/elements/sdk.bst from freedesktop-sdk because
+    # Copied from elements/flatpak-images/sdk.bst from freedesktop-sdk because
     # bst doesn't support inheriting extensions
     # When syncing, skip the Debug, Docs and Locale extensions, and
     # add the freedesktop-sdk version to extensions that don't have
@@ -54,7 +55,7 @@ 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;vulkan/implicit_layer.d"
+      merge-dirs: 
"vulkan/icd.d;glvnd/egl_vendor.d;egl/egl_external_platform.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