[gnome-build-meta/tristan/fdsdk-master-again: 8/26] Revert "Revert "build mutter and gnome-shell using the new mesa arrangement in freedesktop-sdk""

[Tristan Van Berkom <tvb src gnome org>]

commit 049ec13fa6bd845064fd18b6cfe68bcbe08b2ada
Author: Tristan Van Berkom <tristan vanberkom codethink co uk>
Date:   Tue Jun 25 19:23:32 2019 +0900

    Revert "Revert "build mutter and gnome-shell using the new mesa arrangement in freedesktop-sdk""
    
    This reverts commit 3852b7b972cb75061f6ce19e34648e5b935b35cc.

 elements/core-deps/xorg-server.bst | 37 -------------------------------------
 elements/core/gnome-shell.bst      |  2 ++
 elements/core/mutter.bst           |  8 ++++++--
 3 files changed, 8 insertions(+), 39 deletions(-)
---
diff --git a/elements/core/gnome-shell.bst b/elements/core/gnome-shell.bst
index f8358119..c11376c9 100644
--- a/elements/core/gnome-shell.bst
+++ b/elements/core/gnome-shell.bst
@@ -43,3 +43,5 @@ depends:
   type: build
 - filename: bootstrap-import.bst
   junction: freedesktop-sdk.bst
+environment:
+  LD_LIBRARY_PATH: '%{libdir}/GL/default/lib'
diff --git a/elements/core/mutter.bst b/elements/core/mutter.bst
index 6ebe140e..55a6fc55 100644
--- a/elements/core/mutter.bst
+++ b/elements/core/mutter.bst
@@ -9,8 +9,6 @@ depends:
 - core-deps/libgudev.bst
 - core-deps/libinput.bst
 - core-deps/upower.bst
-- filename: core-deps/xorg-server.bst
-  type: build
 - core/gnome-desktop.bst
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
@@ -26,8 +24,12 @@ depends:
   junction: freedesktop-sdk.bst
 - filename: components/xorg-lib-xtst.bst
   junction: freedesktop-sdk.bst
+- filename: components/xorg-server.bst
+  junction: freedesktop-sdk.bst
 - filename: components/wayland.bst
   junction: freedesktop-sdk.bst
+- filename: extensions/mesa/gbm.bst
+  junction: freedesktop-sdk.bst
 - filename: public-stacks/buildsystem-meson.bst
   junction: freedesktop-sdk.bst
   type: build
@@ -37,3 +39,5 @@ variables:
   meson-local: >-
     -Dprofiler=false
     -Dremote_desktop=false
+environment:
+  PKG_CONFIG_PATH: '%{libdir}/GL/default/lib/pkgconfig'