diff --git a/x11-packages/mesa-swrast/build.sh b/x11-packages/mesa-swrast/build.sh
deleted file mode 100644
index 622e0eb07..000000000
--- a/x11-packages/mesa-swrast/build.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
-
-## Required by GLX functionality of Xvnc/Xvfb servers and shouldn't be
-## used by used by regular applications.
-##
-## Cannot built as part of package 'mesa' since --enable-glx=xlib
-## require DRI to be disabled.
-
-TERMUX_PKG_HOMEPAGE=https://www.mesa3d.org
-TERMUX_PKG_DESCRIPTION="The legacy/original Mesa software rasterizer"
-## Use 17.3.x branch because 18.x.x requires 'pthread_barrier_t'.
-TERMUX_PKG_VERSION=17.3.9
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SRCURL=https://mesa.freedesktop.org/archive/mesa-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=c5beb5fc05f0e0c294fefe1a393ee118cb67e27a4dca417d77c297f7d4b6e479
-
-TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, libdrm, libexpat, mesa"
-TERMUX_PKG_BUILD_DEPENDS="xorgproto"
-
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
---disable-asm
---disable-gbm
---disable-egl
---disable-gles1
---disable-gles2
---enable-glx=dri
---with-platforms=x11
---with-dri-drivers=swrast
---without-gallium-drivers
-ac_cv_header_xlocale_h=no
-"
-
-termux_step_pre_configure () {
-    export LIBS="-landroid-shmem -latomic"
-}
-
-termux_step_make_install() {
-    install -Dm600 ./lib/swrast_dri.so "${TERMUX_PREFIX}/lib/dri/swrast_dri.so"
-
-    install \
-        -Dm600 \
-        "${TERMUX_PKG_SRCDIR}/include/GL/internal/dri_interface.h" \
-        "${TERMUX_PREFIX}/include/GL/internal/dri_interface.h"
-}
diff --git a/x11-packages/mesa/build.sh b/x11-packages/mesa/build.sh
index d06b788be..ff62c6fa9 100644
--- a/x11-packages/mesa/build.sh
+++ b/x11-packages/mesa/build.sh
@@ -4,7 +4,7 @@ TERMUX_PKG_HOMEPAGE=https://www.mesa3d.org
 TERMUX_PKG_DESCRIPTION="An open-source implementation of the OpenGL specification"
 ## Use 17.3.x branch because 18.x.x requires 'pthread_barrier_t'.
 TERMUX_PKG_VERSION=17.3.9
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://mesa.freedesktop.org/archive/mesa-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=c5beb5fc05f0e0c294fefe1a393ee118cb67e27a4dca417d77c297f7d4b6e479
 
@@ -22,14 +22,14 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-gles2
 --disable-dri
 --disable-dri3
---enable-glx=xlib
+--disable-glx
 --with-platforms=x11
 --without-dri-drivers
 --without-gallium-drivers
 ac_cv_header_xlocale_h=no
 "
 
-termux_step_pre_configure () {
+termux_step_pre_configure() {
     export LIBS="-landroid-shmem -latomic"
 }
 
diff --git a/x11-packages/tigervnc/build.sh b/x11-packages/tigervnc/build.sh
index 19352ef1e..616783a2c 100644
--- a/x11-packages/tigervnc/build.sh
+++ b/x11-packages/tigervnc/build.sh
@@ -2,12 +2,12 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 
 TERMUX_PKG_HOMEPAGE=http://www.tigervnc.org/
 TERMUX_PKG_VERSION=1.9.0
-TERMUX_PKG_REVISION=17
+TERMUX_PKG_REVISION=18
 TERMUX_PKG_DESCRIPTION="Suite of VNC servers. Based on the VNC 4 branch of TightVNC."
 TERMUX_PKG_SRCURL=https://github.com/TigerVNC/tigervnc/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=f15ced8500ec56356c3bf271f52e58ed83729118361c7103eab64a618441f740
 
-TERMUX_PKG_DEPENDS="freetype, libandroid-support, libandroid-shmem, libbz2, libc++, libdrm, libexpat, libgnutls, libjpeg-turbo, libpixman, libpng, libuuid, libx11, libxau, libxcb, libxdamage, libxdmcp, libxext, libxxf86vm, libxfixes, libxfont2, libxshmfence, mesa, mesa-swrast, openssl, perl, xkeyboard-config, xorg-xauth, xorg-xkbcomp"
+TERMUX_PKG_DEPENDS="freetype, libandroid-support, libandroid-shmem, libbz2, libc++, libdrm, libexpat, libgnutls, libjpeg-turbo, libpixman, libpng, libuuid, libx11, libxau, libxcb, libxdamage, libxdmcp, libxext, libxxf86vm, libxfixes, libxfont2, libxshmfence, mesa, openssl, perl, xkeyboard-config, xorg-xauth, xorg-xkbcomp"
 TERMUX_PKG_BUILD_DEPENDS="xorgproto, xorg-font-util, xorg-util-macros, xorg-server-xvfb, xtrans"
 TERMUX_PKG_SUGGESTS="aterm, xorg-twm"
 
diff --git a/x11-packages/xorg-server-xvfb/build.sh b/x11-packages/xorg-server-xvfb/build.sh
index 0993228b1..2cf013cf5 100644
--- a/x11-packages/xorg-server-xvfb/build.sh
+++ b/x11-packages/xorg-server-xvfb/build.sh
@@ -3,10 +3,11 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
 TERMUX_PKG_HOMEPAGE=http://xorg.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="X virtual framebuffer"
 TERMUX_PKG_VERSION=1.20.3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=1b3ce466c12cacbe2252b3ad5b0ed561972eef9d09e75900d65fb1e21f9201de
 
-TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, mesa, mesa-swrast, openssl, xkeyboard-config, xorg-xkbcomp"
+TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, mesa, openssl, xkeyboard-config, xorg-xkbcomp"
 TERMUX_PKG_CONFLICTS="xorg-xvfb"
 TERMUX_PKG_REPLACES="xorg-xvfb"
 
@@ -20,7 +21,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --enable-dga
 --enable-screensaver
 --enable-xdmcp
---enable-glx
+--disable-glx
 --disable-dri
 --disable-dri2
 --disable-dri3