[gnome-build-meta/jjardon/wayland_only: 2/2] Only wayland

From: Javier Jardón Cabezas <jjardon src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-build-meta/jjardon/wayland_only: 2/2] Only wayland
Date: Sat, 23 Nov 2019 09:01:19 +0000 (UTC)
commit 8abd1fb14f5dd7c891d10243e9175fa09f6c4991
Author: Javier Jardón <jjardon gnome org>
Date:   Sat Nov 23 14:32:30 2019 +0900

    Only wayland

 elements/core-deps/flatpak.bst              |  1 -
 elements/core-deps/startup-notification.bst |  2 --
 elements/core/gnome-session.bst             |  2 --
 elements/core/gnome-settings-daemon.bst     |  1 -
 elements/core/mutter.bst                    |  3 ---
 elements/sdk-platform.bst                   | 28 ----------------------------
 elements/sdk.bst                            |  3 ---
 elements/sdk/WebKitGTK.bst                  |  1 -
 elements/sdk/cogl.bst                       |  6 ------
 elements/sdk/gdk-pixbuf.bst                 |  4 +++-
 elements/sdk/gst-plugins-base.bst           |  1 -
 elements/sdk/gtk+-3.bst                     |  7 +------
 elements/vm/desktop-vm.bst                  |  3 ---
 13 files changed, 4 insertions(+), 58 deletions(-)
---
diff --git a/elements/core-deps/flatpak.bst b/elements/core-deps/flatpak.bst
index e3fa43c1..52ce0a17 100644
--- a/elements/core-deps/flatpak.bst
+++ b/elements/core-deps/flatpak.bst
@@ -23,5 +23,4 @@ depends:
 - freedesktop-sdk.bst:components/libcap.bst
 - freedesktop-sdk.bst:components/libseccomp.bst
 - freedesktop-sdk.bst:components/libxml2.bst
-- freedesktop-sdk.bst:components/xorg-lib-xau.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/startup-notification.bst b/elements/core-deps/startup-notification.bst
index 1f3c396c..d144924c 100644
--- a/elements/core-deps/startup-notification.bst
+++ b/elements/core-deps/startup-notification.bst
@@ -5,6 +5,4 @@ sources:
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
-- freedesktop-sdk.bst:components/xcb-util.bst
-- freedesktop-sdk.bst:components/xorg-lib-x11.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gnome-session.bst b/elements/core/gnome-session.bst
index d4cd84ac..d2d11891 100644
--- a/elements/core/gnome-session.bst
+++ b/elements/core/gnome-session.bst
@@ -12,6 +12,4 @@ depends:
 - core/gnome-desktop.bst
 - sdk/gtk+-3.bst
 - sdk/json-glib.bst
-- freedesktop-sdk.bst:components/xorg-lib-ice.bst
-- freedesktop-sdk.bst:components/xorg-lib-sm.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gnome-settings-daemon.bst b/elements/core/gnome-settings-daemon.bst
index 810f7b01..f073e893 100644
--- a/elements/core/gnome-settings-daemon.bst
+++ b/elements/core/gnome-settings-daemon.bst
@@ -32,5 +32,4 @@ depends:
 - sdk/libnotify.bst
 - freedesktop-sdk.bst:components/alsa-lib.bst
 - freedesktop-sdk.bst:components/cups.bst
-- freedesktop-sdk.bst:components/xorg-lib-xtst.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/mutter.bst b/elements/core/mutter.bst
index d8f3ea0e..f6c04976 100644
--- a/elements/core/mutter.bst
+++ b/elements/core/mutter.bst
@@ -24,9 +24,6 @@ depends:
 - sdk/zenity.bst
 - freedesktop-sdk.bst:components/dummy-gbm.bst
 - freedesktop-sdk.bst:components/wayland.bst
-- freedesktop-sdk.bst:components/xorg-lib-xcursor.bst
-- freedesktop-sdk.bst:components/xorg-lib-xtst.bst
-- freedesktop-sdk.bst:components/xorg-server.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   meson-local: >-
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index f3d1ccde..379db9df 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -216,31 +216,3 @@ depends:
 - freedesktop-sdk.bst:components/xcb-util-wm.bst
 - freedesktop-sdk.bst:components/xcb-util.bst
 - freedesktop-sdk.bst:components/xdg-user-dirs.bst
-- freedesktop-sdk.bst:components/xorg-app-xkbcomp.bst
-- freedesktop-sdk.bst:components/xorg-data-xkeyboard-config.bst
-- freedesktop-sdk.bst:components/xorg-lib-ice.bst
-- freedesktop-sdk.bst:components/xorg-lib-pciaccess.bst
-- freedesktop-sdk.bst:components/xorg-lib-sm.bst
-- freedesktop-sdk.bst:components/xorg-lib-x11.bst
-- freedesktop-sdk.bst:components/xorg-lib-xau.bst
-- freedesktop-sdk.bst:components/xorg-lib-xcb.bst
-- freedesktop-sdk.bst:components/xorg-lib-xcomposite.bst
-- freedesktop-sdk.bst:components/xorg-lib-xcursor.bst
-- freedesktop-sdk.bst:components/xorg-lib-xdamage.bst
-- freedesktop-sdk.bst:components/xorg-lib-xdmcp.bst
-- freedesktop-sdk.bst:components/xorg-lib-xext.bst
-- freedesktop-sdk.bst:components/xorg-lib-xfixes.bst
-- freedesktop-sdk.bst:components/xorg-lib-xft.bst
-- freedesktop-sdk.bst:components/xorg-lib-xi.bst
-- freedesktop-sdk.bst:components/xorg-lib-xinerama.bst
-- freedesktop-sdk.bst:components/xorg-lib-xkbfile.bst
-- freedesktop-sdk.bst:components/xorg-lib-xpm.bst
-- freedesktop-sdk.bst:components/xorg-lib-xrandr.bst
-- freedesktop-sdk.bst:components/xorg-lib-xrender.bst
-- freedesktop-sdk.bst:components/xorg-lib-xscrnsaver.bst
-- freedesktop-sdk.bst:components/xorg-lib-xshmfence.bst
-- freedesktop-sdk.bst:components/xorg-lib-xt.bst
-- freedesktop-sdk.bst:components/xorg-lib-xtrans.bst
-- freedesktop-sdk.bst:components/xorg-lib-xtst.bst
-- freedesktop-sdk.bst:components/xorg-lib-xv.bst
-- freedesktop-sdk.bst:components/xorg-lib-xxf86vm.bst
diff --git a/elements/sdk.bst b/elements/sdk.bst
index 4b1543b3..2cbd75dd 100644
--- a/elements/sdk.bst
+++ b/elements/sdk.bst
@@ -49,6 +49,3 @@ depends:
 - freedesktop-sdk.bst:components/jq.bst
 - freedesktop-sdk.bst:components/wayland-protocols.bst
 - freedesktop-sdk.bst:components/xdg-portal-interfaces.bst
-- freedesktop-sdk.bst:components/xorg-proto-xcb.bst
-- freedesktop-sdk.bst:components/xorg-proto-xorgproto.bst
-- freedesktop-sdk.bst:components/xorg-util-macros.bst
diff --git a/elements/sdk/WebKitGTK.bst b/elements/sdk/WebKitGTK.bst
index 425fd663..3857fa80 100644
--- a/elements/sdk/WebKitGTK.bst
+++ b/elements/sdk/WebKitGTK.bst
@@ -38,7 +38,6 @@ depends:
 - freedesktop-sdk.bst:components/libwebp.bst
 - freedesktop-sdk.bst:components/libxslt.bst
 - freedesktop-sdk.bst:components/wayland.bst
-- freedesktop-sdk.bst:components/xorg-lib-xt.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   webkitgtk_toolchain: ''
diff --git a/elements/sdk/cogl.bst b/elements/sdk/cogl.bst
index 0be7d595..3bcbd1b3 100644
--- a/elements/sdk/cogl.bst
+++ b/elements/sdk/cogl.bst
@@ -13,12 +13,6 @@ depends:
 - sdk/pango.bst
 - freedesktop-sdk.bst:components/gstreamer.bst
 - freedesktop-sdk.bst:components/wayland.bst
-- freedesktop-sdk.bst:components/xorg-lib-x11.bst
-- freedesktop-sdk.bst:components/xorg-lib-xcomposite.bst
-- freedesktop-sdk.bst:components/xorg-lib-xdamage.bst
-- freedesktop-sdk.bst:components/xorg-lib-xext.bst
-- freedesktop-sdk.bst:components/xorg-lib-xfixes.bst
-- freedesktop-sdk.bst:components/xorg-lib-xrandr.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   conf-local: >-
diff --git a/elements/sdk/gdk-pixbuf.bst b/elements/sdk/gdk-pixbuf.bst
index 381d97b8..085d0aec 100644
--- a/elements/sdk/gdk-pixbuf.bst
+++ b/elements/sdk/gdk-pixbuf.bst
@@ -13,8 +13,10 @@ depends:
 - freedesktop-sdk.bst:components/libpng.bst
 - freedesktop-sdk.bst:components/libtiff.bst
 - freedesktop-sdk.bst:components/shared-mime-info.bst
-- freedesktop-sdk.bst:components/xorg-lib-x11.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
+variables:
+  meson-local: >-
+    -Dx11=false
 public:
   bst:
     integration-commands:
diff --git a/elements/sdk/gst-plugins-base.bst b/elements/sdk/gst-plugins-base.bst
index 6c5d049d..70be17d3 100644
--- a/elements/sdk/gst-plugins-base.bst
+++ b/elements/sdk/gst-plugins-base.bst
@@ -15,7 +15,6 @@ runtime-depends:
 - freedesktop-sdk.bst:components/opus.bst
 - freedesktop-sdk.bst:components/orc.bst
 - freedesktop-sdk.bst:components/sdl2.bst
-- freedesktop-sdk.bst:components/xorg-lib-xv.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 public:
   bst:
diff --git a/elements/sdk/gtk+-3.bst b/elements/sdk/gtk+-3.bst
index a6a4af6c..95c965db 100644
--- a/elements/sdk/gtk+-3.bst
+++ b/elements/sdk/gtk+-3.bst
@@ -20,18 +20,13 @@ depends:
 - freedesktop-sdk.bst:components/mesa-headers.bst
 - freedesktop-sdk.bst:components/wayland-protocols.bst
 - freedesktop-sdk.bst:components/wayland.bst
-- freedesktop-sdk.bst:components/xorg-lib-xcomposite.bst
-- freedesktop-sdk.bst:components/xorg-lib-xcursor.bst
-- freedesktop-sdk.bst:components/xorg-lib-xdamage.bst
-- freedesktop-sdk.bst:components/xorg-lib-xi.bst
-- freedesktop-sdk.bst:components/xorg-lib-xinerama.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   meson-local: >-
     -Dbroadway_backend=true
     -Dinstalled_tests=true
     -Dtests=false
-    -Dx11_backend=true
+    -Dx11_backend=false
     -Dwayland-backend=true
     -Dgtk_doc=true
     -Dman=true
diff --git a/elements/vm/desktop-vm.bst b/elements/vm/desktop-vm.bst
index c4c6c71c..daafaeaf 100644
--- a/elements/vm/desktop-vm.bst
+++ b/elements/vm/desktop-vm.bst
@@ -19,9 +19,6 @@ depends:
 - filename: components/systemd.bst
   junction: freedesktop-sdk.bst
   type: build
-- filename: components/xorg-server.bst
-  junction: freedesktop-sdk.bst
-  type: build
 - filename: vm/linux-vm-boot/shadow.bst
   junction: freedesktop-sdk.bst
   type: build
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]