[gnome-sdk-images/gnome-3-22] Update to the new GL extension point settings

[Alexander Larsson <alexl src gnome org>]

commit f4346c964a9667ca7ca180088e1b335aa158b87f
Author: Alexander Larsson <alexl redhat com>
Date:   Thu Feb 2 14:07:46 2017 +0100

    Update to the new GL extension point settings

 metadata.platform.in |    8 +++++++-
 metadata.sdk.in      |    8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/metadata.platform.in b/metadata.platform.in
index 5676d69..09ba7b8 100644
--- a/metadata.platform.in
+++ b/metadata.platform.in
@@ -6,6 +6,13 @@ sdk=org.gnome.Sdk/@@SDK_ARCH@@/@@SDK_BRANCH@@
 [Extension org.freedesktop.Platform.GL]
 version=@@SDK_RUNTIME_VERSION@@
 directory=lib/GL
+subdirectories=true
+no-autodowload=true
+autodelete=true
+add-ld-path=lib
+merge-dirs=vulkan/icd.d;glvnd/egl_vendor.d
+download-if=active-gl-driver
+enable-if=active-gl-driver
 
 [Extension org.freedesktop.Platform.Timezones]
 version=@@SDK_RUNTIME_VERSION@@
@@ -19,4 +26,3 @@ subdirectories=true
 [Environment]
 GI_TYPELIB_PATH=/app/lib/girepository-1.0
 GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0:/usr/lib/extensions/gstreamer-1.0:/usr/lib/gstreamer-1.0
-LD_LIBRARY_PATH=/app/lib:/usr/lib/GL/lib
diff --git a/metadata.sdk.in b/metadata.sdk.in
index 7fb2d03..b036827 100644
--- a/metadata.sdk.in
+++ b/metadata.sdk.in
@@ -6,6 +6,13 @@ sdk=org.gnome.Sdk/@@SDK_ARCH@@/@@SDK_BRANCH@@
 [Extension org.freedesktop.Platform.GL]
 version=@@SDK_RUNTIME_VERSION@@
 directory=lib/GL
+subdirectories=true
+no-autodowload=true
+autodelete=true
+add-ld-path=lib
+merge-dirs=vulkan/icd.d;glvnd/egl_vendor.d
+download-if=active-gl-driver
+enable-if=active-gl-driver
 
 [Extension org.freedesktop.Platform.Timezones]
 version=@@SDK_RUNTIME_VERSION@@
@@ -19,4 +26,3 @@ subdirectories=true
 [Environment]
 GI_TYPELIB_PATH=/app/lib/girepository-1.0
 GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0:/usr/lib/extensions/gstreamer-1.0:/usr/lib/gstreamer-1.0
-LD_LIBRARY_PATH=/app/lib:/usr/lib/GL/lib