summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPovilas Kanapickas <povilas@radix.lt>2021-09-15 21:49:17 +0300
committerPovilas Kanapickas <povilas@radix.lt>2021-09-15 21:49:17 +0300
commit4ee66f574a70948ca90a5db94dd666a389a5ff3e (patch)
tree6d9856cbc8ab95499ef54c5c56be5cf75e15c35e /include
parent72c5d153c920d769802ed73a1b9bfd0d32e7c178 (diff)
Drop XWayland DDX
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.am1
-rw-r--r--include/meson.build8
-rw-r--r--include/xwayland-config.h.in13
-rw-r--r--include/xwayland-config.h.meson.in11
4 files changed, 0 insertions, 33 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index a1f241263..56e0b24fe 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -81,7 +81,6 @@ EXTRA_DIST = \
vidmodestr.h \
xorg-config.h.meson.in \
xorg-server.h.meson.in \
- xwayland-config.h.meson.in \
xwin-config.h.meson.in \
xsha1.h
diff --git a/include/meson.build b/include/meson.build
index 4d2c4e075..1fab731c3 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -412,14 +412,6 @@ configure_file(output : 'xwin-config.h',
input : 'xwin-config.h.meson.in',
configuration : xwin_data)
-xwayland_data = configuration_data()
-xwayland_data.set('XWL_HAS_GLAMOR', build_glamor and (gbm_dep.found() or build_eglstream) ? '1' : false)
-xwayland_data.set('XWL_HAS_EGLSTREAM', build_eglstream ? '1' : false)
-
-configure_file(output : 'xwayland-config.h',
- input : 'xwayland-config.h.meson.in',
- configuration : xwayland_data)
-
dtrace_hdr = []
dtrace_tmpl = files('Xserver.d')
if with_dtrace
diff --git a/include/xwayland-config.h.in b/include/xwayland-config.h.in
deleted file mode 100644
index 9695aae6b..000000000
--- a/include/xwayland-config.h.in
+++ /dev/null
@@ -1,13 +0,0 @@
-/* xwayland-config.h.in: not at all generated. */
-#ifndef _XWAYLAND_CONFIG_H_
-#define _XWAYLAND_CONFIG_H_
-
-#include <dix-config.h>
-
-/* Build glamor support for Xwayland */
-#undef XWL_HAS_GLAMOR
-
-/* Build eglstream support for Xwayland */
-#undef XWL_HAS_EGLSTREAM
-
-#endif /* _XWAYLAND_CONFIG_H_ */
diff --git a/include/xwayland-config.h.meson.in b/include/xwayland-config.h.meson.in
deleted file mode 100644
index 0943ff57d..000000000
--- a/include/xwayland-config.h.meson.in
+++ /dev/null
@@ -1,11 +0,0 @@
-/* xwayland-config.h.meson.in: not at all generated */
-
-#pragma once
-
-#include <dix-config.h>
-
-/* Build glamor support for Xwayland */
-#mesondefine XWL_HAS_GLAMOR
-
-/* Build eglstream support for Xwayland */
-#mesondefine XWL_HAS_EGLSTREAM