[gnome-build-meta] Revert "flatpak/{sdk, platform}*: sync with freedesktop-sdk"

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 7758be7cb2336482600592ddc153028f1071ea8a
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sat Jun 22 12:45:52 2019 -0500

    Revert "flatpak/{sdk,platform}*: sync with freedesktop-sdk"
    
    This reverts commit b546259fd1650c1c3dfc5bb76aeb0733c354216f.

 elements/flatpak/platform-image.bst |  4 ----
 elements/flatpak/platform.bst       | 15 +++++++--------
 elements/flatpak/sdk-image.bst      |  5 ++++-
 elements/flatpak/sdk.bst            | 20 ++++++++------------
 elements/sdk-platform.bst           |  4 ++--
 5 files changed, 21 insertions(+), 27 deletions(-)
---
diff --git a/elements/flatpak/platform-image.bst b/elements/flatpak/platform-image.bst
index b9ab4cb1..40395d65 100644
--- a/elements/flatpak/platform-image.bst
+++ b/elements/flatpak/platform-image.bst
@@ -2,9 +2,6 @@ kind: compose
 depends:
 - filename: sdk-platform.bst
   type: build
-- filename: multiarch-platform.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: split-locales.bst
   junction: freedesktop-sdk.bst
   type: build
@@ -15,7 +12,6 @@ config:
   exclude:
   - devel
   - extra
-  - static
 public:
   bst:
     split-rules:
diff --git a/elements/flatpak/platform.bst b/elements/flatpak/platform.bst
index 330d15ed..62704708 100644
--- a/elements/flatpak/platform.bst
+++ b/elements/flatpak/platform.bst
@@ -27,26 +27,25 @@ config:
     # 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:
-      # 1.4 is for Nvidia drivers
-      versions: "19.08;1.4"
+      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;OpenCL/vendors;lib/dri"
+      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
-      version: 19.08
+      version: 18.08
 
     Extension org.freedesktop.Platform.GStreamer:
       directory: lib/extensions/gstreamer-1.0
       subdirectories: 'true'
-      version: 19.08
+      version: 18.08
 
     Extension org.freedesktop.Platform.Icontheme:
       directory: share/runtime/share/icons
@@ -67,10 +66,10 @@ config:
       autodelete: 'false'
       no-autodownload: 'true'
       download-if: have-intel-gpu
-      version: 19.08
+      version: 18.08
 
-    Extension org.freedesktop.Platform.ffmpeg-html5:
+    Extension org.freedesktop.Platform.html5-codecs:
       directory: '%{lib}/ffmpeg'
       add-ld-path: lib
       autodelete: 'false'
-      version: 19.08
+      version: 18.08
diff --git a/elements/flatpak/sdk-image.bst b/elements/flatpak/sdk-image.bst
index d1c5a18d..80d76c96 100644
--- a/elements/flatpak/sdk-image.bst
+++ b/elements/flatpak/sdk-image.bst
@@ -2,7 +2,7 @@ kind: compose
 depends:
 - filename: sdk.bst
   type: build
-- filename: multiarch-sdk.bst
+- filename: components/man-db-generate.bst
   junction: freedesktop-sdk.bst
   type: build
 - filename: split-locales.bst
@@ -14,6 +14,9 @@ depends:
 - filename: flatpak-builder-configuration.bst
   junction: freedesktop-sdk.bst
   type: build
+- filename: multiarch-debugdir.bst
+  junction: freedesktop-sdk.bst
+  type: build
 - filename: debug-app-link.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/flatpak/sdk.bst b/elements/flatpak/sdk.bst
index 973ad52f..05e6f513 100644
--- a/elements/flatpak/sdk.bst
+++ b/elements/flatpak/sdk.bst
@@ -2,9 +2,6 @@ kind: flatpak_image
 depends:
 - filename: flatpak/sdk-image.bst
   type: build
-- filename: linker-debuginfo.bst
-  junction: freedesktop-sdk.bst
-  type: build
 config:
   directory: '%{prefix}'
   exclude:
@@ -39,26 +36,25 @@ config:
     # add the freedesktop-sdk 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: "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;OpenCL/vendors;lib/dri"
+      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
-      version: 19.08
+      version: 18.08
 
     Extension org.freedesktop.Platform.GStreamer:
       directory: lib/extensions/gstreamer-1.0
       subdirectories: 'true'
-      version: 19.08
+      version: 18.08
 
     Extension org.freedesktop.Platform.Icontheme:
       directory: share/runtime/share/icons
@@ -74,21 +70,21 @@ config:
       version: '3.22'
       download-if: active-gtk-theme
 
-    Extension org.freedesktop.Platform.ffmpeg-html5:
+    Extension org.freedesktop.Platform.html5-codecs:
       directory: '%{lib}/ffmpeg'
       add-ld-path: lib
-      version: 19.08
+      version: 18.08
 
     Extension org.freedesktop.Sdk.Extension:
       subdirectories: 'true'
       directory: lib/sdk
       no-autodownload: 'true'
       add-ld-path: lib
-      version: 19.08
+      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
-      version: 19.08
+      version: 18.08
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index 5673762a..6d50aa50 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -143,8 +143,6 @@ depends:
   junction: freedesktop-sdk.bst
 - filename: components/libogg.bst
   junction: freedesktop-sdk.bst
-- filename: components/libnice.bst
-  junction: freedesktop-sdk.bst
 - filename: components/libpng.bst
   junction: freedesktop-sdk.bst
 - filename: components/libsamplerate.bst
@@ -323,6 +321,8 @@ depends:
   junction: freedesktop-sdk.bst
 - filename: components/mpg123.bst
   junction: freedesktop-sdk.bst
+- filename: components/multiarch-links.bst
+  junction: freedesktop-sdk.bst
 - filename: components/mythes.bst
   junction: freedesktop-sdk.bst
 - filename: components/openal.bst