[gnome-build-meta/tristan/fdsdk-master-again] Flatpak elements: Refer to correct freedesktop-sdk extension versions

[Tristan Van Berkom <tvb src gnome org>]

commit 79ab557cf214bf4da16dcccdf296e404035dde26
Author: Tristan Van Berkom <tristan vanberkom codethink co uk>
Date:   Tue Jun 25 19:36:02 2019 +0900

    Flatpak elements: Refer to correct freedesktop-sdk extension versions
    
    Use the include file from freedesktop-sdk in order to obtain the
    correct versions automatically for the extensions our runtime
    requires.

 elements/flatpak/platform.bst | 15 ++++++++++-----
 elements/flatpak/sdk.bst      | 17 +++++++++++------
 2 files changed, 21 insertions(+), 11 deletions(-)
---
diff --git a/elements/flatpak/platform.bst b/elements/flatpak/platform.bst
index 330d15ed..f9a73497 100644
--- a/elements/flatpak/platform.bst
+++ b/elements/flatpak/platform.bst
@@ -2,6 +2,11 @@ kind: flatpak_image
 depends:
 - filename: flatpak/platform-image.bst
   type: build
+
+variables:
+  # Obtain the versions of the flatpak extensions
+  (@): freedesktop-sdk.bst:include/versions.yml
+
 config:
   directory: '%{prefix}'
   exclude:
@@ -28,7 +33,7 @@ config:
     # version to extensions that don't have a version
     Extension org.freedesktop.Platform.GL:
       # 1.4 is for Nvidia drivers
-      versions: "19.08;1.4"
+      versions: "%{freedesktop-sdk-flatpak-branch};1.4"
       version: "1.4"
       directory: "%{lib}/GL"
       subdirectories: "true"
@@ -41,12 +46,12 @@ config:
 
     Extension org.freedesktop.Platform.Timezones:
       directory: share/zoneinfo
-      version: 19.08
+      version: '%{freedesktop-sdk-flatpak-branch}'
 
     Extension org.freedesktop.Platform.GStreamer:
       directory: lib/extensions/gstreamer-1.0
       subdirectories: 'true'
-      version: 19.08
+      version: '%{freedesktop-sdk-flatpak-branch}'
 
     Extension org.freedesktop.Platform.Icontheme:
       directory: share/runtime/share/icons
@@ -67,10 +72,10 @@ config:
       autodelete: 'false'
       no-autodownload: 'true'
       download-if: have-intel-gpu
-      version: 19.08
+      version: '%{freedesktop-sdk-flatpak-branch}'
 
     Extension org.freedesktop.Platform.ffmpeg-html5:
       directory: '%{lib}/ffmpeg'
       add-ld-path: lib
       autodelete: 'false'
-      version: 19.08
+      version: '%{freedesktop-sdk-flatpak-branch}'
diff --git a/elements/flatpak/sdk.bst b/elements/flatpak/sdk.bst
index 973ad52f..12ad9621 100644
--- a/elements/flatpak/sdk.bst
+++ b/elements/flatpak/sdk.bst
@@ -5,6 +5,11 @@ depends:
 - filename: linker-debuginfo.bst
   junction: freedesktop-sdk.bst
   type: build
+
+variables:
+  # Obtain the versions of the flatpak extensions
+  (@): freedesktop-sdk.bst:include/versions.yml
+
 config:
   directory: '%{prefix}'
   exclude:
@@ -40,7 +45,7 @@ config:
     # a version.
     Extension org.freedesktop.Platform.GL:
       # 1.4 is for Nvidia drivers
-      versions: "19.08;1.4"
+      versions: "%{freedesktop-sdk-flatpak-branch};1.4"
       version: "1.4"
       directory: "%{lib}/GL"
       subdirectories: "true"
@@ -53,12 +58,12 @@ config:
 
     Extension org.freedesktop.Platform.Timezones:
       directory: share/zoneinfo
-      version: 19.08
+      version: '%{freedesktop-sdk-flatpak-branch}'
 
     Extension org.freedesktop.Platform.GStreamer:
       directory: lib/extensions/gstreamer-1.0
       subdirectories: 'true'
-      version: 19.08
+      version: '%{freedesktop-sdk-flatpak-branch}'
 
     Extension org.freedesktop.Platform.Icontheme:
       directory: share/runtime/share/icons
@@ -77,18 +82,18 @@ config:
     Extension org.freedesktop.Platform.ffmpeg-html5:
       directory: '%{lib}/ffmpeg'
       add-ld-path: lib
-      version: 19.08
+      version: '%{freedesktop-sdk-flatpak-branch}'
 
     Extension org.freedesktop.Sdk.Extension:
       subdirectories: 'true'
       directory: lib/sdk
       no-autodownload: 'true'
       add-ld-path: lib
-      version: 19.08
+      version: '%{freedesktop-sdk-flatpak-branch}'
 
     Extension org.freedesktop.Platform.VAAPI.Intel:
       directory: '%{lib}/dri/intel-vaapi-driver'
       autodelete: 'false'
       no-autodownload: 'true'
       download-if: have-intel-gpu
-      version: 19.08
+      version: '%{freedesktop-sdk-flatpak-branch}'