[gnome-build-meta] Revert "build mutter and gnome-shell using the new mesa arrangement in freedesktop-sdk"

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 3852b7b972cb75061f6ce19e34648e5b935b35cc
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sat Jun 22 12:45:48 2019 -0500

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

 elements/core-deps/xorg-server.bst | 37 +++++++++++++++++++++++++++++++++++++
 elements/core/gnome-shell.bst      |  2 --
 elements/core/mutter.bst           |  8 ++------
 3 files changed, 39 insertions(+), 8 deletions(-)
---
diff --git a/elements/core-deps/xorg-server.bst b/elements/core-deps/xorg-server.bst
new file mode 100644
index 00000000..895e81c8
--- /dev/null
+++ b/elements/core-deps/xorg-server.bst
@@ -0,0 +1,37 @@
+kind: autotools
+sources:
+- kind: tar
+  url: https://www.x.org/releases/individual/xserver/xorg-server-1.20.3.tar.bz2
+depends:
+- core-deps/xfont2.bst
+- filename: components/libdrm.bst
+  junction: freedesktop-sdk.bst
+- filename: components/libepoxy.bst
+  junction: freedesktop-sdk.bst
+- filename: components/pixman.bst
+  junction: freedesktop-sdk.bst
+- filename: components/systemd.bst
+  junction: freedesktop-sdk.bst
+- filename: components/wayland.bst
+  junction: freedesktop-sdk.bst
+- filename: components/wayland-protocols.bst
+  junction: freedesktop-sdk.bst
+  type: build
+- filename: components/xorg-lib-pciaccess.bst
+  junction: freedesktop-sdk.bst
+- filename: components/xorg-lib-xkbfile.bst
+  junction: freedesktop-sdk.bst
+- filename: components/xorg-lib-xshmfence.bst
+  junction: freedesktop-sdk.bst
+- filename: components/xorg-proto-xorgproto.bst
+  junction: freedesktop-sdk.bst
+  type: build
+- filename: public-stacks/buildsystem-autotools.bst
+  junction: freedesktop-sdk.bst
+  type: build
+- filename: bootstrap-import.bst
+  junction: freedesktop-sdk.bst
+variables:
+  conf-local:
+    --enable-xorg
+    --enable-xwayland
diff --git a/elements/core/gnome-shell.bst b/elements/core/gnome-shell.bst
index c11376c9..f8358119 100644
--- a/elements/core/gnome-shell.bst
+++ b/elements/core/gnome-shell.bst
@@ -43,5 +43,3 @@ 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 55a6fc55..6ebe140e 100644
--- a/elements/core/mutter.bst
+++ b/elements/core/mutter.bst
@@ -9,6 +9,8 @@ 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
@@ -24,12 +26,8 @@ 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
@@ -39,5 +37,3 @@ variables:
   meson-local: >-
     -Dprofiler=false
     -Dremote_desktop=false
-environment:
-  PKG_CONFIG_PATH: '%{libdir}/GL/default/lib/pkgconfig'