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
Disable building xwayland.

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules.flags


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+xorg-server (2:1.20.13-2) UNRELEASED; urgency=medium
+
+  * Disable building xwayland.
+
+ -- Timo Aaltonen <[email protected]>  Sun, 15 Aug 2021 12:32:50 +0300
+
 xorg-server (2:1.20.13-1) experimental; urgency=medium
 
   * New upstream release.


=====================================
debian/control
=====================================
@@ -69,10 +69,6 @@ Build-Depends:
  x11-xkb-utils,
 # arc4random_buf(), getpeereid()
  libbsd-dev,
-# xwayland
- libnvidia-egl-wayland-dev,
- libwayland-dev [linux-any],
- wayland-protocols (>= 1.10) [linux-any],
 #logind
   libdbus-1-dev (>= 1.0) [linux-any],
 # systemd-daemon
@@ -305,17 +301,6 @@ Description: Xorg X server - source files
  Unless you are building a software product using X server sources,
  you probably want xserver-xorg and/or xserver-xorg-core instead.
 
-Package: xwayland
-Architecture: linux-any
-Depends:
- xserver-common (>= ${source:Version}),
- ${shlibs:Depends},
- ${misc:Depends},
-Description: Xwayland X server
- This package provides an X server running on top of wayland, using wayland
- input devices for input and forwarding either the root window or individual
- top-level windows as wayland surfaces.
-
 Package: xserver-xorg-legacy
 Architecture: any
 Depends:


=====================================
debian/rules.flags
=====================================
@@ -34,6 +34,7 @@ confflags += \
        --disable-linux-acpi \
        --disable-linux-apm \
        --disable-xquartz \
+       --disable-xwayland \
        --disable-xwin \
        --disable-install-setuid
 
@@ -82,7 +83,6 @@ confflags_udeb = \
        --disable-xace \
        --disable-xselinux \
        --disable-xfree86-utils \
-       --disable-xwayland \
        --disable-systemd-logind \
        --without-systemd-daemon \
        --disable-suid-wrapper \
@@ -98,14 +98,12 @@ ifeq ($(DEB_HOST_ARCH_OS), linux)
        confflags_main += \
                --enable-dri3 \
                --enable-xselinux \
-               --enable-xwayland \
                --enable-systemd-logind \
                --with-systemd-daemon
 else
        confflags_main += \
                --disable-dri3 \
                --disable-xselinux \
-               --disable-xwayland \
                --disable-systemd-logind \
                --without-systemd-daemon
 endif



View it on GitLab: 
https://salsa.debian.org/xorg-team/xserver/xorg-server/-/commit/e859a84e94ed7bdcff5c093993d44e2fd5dcc80a

-- 
View it on GitLab: 
https://salsa.debian.org/xorg-team/xserver/xorg-server/-/commit/e859a84e94ed7bdcff5c093993d44e2fd5dcc80a
You're receiving this email because of your account on salsa.debian.org.


Reply via email to