[gnome-build-meta/jjardon/bst2: 3/12] flatpak-runtimes.bst: update for the bst2 version of the flatpak_repo plugin

[Javier Jardón <jjardon src gnome org>]

commit 4428f559f043bcde997a4438e18214b467f688ee
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Sat Mar 20 11:51:44 2021 +0100

    flatpak-runtimes.bst: update for the bst2 version of the flatpak_repo plugin

 elements/flatpak-platform-extensions.bst | 14 +++++---------
 elements/flatpak-runtimes.bst            | 31 +++++++++++++++++++------------
 2 files changed, 24 insertions(+), 21 deletions(-)
---
diff --git a/elements/flatpak-platform-extensions.bst b/elements/flatpak-platform-extensions.bst
index 0a178762a..dbe0707d2 100644
--- a/elements/flatpak-platform-extensions.bst
+++ b/elements/flatpak-platform-extensions.bst
@@ -2,21 +2,17 @@ kind: flatpak_repo
 
 build-depends:
 - core-deps/flatpak.bst
-- freedesktop-sdk.bst:flatpak-images/mesa.bst
-
-(?):
-- arch in ("i686", "x86_64"):
-    build-depends:
-      (>):
-      - freedesktop-sdk.bst:flatpak-images/platform-vaapi-intel.bst
+- filename:
+  - freedesktop-sdk.bst:flatpak-images/mesa.bst
+  - freedesktop-sdk.bst:flatpak-images/platform-vaapi.bst
+  config:
+    flatpak-image: true
 
 variables:
   # Obtain the versions of the flatpak extensions
   (@): freedesktop-sdk.bst:include/repo_branches.yml
 
 config:
-  environment:
-  - core-deps/flatpak.bst
   arch: '%{gcc_arch}'
   branch: '%{freedesktop-sdk-flatpak-branch}'
   repo-mode: bare-user-only
diff --git a/elements/flatpak-runtimes.bst b/elements/flatpak-runtimes.bst
index f8b8448b0..025428659 100644
--- a/elements/flatpak-runtimes.bst
+++ b/elements/flatpak-runtimes.bst
@@ -6,30 +6,37 @@ build-depends:
 - arch != 'i686':
     build-depends:
       (>):
-      - flatpak/platform.bst
-      - flatpak/platform-locale.bst
-      - flatpak/sdk.bst
-      - flatpak/sdk-debug.bst
-      - flatpak/sdk-docs.bst
-      - flatpak/sdk-locale.bst
+      - filename:
+        - flatpak/platform.bst
+        - flatpak/platform-locale.bst
+        - flatpak/sdk.bst
+        - flatpak/sdk-debug.bst
+        - flatpak/sdk-docs.bst
+        - flatpak/sdk-locale.bst
+        config:
+          flatpak-image: true
 
 # platform compat is only built on 32 bit
 - arch in ('i686', 'arm'):
     build-depends:
       (>):
-      - flatpak/platform-arch-libs.bst
-      - flatpak/platform-arch-libs-debug.bst
+      - filename:
+        - flatpak/platform-arch-libs.bst
+        - flatpak/platform-arch-libs-debug.bst
+        config:
+          flatpak-image: true
 
 # sdk compat is not built on x86_64
 - arch != 'x86_64':
     build-depends:
       (>):
-      - flatpak/sdk-arch-libs.bst
-      - flatpak/sdk-arch-libs-debug.bst
+      - filename:
+        - flatpak/sdk-arch-libs.bst
+        - flatpak/sdk-arch-libs-debug.bst
+        config:
+          flatpak-image: true
 
 config:
-  environment:
-  - core-deps/flatpak.bst
   arch: '%{gcc_arch}'
   branch: '%{flatpak-branch}'
   repo-mode: bare-user-only