Timo Aaltonen pushed to branch debian-unstable at X Strike Force / xserver / xorg-server
Commits:
-
e859a84e
by Timo Aaltonen at 2021-08-15T12:33:17+03:00
3 changed files:
Changes:
1 |
+xorg-server (2:1.20.13-2) UNRELEASED; urgency=medium
|
|
2 |
+ |
|
3 |
+ * Disable building xwayland.
|
|
4 |
+ |
|
5 |
+ -- Timo Aaltonen <tjaalton@debian.org> Sun, 15 Aug 2021 12:32:50 +0300
|
|
6 |
+ |
|
1 | 7 |
xorg-server (2:1.20.13-1) experimental; urgency=medium
|
2 | 8 |
|
3 | 9 |
* New upstream release.
|
... | ... | @@ -69,10 +69,6 @@ Build-Depends: |
69 | 69 |
x11-xkb-utils,
|
70 | 70 |
# arc4random_buf(), getpeereid()
|
71 | 71 |
libbsd-dev,
|
72 |
-# xwayland
|
|
73 |
- libnvidia-egl-wayland-dev,
|
|
74 |
- libwayland-dev [linux-any],
|
|
75 |
- wayland-protocols (>= 1.10) [linux-any],
|
|
76 | 72 |
#logind
|
77 | 73 |
libdbus-1-dev (>= 1.0) [linux-any],
|
78 | 74 |
# systemd-daemon
|
... | ... | @@ -305,17 +301,6 @@ Description: Xorg X server - source files |
305 | 301 |
Unless you are building a software product using X server sources,
|
306 | 302 |
you probably want xserver-xorg and/or xserver-xorg-core instead.
|
307 | 303 |
|
308 |
-Package: xwayland
|
|
309 |
-Architecture: linux-any
|
|
310 |
-Depends:
|
|
311 |
- xserver-common (>= ${source:Version}),
|
|
312 |
- ${shlibs:Depends},
|
|
313 |
- ${misc:Depends},
|
|
314 |
-Description: Xwayland X server
|
|
315 |
- This package provides an X server running on top of wayland, using wayland
|
|
316 |
- input devices for input and forwarding either the root window or individual
|
|
317 |
- top-level windows as wayland surfaces.
|
|
318 |
- |
|
319 | 304 |
Package: xserver-xorg-legacy
|
320 | 305 |
Architecture: any
|
321 | 306 |
Depends:
|
... | ... | @@ -34,6 +34,7 @@ confflags += \ |
34 | 34 |
--disable-linux-acpi \
|
35 | 35 |
--disable-linux-apm \
|
36 | 36 |
--disable-xquartz \
|
37 |
+ --disable-xwayland \
|
|
37 | 38 |
--disable-xwin \
|
38 | 39 |
--disable-install-setuid
|
39 | 40 |
|
... | ... | @@ -82,7 +83,6 @@ confflags_udeb = \ |
82 | 83 |
--disable-xace \
|
83 | 84 |
--disable-xselinux \
|
84 | 85 |
--disable-xfree86-utils \
|
85 |
- --disable-xwayland \
|
|
86 | 86 |
--disable-systemd-logind \
|
87 | 87 |
--without-systemd-daemon \
|
88 | 88 |
--disable-suid-wrapper \
|
... | ... | @@ -98,14 +98,12 @@ ifeq ($(DEB_HOST_ARCH_OS), linux) |
98 | 98 |
confflags_main += \
|
99 | 99 |
--enable-dri3 \
|
100 | 100 |
--enable-xselinux \
|
101 |
- --enable-xwayland \
|
|
102 | 101 |
--enable-systemd-logind \
|
103 | 102 |
--with-systemd-daemon
|
104 | 103 |
else
|
105 | 104 |
confflags_main += \
|
106 | 105 |
--disable-dri3 \
|
107 | 106 |
--disable-xselinux \
|
108 |
- --disable-xwayland \
|
|
109 | 107 |
--disable-systemd-logind \
|
110 | 108 |
--without-systemd-daemon
|
111 | 109 |
endif
|