[gnome-build-meta/abderrahim/openh264] sync extensions with freedesktop-sdk

[Abderrahim Kitouni <akitouni src gnome org>]

commit 07783d443f475ee9b7bd51357fc35dad8c136754
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Tue Sep 17 13:19:52 2019 +0100

    sync extensions with freedesktop-sdk
    
    Fixes #204

 elements/flatpak-platform-extensions.bst | 3 +++
 elements/flatpak/platform.bst            | 9 ++++++++-
 elements/flatpak/sdk.bst                 | 8 +++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/elements/flatpak-platform-extensions.bst b/elements/flatpak-platform-extensions.bst
index d82d5000..7c5bac50 100644
--- a/elements/flatpak-platform-extensions.bst
+++ b/elements/flatpak-platform-extensions.bst
@@ -6,6 +6,9 @@ depends:
 - filename: flatpak-images/mesa.bst
   junction: freedesktop-sdk.bst
   type: build
+- filename: flatpak-images/platform-openh264-conditional.bst
+  junction: freedesktop-sdk.bst
+  type: build
 - filename: deploy-tools/flatpak.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/flatpak/platform.bst b/elements/flatpak/platform.bst
index 20a6ed6c..589bc8a6 100644
--- a/elements/flatpak/platform.bst
+++ b/elements/flatpak/platform.bst
@@ -43,7 +43,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;vulkan/explicit_layer.d"
       download-if: "active-gl-driver"
       enable-if: "active-gl-driver"
 
@@ -54,6 +54,7 @@ config:
     Extension org.freedesktop.Platform.GStreamer:
       directory: lib/extensions/gstreamer-1.0
       subdirectories: 'true'
+      no-autodownload: 'true'
       version: '%{freedesktop-sdk-flatpak-branch}'
 
     Extension org.freedesktop.Platform.Icontheme:
@@ -74,5 +75,11 @@ config:
       directory: '%{lib}/dri/intel-vaapi-driver'
       autodelete: 'false'
       no-autodownload: 'true'
+      add-ld-path: lib
       download-if: have-intel-gpu
       version: '%{freedesktop-sdk-flatpak-branch}'
+
+    Extension org.freedesktop.Platform.openh264:
+      directory: '%{lib}/openh264'
+      add-ld-path: extra
+      autodelete: 'false'
diff --git a/elements/flatpak/sdk.bst b/elements/flatpak/sdk.bst
index b898ee80..0134911f 100644
--- a/elements/flatpak/sdk.bst
+++ b/elements/flatpak/sdk.bst
@@ -55,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;lib/d3d"
+      merge-dirs: "vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors;lib/dri;lib/d3d;vulkan/explicit_layer.d"
       download-if: "active-gl-driver"
       enable-if: "active-gl-driver"
 
@@ -66,6 +66,7 @@ config:
     Extension org.freedesktop.Platform.GStreamer:
       directory: lib/extensions/gstreamer-1.0
       subdirectories: 'true'
+      no-autodownload: 'true'
       version: '%{freedesktop-sdk-flatpak-branch}'
 
     Extension org.freedesktop.Platform.Icontheme:
@@ -82,6 +83,11 @@ config:
       version: '3.22'
       download-if: active-gtk-theme
 
+    Extension org.freedesktop.Platform.openh264:
+      directory: '%{lib}/openh264'
+      add-ld-path: extra
+      version: '%{freedesktop-sdk-flatpak-branch}'
+
     Extension org.freedesktop.Sdk.Extension:
       subdirectories: 'true'
       directory: lib/sdk