diff --git a/x11-packages/xwayland/build.sh b/x11-packages/xwayland/build.sh index 4b44388933..49b340ea5b 100644 --- a/x11-packages/xwayland/build.sh +++ b/x11-packages/xwayland/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Wayland X11 server" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1.20.5 -TERMUX_PKG_REVISION=15 +TERMUX_PKG_REVISION=16 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libpciaccess, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, mesa, openssl, xkeyboard-config, xorg-xkbcomp, libwayland, libwayland-protocols, libepoxy" @@ -21,10 +21,10 @@ ac_cv_path_WAYLAND_SCANNER=$TERMUX_PREFIX/opt/libwayland/cross/bin/wayland-scann --enable-dga --enable-screensaver --enable-xdmcp ---disable-glx +--enable-glx --disable-dri --disable-dri2 ---disable-dri3 +--enable-dri3 --enable-present --enable-xinerama --enable-xf86vidmode diff --git a/x11-packages/xwayland/xwayland_disable_glx.patch b/x11-packages/xwayland/xwayland_disable_glx.patch deleted file mode 100644 index e1a61d7e55..0000000000 --- a/x11-packages/xwayland/xwayland_disable_glx.patch +++ /dev/null @@ -1,20 +0,0 @@ -+++ ./hw/xwayland/Makefile.am 2019-06-26 02:44:24.968986945 +0300 -@@ -24,7 +24,6 @@ - Xwayland_LDADD = \ - $(glamor_lib) \ - $(XWAYLAND_LIBS) \ -- $(top_builddir)/glx/libglxvnd.la \ - $(XWAYLAND_SYS_LIBS) \ - $(top_builddir)/Xext/libXvidmode.la \ - $(XSERVER_SYS_LIBS) - -+++ ./hw/xwayland/Makefile.in 2019-06-26 02:46:04.650920429 +0300 -@@ -640,7 +640,7 @@ - $(top_srcdir)/mi/miinitext.c $(am__append_1) $(am__append_2) \ - $(am__append_3) - Xwayland_LDADD = $(glamor_lib) $(XWAYLAND_LIBS) \ -- $(top_builddir)/glx/libglxvnd.la $(XWAYLAND_SYS_LIBS) \ -+ $(XWAYLAND_SYS_LIBS) \ - $(top_builddir)/Xext/libXvidmode.la $(XSERVER_SYS_LIBS) \ - $(am__append_5) - Xwayland_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)