[gnome-build-meta/alatiera/gst-plugins-bad-more] sdk/gst-plugins-good.bst: Reorder imports and clean up conf-locacl

[Jordan Petridis <jpetridis src gnome org>]

commit a278f02f7af5e2ff7ba20541031c41601d577351
Author: Jordan Petridis <jpetridis gnome org>
Date:   Thu Sep 13 03:26:02 2018 +0300

    sdk/gst-plugins-good.bst: Reorder imports and clean up conf-locacl
    
    Keep in sync with the Freedesktop SDK build

 elements/sdk/gst-plugins-good.bst | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/elements/sdk/gst-plugins-good.bst b/elements/sdk/gst-plugins-good.bst
index b81c781..3b52d30 100644
--- a/elements/sdk/gst-plugins-good.bst
+++ b/elements/sdk/gst-plugins-good.bst
@@ -9,11 +9,15 @@ depends:
 - sdk/gobject-introspection.bst
 - sdk/gst-plugins-base.bst
 - sdk/libsoup.bst
+- filename: desktop/cairo.bst
+  junction: freedesktop-sdk.bst
 - filename: desktop/lame.bst
   junction: freedesktop-sdk.bst
+- filename: desktop/libpulse.bst
+  junction: freedesktop-sdk.bst
 - filename: desktop/mpg123.bst
   junction: freedesktop-sdk.bst
-- filename: desktop/libpulse.bst
+- filename: desktop/orc.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
@@ -24,15 +28,11 @@ depends:
 
 variables:
   conf-local: |
+    --enable-cairo \
     --enable-experimental \
     --enable-introspection \
-    --enable-pulse \
     --enable-lame \
     --enable-soup \
     --enable-orc \
-    --disable-monoscope \
-    --disable-aalib \
-    --enable-cairo \
-    --disable-libcaca \
-    --disable-jack \
+    --enable-pulse \
     --with-default-visualizer=autoaudiosink