[gnome-build-meta/abderrahim/freedesktop-sdk-18.08.19-3.30] flatpak-runtimes: sync with freedesktop-sdk

[Abderrahim Kitouni <akitouni src gnome org>]

commit ac919bb6f431896597f111f4c11c7d76abca83ad
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Fri Nov 16 14:21:02 2018 +0100

    flatpak-runtimes: sync with freedesktop-sdk
    
    (cherry picked from commit 76f7feda57515c10b9a5c41e8b0d191cc8f6b0a2)

 elements/flatpak/platform.bst | 56 ++++++++++++++++++------------------
 elements/flatpak/sdk.bst      | 66 +++++++++++++++++++++----------------------
 elements/sdk-platform.bst     |  6 ++++
 3 files changed, 67 insertions(+), 61 deletions(-)
---
diff --git a/elements/flatpak/platform.bst b/elements/flatpak/platform.bst
index 8481928..1a488e6 100644
--- a/elements/flatpak/platform.bst
+++ b/elements/flatpak/platform.bst
@@ -28,49 +28,49 @@ config:
     # 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
-    'Extension org.freedesktop.Platform.GL':
-      versions: "18.08;1.6;1.4"
+    Extension org.freedesktop.Platform.GL:
+      versions: "18.08;1.4"
       version: "1.4"
       directory: "%{lib}/GL"
       subdirectories: "true"
       no-autodownload: "true"
       autodelete: "false"
       add-ld-path: "lib"
-      merge-dirs: "vulkan/icd.d;glvnd/egl_vendor.d"
+      merge-dirs: "vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors"
       download-if: "active-gl-driver"
       enable-if: "active-gl-driver"
 
-    'Extension org.freedesktop.Platform.Timezones':
-      directory: "share/zoneinfo"
+    Extension org.freedesktop.Platform.Timezones:
+      directory: share/zoneinfo
       version: 18.08
 
-    'Extension org.freedesktop.Platform.GStreamer':
-      directory: "lib/extensions/gstreamer-1.0"
-      subdirectories: "true"
+    Extension org.freedesktop.Platform.GStreamer:
+      directory: lib/extensions/gstreamer-1.0
+      subdirectories: 'true'
       version: 18.08
 
-    'Extension org.freedesktop.Platform.Icontheme':
-      directory: "share/runtime/share/icons"
-      subdirectories: "true"
-      no-autodownload: "true"
-      version: "1.0"
+    Extension org.freedesktop.Platform.Icontheme:
+      directory: share/runtime/share/icons
+      subdirectories: 'true'
+      no-autodownload: 'true'
+      version: '1.0'
 
-    'Extension org.gtk.Gtk3theme':
-      directory: "share/runtime/share/themes"
-      subdirectories: "true"
-      subdirectory-suffix: "gtk-3.0"
-      no-autodownload: "true"
-      version: "3.22"
+    Extension org.gtk.Gtk3theme:
+      directory: share/runtime/share/themes
+      subdirectories: 'true'
+      subdirectory-suffix: gtk-3.0
+      no-autodownload: 'true'
+      version: '3.22'
 
-    'Extension org.freedesktop.Platform.VAAPI.Intel':
-      directory: "%{lib}/dri/intel-vaapi-driver"
-      autodelete: "false"
-      no-autodownload: "true"
-      download-if: "have-intel-gpu"
+    Extension org.freedesktop.Platform.VAAPI.Intel:
+      directory: '%{lib}/dri/intel-vaapi-driver'
+      autodelete: 'false'
+      no-autodownload: 'true'
+      download-if: have-intel-gpu
       version: 18.08
 
-    'Extension org.freedesktop.Platform.html5-codecs':
-      directory: "%{lib}/ffmpeg"
-      add-ld-path: "lib"
-      autodelete: "false"
+    Extension org.freedesktop.Platform.html5-codecs:
+      directory: '%{lib}/ffmpeg'
+      add-ld-path: lib
+      autodelete: 'false'
       version: 18.08
diff --git a/elements/flatpak/sdk.bst b/elements/flatpak/sdk.bst
index afb0254..a1153f9 100644
--- a/elements/flatpak/sdk.bst
+++ b/elements/flatpak/sdk.bst
@@ -40,56 +40,56 @@ config:
     # When syncing, skip the Debug, Docs and Locale extensions, and
     # add the freedesktop-sdk version to extensions that don't have
     # a version.
-    'Extension org.freedesktop.Platform.GL':
-      versions: "18.08;1.6;1.4"
+    Extension org.freedesktop.Platform.GL:
+      versions: "18.08;1.4"
       version: "1.4"
       directory: "%{lib}/GL"
       subdirectories: "true"
       no-autodownload: "true"
       autodelete: "false"
       add-ld-path: "lib"
-      merge-dirs: "vulkan/icd.d;glvnd/egl_vendor.d"
+      merge-dirs: "vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors"
       download-if: "active-gl-driver"
       enable-if: "active-gl-driver"
 
-    'Extension org.freedesktop.Platform.Timezones':
-      directory: "share/zoneinfo"
+    Extension org.freedesktop.Platform.Timezones:
+      directory: share/zoneinfo
       version: 18.08
 
-    'Extension org.freedesktop.Platform.GStreamer':
-      directory: "lib/extensions/gstreamer-1.0"
-      subdirectories: "true"
+    Extension org.freedesktop.Platform.GStreamer:
+      directory: lib/extensions/gstreamer-1.0
+      subdirectories: 'true'
       version: 18.08
 
-    'Extension org.freedesktop.Platform.Icontheme':
-      directory: "share/runtime/share/icons"
-      subdirectories: "true"
-      no-autodownload: "true"
-      version: "1.0"
+    Extension org.freedesktop.Platform.Icontheme:
+      directory: share/runtime/share/icons
+      subdirectories: 'true'
+      no-autodownload: 'true'
+      version: '1.0'
 
-    'Extension org.gtk.Gtk3theme':
-      directory: "share/runtime/share/themes"
-      subdirectories: "true"
-      subdirectory-suffix: "gtk-3.0"
-      no-autodownload: "true"
-      version: "3.22"
-      download-if: "active-gtk-theme"
+    Extension org.gtk.Gtk3theme:
+      directory: share/runtime/share/themes
+      subdirectories: 'true'
+      subdirectory-suffix: gtk-3.0
+      no-autodownload: 'true'
+      version: '3.22'
+      download-if: active-gtk-theme
 
-    'Extension org.freedesktop.Platform.html5-codecs':
-      directory: "%{lib}/ffmpeg"
-      add-ld-path: "lib"
+    Extension org.freedesktop.Platform.html5-codecs:
+      directory: '%{lib}/ffmpeg'
+      add-ld-path: lib
       version: 18.08
 
-    'Extension org.freedesktop.Sdk.Extension':
-      subdirectories: "true"
-      directory: "lib/sdk"
-      no-autodownload: "true"
-      add-ld-path: "lib"
+    Extension org.freedesktop.Sdk.Extension:
+      subdirectories: 'true'
+      directory: lib/sdk
+      no-autodownload: 'true'
+      add-ld-path: lib
       version: 18.08
 
-    'Extension org.freedesktop.Platform.VAAPI.Intel':
-      directory: "%{lib}/dri/intel-vaapi-driver"
-      autodelete: "false"
-      no-autodownload: "true"
-      download-if: "have-intel-gpu"
+    Extension org.freedesktop.Platform.VAAPI.Intel:
+      directory: '%{lib}/dri/intel-vaapi-driver'
+      autodelete: 'false'
+      no-autodownload: 'true'
+      download-if: have-intel-gpu
       version: 18.08
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index 2125ff9..a2b58b2 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -86,6 +86,8 @@ depends:
   junction: freedesktop-sdk.bst
 - filename: desktop/ffmpeg.bst
   junction: freedesktop-sdk.bst
+- filename: desktop/fftw.bst
+  junction: freedesktop-sdk.bst
 - filename: desktop/flatpak-xdg-utils.bst
   junction: freedesktop-sdk.bst
 - filename: desktop/fontconfig.bst
@@ -112,6 +114,8 @@ depends:
   junction: freedesktop-sdk.bst
 - filename: desktop/lame.bst
   junction: freedesktop-sdk.bst
+- filename: desktop/libclc.bst
+  junction: freedesktop-sdk.bst
 - filename: desktop/libdatrie.bst
   junction: freedesktop-sdk.bst
 - filename: desktop/libdrm.bst
@@ -124,6 +128,8 @@ depends:
   junction: freedesktop-sdk.bst
 - filename: desktop/libproxy.bst
   junction: freedesktop-sdk.bst
+- filename: desktop/libpsl.bst
+  junction: freedesktop-sdk.bst
 - filename: desktop/libseccomp.bst
   junction: freedesktop-sdk.bst
 - filename: desktop/libthai.bst