diff --git a/x11-packages/xorg-server-xvfb/build.sh b/x11-packages/xorg-server-xvfb/build.sh index 4d1a4e675..f1a1f4cc6 100644 --- a/x11-packages/xorg-server-xvfb/build.sh +++ b/x11-packages/xorg-server-xvfb/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://xorg.freedesktop.org/ TERMUX_PKG_DESCRIPTION="X virtual framebuffer" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="Leonid Plyushch " -TERMUX_PKG_VERSION=1.20.5 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_VERSION=1.20.6 TERMUX_PKG_SRCURL=https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d +TERMUX_PKG_SHA256=6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1 TERMUX_PKG_DEPENDS="libandroid-shmem, libdrm, libpixman, libx11, libxau, libxfont2, libxinerama, libxkbfile, libxshmfence, mesa, openssl, xkeyboard-config, xorg-xkbcomp" TERMUX_PKG_CONFLICTS="xorg-xvfb" diff --git a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_common_compiler.h.patch b/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_common_compiler.h.patch deleted file mode 100644 index 46ed95dde..000000000 --- a/x11-packages/xorg-server-xvfb/xorg-server-1.20.1_hw_xfree86_common_compiler.h.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -uNr xorg-server-1.20.1/hw/xfree86/common/compiler.h xorg-server-1.20.1.mod/hw/xfree86/common/compiler.h ---- xorg-server-1.20.1/hw/xfree86/common/compiler.h 2018-08-07 19:31:02.000000000 +0300 -+++ xorg-server-1.20.1.mod/hw/xfree86/common/compiler.h 2018-10-08 21:07:16.804247702 +0300 -@@ -518,7 +518,7 @@ - barrier(); - } - --#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) -+#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) || defined(__ANDROID__) - #if defined(__arm32__) || defined(__mips64) - #define PORT_SIZE long - #else -@@ -758,7 +758,7 @@ - return xf86ReadMmio32Le((void *) ioBase, port); - } - --#elif defined(__arm__) && defined(__linux__) -+#elif defined(__arm__) && defined(__linux__) && !defined(__ANDROID__) - - /* for Linux on ARM, we use the LIBC inx/outx routines */ - /* note that the appropriate setup via "ioperm" needs to be done */