[gnome-sdk-images] Build using the new flatpak builder runtime support

[Alexander Larsson <alexl src gnome org>]

commit 3eab4411156755014f0b4ed773c84ca1b18c45c3
Author: Alexander Larsson <alexl redhat com>
Date:   Mon Feb 6 11:49:03 2017 +0100

    Build using the new flatpak builder runtime support

 Makefile              |    2 +-
 metadata.platform.in  |   28 ----------------------------
 metadata.sdk.in       |   28 ----------------------------
 org.gnome.Sdk.json.in |   28 +++++++++++++++++++++++++---
 4 files changed, 26 insertions(+), 60 deletions(-)
---
diff --git a/Makefile b/Makefile
index 9d799c8..c7f6704 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ SDK_BRANCH=master
 SDK_RUNTIME_VERSION=1.4
 
 # Canned recipe for generating metadata
-SUBST_FILES=org.gnome.Sdk.json metadata.sdk metadata.platform os-release org.gnome.Platform.appdata.xml 
org.gnome.Sdk.appdata.xml
+SUBST_FILES=org.gnome.Sdk.json os-release org.gnome.Platform.appdata.xml org.gnome.Sdk.appdata.xml
 define subst-metadata
        @echo -n "Generating files: ${SUBST_FILES}... ";
        @for file in ${SUBST_FILES}; do                                         \
diff --git a/org.gnome.Sdk.json.in b/org.gnome.Sdk.json.in
index 8b706d3..94eb831 100644
--- a/org.gnome.Sdk.json.in
+++ b/org.gnome.Sdk.json.in
@@ -6,11 +6,28 @@
     "runtime": "org.freedesktop.Platform",
     "sdk": "org.freedesktop.Sdk",
     "runtime-version": "@@SDK_RUNTIME_VERSION@@",
-    "writable-sdk": true,
     "sdk-extensions": ["org.freedesktop.Sdk.Debug", "org.freedesktop.Sdk.Locale"],
     "platform-extensions": [ "org.freedesktop.Platform.Locale"],
-    "metadata": "metadata.sdk",
-    "metadata-platform": "metadata.platform",
+    "finish-args": [
+        "--extension=org.freedesktop.Platform.GL=directory=lib/GL",
+        "--extension=org.freedesktop.Platform.GL=version=1.4",
+        "--extension=org.freedesktop.Platform.GL=subdirectories=true",
+        "--extension=org.freedesktop.Platform.GL=no-autodowload=true",
+        "--extension=org.freedesktop.Platform.GL=autodelete=true",
+        "--extension=org.freedesktop.Platform.GL=add-ld-path=lib",
+        "--extension=org.freedesktop.Platform.GL=merge-dirs=vulkan/icd.d;glvnd/egl_vendor.d",
+        "--extension=org.freedesktop.Platform.GL=download-if=active-gl-driver",
+        "--extension=org.freedesktop.Platform.GL=enable-if=active-gl-driver",
+        "--extension=org.freedesktop.Platform.Timezones=directory=share/zoneinfo",
+        "--extension=org.freedesktop.Platform.Timezones=version=1.4",
+        "--extension=org.freedesktop.Platform.GStreamer=directory=lib/extensions/gstreamer-1.0",
+        "--extension=org.freedesktop.Platform.GStreamer=version=1.4",
+        "--extension=org.freedesktop.Platform.GStreamer=subdirectories",
+        "--env=GI_TYPELIB_PATH=/app/lib/girepository-1.0",
+        
"--env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0:/usr/lib/extensions/gstreamer-1.0:/usr/lib/gstreamer-1.0",
+        "--sdk=org.gnome.Sdk//@@SDK_BRANCH@@",
+        "--runtime=org.gnome.Platform//@@SDK_BRANCH@@"
+    ],
     "cleanup": [ "/cache",
                  "/man",
                  "/share/man",
@@ -27,6 +44,11 @@
                           "/share/gir-1.0",
                           "/share/vala"
                         ],
+    "cleanup-platform-commands": [ "touch -d @0 /usr/share/fonts",
+                                   "touch -d @0 /usr/share/fonts/*",
+                                   "fc-cache -fs",
+                                   "ldconfig -C /usr/etc/ld.so.cache"
+                                 ],
     "build-options" : {
         "cflags": "-O2 -g",
         "cxxflags": "-O2 -g",