[gnome-build-meta/abderrahim/32bit-compat: 2/4] flatpak/*: sync with freedesktop-sdk

[Abderrahim Kitouni <akitouni src gnome org>]

commit b06379f013e3f208668d588d16c02d66ca2d9c90
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Sun Sep 1 15:32:56 2019 +0100

    flatpak/*: sync with freedesktop-sdk

 elements/flatpak/platform.bst | 3 +++
 elements/flatpak/sdk.bst      | 7 +++++--
 elements/sdk-platform.bst     | 4 ++--
 elements/sdk.bst              | 2 ++
 4 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/elements/flatpak/platform.bst b/elements/flatpak/platform.bst
index f9a73497..d2628784 100644
--- a/elements/flatpak/platform.bst
+++ b/elements/flatpak/platform.bst
@@ -2,6 +2,9 @@ kind: flatpak_image
 depends:
 - filename: flatpak/platform-image.bst
   type: build
+- filename: integration/platform-integration.bst
+  junction: freedesktop-sdk.bst
+  type: build
 
 variables:
   # Obtain the versions of the flatpak extensions
diff --git a/elements/flatpak/sdk.bst b/elements/flatpak/sdk.bst
index 6a4abea8..56040619 100644
--- a/elements/flatpak/sdk.bst
+++ b/elements/flatpak/sdk.bst
@@ -2,6 +2,9 @@ kind: flatpak_image
 depends:
 - filename: flatpak/sdk-image.bst
   type: build
+- filename: integration/sdk-integration.bst
+  junction: freedesktop-sdk.bst
+  type: build
 - filename: integration/linker-debuginfo.bst
   junction: freedesktop-sdk.bst
   type: build
@@ -52,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"
+      merge-dirs: "vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors;lib/dri;lib/d3d"
       download-if: "active-gl-driver"
       enable-if: "active-gl-driver"
 
@@ -81,7 +84,7 @@ config:
 
     Extension org.freedesktop.Platform.ffmpeg-html5:
       directory: '%{lib}/ffmpeg'
-      add-ld-path: lib
+      add-ld-path: "."
       version: '%{freedesktop-sdk-flatpak-branch}'
 
     Extension org.freedesktop.Sdk.Extension:
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index fc6278d8..4e6b9452 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -187,8 +187,6 @@ depends:
   junction: freedesktop-sdk.bst
 - filename: components/nsswitch-config.bst
   junction: freedesktop-sdk.bst
-- filename: components/openssh.bst
-  junction: freedesktop-sdk.bst
 - filename: components/opus.bst
   junction: freedesktop-sdk.bst
 - filename: components/osmesa.bst
@@ -325,6 +323,8 @@ depends:
   junction: freedesktop-sdk.bst
 - filename: components/opencl.bst
   junction: freedesktop-sdk.bst
+- filename: components/openssh.bst
+  junction: freedesktop-sdk.bst
 - filename: components/orc.bst
   junction: freedesktop-sdk.bst
 - filename: components/pciutils.bst
diff --git a/elements/sdk.bst b/elements/sdk.bst
index 39f19d3e..267f2012 100644
--- a/elements/sdk.bst
+++ b/elements/sdk.bst
@@ -85,6 +85,8 @@ depends:
   junction: freedesktop-sdk.bst
 - filename: components/wayland-protocols.bst
   junction: freedesktop-sdk.bst
+- filename: components/xdg-portal-interfaces.bst
+  junction: freedesktop-sdk.bst
 - filename: components/xorg-proto-xcb.bst
   junction: freedesktop-sdk.bst
 - filename: components/xorg-proto-xorgproto.bst