From 5f4b314629a4ed2eedcb0983f78e4633d932600a Mon Sep 17 00:00:00 2001 From: Niclas Zeising Date: Tue, 31 Mar 2020 20:33:01 +0000 Subject: [PATCH] x11-servers/xorg-server: Update to 1.20.8 Update x11-servers/xorg-server to 1.20.8 This is a maintenance release Most notably, fixes some issues with displayport MST improves glamor in oom situations Add a patch to make us more compatible with the linux evdev headers we're using (devel/evdev-proto). This is needed for xf86-video-qxl. complete changelog: https://lists.x.org/archives/xorg-announce/2020-March/003041.html Obtained from: https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/xserver-1.20 --- x11-servers/xorg-server/Makefile | 3 +-- x11-servers/xorg-server/distinfo | 6 +++--- .../files/patch-hw_xfree86_common_xf86str.h | 11 +++++++++++ x11-servers/xorg-server/pkg-message | 3 --- 4 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86str.h diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 4da5c25467dd..b1d21c2b368c 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME?= xorg-server -PORTVERSION?= 1.20.7 -PORTREVISION?= 2 +PORTVERSION?= 1.20.8 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo index 19954d70ef0b..dce49ea58c6e 100644 --- a/x11-servers/xorg-server/distinfo +++ b/x11-servers/xorg-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1580036705 -SHA256 (xorg/xserver/xorg-server-1.20.7.tar.bz2) = bd5986f010f34f5b3d6bc99fe395ecb1e0dead15a26807e0c832701809a06ea1 -SIZE (xorg/xserver/xorg-server-1.20.7.tar.bz2) = 6303005 +TIMESTAMP = 1585642684 +SHA256 (xorg/xserver/xorg-server-1.20.8.tar.bz2) = d17b646bee4ba0fb7850c1cc55b18e3e8513ed5c02bdf38da7e107f84e2d0146 +SIZE (xorg/xserver/xorg-server-1.20.8.tar.bz2) = 6309640 diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86str.h b/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86str.h new file mode 100644 index 000000000000..22862dad444b --- /dev/null +++ b/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86str.h @@ -0,0 +1,11 @@ +--- hw/xfree86/common/xf86str.h.orig 2020-02-23 17:34:26 UTC ++++ hw/xfree86/common/xf86str.h +@@ -249,7 +249,7 @@ typedef struct _DriverRec { + */ + + /* Tolerate prior #include */ +-#if defined(__linux__) ++#if defined(__linux__) || defined(__FreeBSD__) + #undef BUS_NONE + #undef BUS_PCI + #undef BUS_SBUS diff --git a/x11-servers/xorg-server/pkg-message b/x11-servers/xorg-server/pkg-message index 0c6dbd2afcff..25d1c3ee3eb0 100644 --- a/x11-servers/xorg-server/pkg-message +++ b/x11-servers/xorg-server/pkg-message @@ -20,9 +20,6 @@ To enable evdev in such a device, run the following: To make it persistent across reboots, add the following to /etc/sysctl.conf: kern.evdev.rcpt_mask=6 - -If your X session locks up after starting certain applications, rebuild this -port with the FIXDRM option turned on. EOM } ]