summaryrefslogtreecommitdiffstats
path: root/xorg
diff options
context:
space:
mode:
authorTreeve Jelbert2021-02-17 20:39:20 +0100
committerTreeve Jelbert2021-02-17 20:52:30 +0100
commiteec6401fb99b3550fa431393a5aeef956beb095f (patch)
treefb447925502b4795a267916b873f925dc5df5379 /xorg
parent3dee6143aa6a18d4ba70cad7cef8db6697d65f3d (diff)
xserver - remove xwayland stuff
Diffstat (limited to 'xorg')
-rwxr-xr-xxorg/xserver/BUILD10
-rwxr-xr-xxorg/xserver/CONFIGURE11
-rwxr-xr-xxorg/xserver/DETAILS2
-rw-r--r--xorg/xserver/HISTORY5
-rwxr-xr-xxorg/xserver/PRE_SUB_DEPENDS5
-rwxr-xr-xxorg/xserver/REPAIR^all^PRE_SUB_DEPENDS5
-rwxr-xr-xxorg/xserver/REPAIR^all^SUB_DEPENDS6
-rwxr-xr-xxorg/xserver/SUB_DEPENDS6
8 files changed, 12 insertions, 38 deletions
diff --git a/xorg/xserver/BUILD b/xorg/xserver/BUILD
index 86a7a6485f..ebe50c79b9 100755
--- a/xorg/xserver/BUILD
+++ b/xorg/xserver/BUILD
@@ -1,16 +1,14 @@
#message CFLAGS=$CFLAGS
OPTS+=" xorg=$XSERVER_XORG \
- xwayland=$XSERVER_WAYLAND \
+ xwayland=false \
xnest=$XSERVER_XNEST \
xvfb=$XSERVER_XVFB \
+ xselinux=${XSERVER_SELINUX} \
xephyr=$XSERVER_XEPHYR \
dmx=$XSERVER_DMX \
glamor=$XSERVER_GLAMOR \
listen_tcp=$XSERVER_TCP \
log_dir=${INSTALL_ROOT}/var/log \
- xkb_bin_dir=$INSTALL_ROOT/usr/bin \
- os_vendor='SourceMage'"
+ xkb_bin_dir=$INSTALL_ROOT/usr/bin" &&
PREFIX=/usr &&
-check_tmp_noexec /tmp &&
-default_build &&
-check_tmp_noexec /tmp
+default_build
diff --git a/xorg/xserver/CONFIGURE b/xorg/xserver/CONFIGURE
index b23e3678e1..06383d716e 100755
--- a/xorg/xserver/CONFIGURE
+++ b/xorg/xserver/CONFIGURE
@@ -1,4 +1,5 @@
persistent_remove XORG_SERVER_OPTS
+persistent_remove XSERVER_WAYLAND
#config_query XORG_XINITRC_XSESSION \
# "install a .desktop file that calls the user's .xinitrc?" n &&
#config_query_list XSERVER_SHA1 "Choose SHA1 implementation:" \
@@ -6,18 +7,10 @@ persistent_remove XORG_SERVER_OPTS
# libgcrypt \
# SSL
config_query_option XSERVER_XORG "Build Xorg server?" y true false
-if [[ ${XSERVER_XORG} == 'true' ]]; then
- # Have the default at least working to get input devices with any setup,
- # getting out of X11 is tricky when that is broken.
- config_query_option XSERVER_SUID_ROOT \
- "Set Xorg suid root (possibly needed for multiple sessions with some drivers)?" n true false
- config_query_option XSERVER_SGID_INPUT \
- "Set Xorg sgid input (for input devices when not suid root or session magic)?" y true false
-fi
-config_query_option XSERVER_WAYLAND "Build XWayland server?" y true false
config_query_option XSERVER_XNEST "Build XNest nested X server?" n true false
config_query_option XSERVER_XVFB "Build Xvfb server?" n true false
config_query_option XSERVER_XEPHYR "Build Xephyr nested X server?" n true false
config_query_option XSERVER_DMX "Build DMX nested X server?" n true false
config_query_option XSERVER_GLAMOR "build Glamor" y true false
config_query_option XSERVER_TCP "listen on TCP" n true false
+config_query_option XSERVER_SELINUX "Build XSELINUX" n true false
diff --git a/xorg/xserver/DETAILS b/xorg/xserver/DETAILS
index 8a471450cc..119a511f5d 100755
--- a/xorg/xserver/DETAILS
+++ b/xorg/xserver/DETAILS
@@ -2,7 +2,7 @@ source $GRIMOIRE/MESON_FUNCTIONS
SPELL=xserver
SPELLX=xorg-server
VERSION=1.20.10
- PATCHLEVEL=1
+ PATCHLEVEL=2
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_URL[0]=https://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/xorg/xserver/HISTORY b/xorg/xserver/HISTORY
index 264f0e4692..ed1c6dee53 100644
--- a/xorg/xserver/HISTORY
+++ b/xorg/xserver/HISTORY
@@ -1,3 +1,8 @@
+2021-02-17 Treeve Jelbert <treeve@sourcemage.org>
+ * BUILD CONFIGURE: delete xwayland stuff,; now a separate spell
+ * *SUB*: deleted
+ * DETAILS: PATCHLEVEL++
+
2020-12-29 Ismael Luceno <ismael@sourcemage.org>
* DEPENDS: Added systemd and tie dbus to it
* DETAILS: PATCHLEVEL++
diff --git a/xorg/xserver/PRE_SUB_DEPENDS b/xorg/xserver/PRE_SUB_DEPENDS
deleted file mode 100755
index 8f2b3643fe..0000000000
--- a/xorg/xserver/PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,5 +0,0 @@
-case $THIS_SUB_DEPENDS in
- XWAYLAND) [[ "${XSERVER_WAYLAND}" == "true" ]] ;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
- return 1;;
-esac
diff --git a/xorg/xserver/REPAIR^all^PRE_SUB_DEPENDS b/xorg/xserver/REPAIR^all^PRE_SUB_DEPENDS
deleted file mode 100755
index 8f2b3643fe..0000000000
--- a/xorg/xserver/REPAIR^all^PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,5 +0,0 @@
-case $THIS_SUB_DEPENDS in
- XWAYLAND) [[ "${XSERVER_WAYLAND}" == "true" ]] ;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
- return 1;;
-esac
diff --git a/xorg/xserver/REPAIR^all^SUB_DEPENDS b/xorg/xserver/REPAIR^all^SUB_DEPENDS
deleted file mode 100755
index 81101ee28b..0000000000
--- a/xorg/xserver/REPAIR^all^SUB_DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-case "$THIS_SUB_DEPENDS" in
- XWAYLAND) message "${MESSAGE_COLOR}Forcing XWayland...${DEFAULT_COLOR}" &&
- XSERVER_WAYLAND="true" ;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
- return 1;;
-esac
diff --git a/xorg/xserver/SUB_DEPENDS b/xorg/xserver/SUB_DEPENDS
deleted file mode 100755
index 81101ee28b..0000000000
--- a/xorg/xserver/SUB_DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-case "$THIS_SUB_DEPENDS" in
- XWAYLAND) message "${MESSAGE_COLOR}Forcing XWayland...${DEFAULT_COLOR}" &&
- XSERVER_WAYLAND="true" ;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
- return 1;;
-esac