[gnome-build-meta/abderrahim/g-i-s-meson: 1/2] core-deps: add xorg-server and dependencies (needed by mutter)



commit 5f58685247c8617207b8e589ea27a51ef742b8e1
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Sat Nov 10 20:07:10 2018 +0100

    core-deps: add xorg-server and dependencies (needed by mutter)

 elements/core-deps/font-util.bst   | 10 +++++++
 elements/core-deps/fontenc.bst     | 10 +++++++
 elements/core-deps/xfont2.bst      | 11 ++++++++
 elements/core-deps/xorg-server.bst | 37 +++++++++++++++++++++++++
 elements/core/mutter.bst           |  5 ++--
 files/mutter/meta-default-modes.h  | 57 --------------------------------------
 6 files changed, 70 insertions(+), 60 deletions(-)
---
diff --git a/elements/core-deps/font-util.bst b/elements/core-deps/font-util.bst
new file mode 100644
index 0000000..a0be122
--- /dev/null
+++ b/elements/core-deps/font-util.bst
@@ -0,0 +1,10 @@
+kind: autotools
+sources:
+- kind: tar
+  url: https://www.x.org/releases/individual/font/font-util-1.3.1.tar.bz2
+depends:
+- filename: desktop/xorg-proto-xorgproto.bst
+  junction: freedesktop-sdk.bst
+  type: build
+- filename: base-platform.bst
+  junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/fontenc.bst b/elements/core-deps/fontenc.bst
new file mode 100644
index 0000000..3796f6c
--- /dev/null
+++ b/elements/core-deps/fontenc.bst
@@ -0,0 +1,10 @@
+kind: autotools
+sources:
+- kind: tar
+  url: https://www.x.org/releases/individual/lib/libfontenc-1.1.3.tar.bz2
+depends:
+- filename: desktop/xorg-proto-xorgproto.bst
+  junction: freedesktop-sdk.bst
+  type: build
+- filename: base-platform.bst
+  junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/xfont2.bst b/elements/core-deps/xfont2.bst
new file mode 100644
index 0000000..0821a62
--- /dev/null
+++ b/elements/core-deps/xfont2.bst
@@ -0,0 +1,11 @@
+kind: autotools
+sources:
+- kind: tar
+  url: https://www.x.org/releases/individual/lib/libXfont2-2.0.3.tar.bz2
+depends:
+- core-deps/fontenc.bst
+- core-deps/font-util.bst
+- filename: desktop/freetype.bst
+  junction: freedesktop-sdk.bst
+- filename: base-platform.bst
+  junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/xorg-server.bst b/elements/core-deps/xorg-server.bst
new file mode 100644
index 0000000..a55f7ad
--- /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: desktop/libdrm.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/libepoxy.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/pixman.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/wayland.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/wayland-protocols.bst
+  junction: freedesktop-sdk.bst
+  type: build
+- filename: desktop/xorg-data-xkeyboard-config.bst
+  junction: freedesktop-sdk.bst
+  type: runtime
+- filename: desktop/xorg-lib-pciaccess.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xkbfile.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-lib-xshmfence.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/xorg-proto-xorgproto.bst
+  junction: freedesktop-sdk.bst
+  type: build
+- filename: vm/linux-vm-boot/systemd.bst
+  junction: freedesktop-sdk.bst
+- filename: base-platform.bst
+  junction: freedesktop-sdk.bst
+variables:
+  conf-local:
+    --enable-xorg
+    --enable-xwayland
diff --git a/elements/core/mutter.bst b/elements/core/mutter.bst
index d212484..e7a3d39 100644
--- a/elements/core/mutter.bst
+++ b/elements/core/mutter.bst
@@ -3,13 +3,12 @@ sources:
 - kind: git
   url: gitlab_gnome_org:GNOME/mutter
   track: master
-- kind: local
-  path: files/mutter/meta-default-modes.h
-  directory: src
 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]