diff --git a/srcpkgs/xorg-server/patches/musl-io.patch b/srcpkgs/xorg-server/patches/musl-io.patch deleted file mode 100644 index 0326be3475a..00000000000 --- a/srcpkgs/xorg-server/patches/musl-io.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- hw/xfree86/common/compiler.h 2015-06-05 17:19:40.000000000 +0200 -+++ hw/xfree86/common/compiler.h 2015-06-20 11:07:13.548555711 +0200 -@@ -758,7 +758,7 @@ - return xf86ReadMmio32Le((void *) ioBase, port); - } - --#elif defined(__arm__) && defined(__linux__) -+#elif defined(__arm__) && defined(__linux__) && defined(__GLIBC__) - - /* for Linux on ARM, we use the LIBC inx/outx routines */ - /* note that the appropriate setup via "ioperm" needs to be done */ diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index 06ddfb3eac1..af02d94730a 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,7 +1,7 @@ # Template file for 'xorg-server' pkgname=xorg-server -version=1.20.5 -revision=2 +version=1.20.6 +revision=1 build_style=meson configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb @@ -23,7 +23,7 @@ maintainer="Orphaned " license="MIT, BSD-3-Clause" homepage="https://xorg.freedesktop.org" distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2" -checksum=a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d +checksum=6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1 lib32disabled=yes provides="xserver-abi-extension-10_1 xserver-abi-input-24_1 xserver-abi-video-24_1 xf86-video-modesetting-1_1" replaces="xf86-video-modesetting>=0"