svn commit: r489817 - in branches/2019Q1/x11-servers/xorg-server: . files

[Niclas Zeising]

Author: zeising
Date: Wed Jan  9 17:52:03 2019
New Revision: 489817
URL: https://svnweb.freebsd.org/changeset/ports/489817

Log:
  MFH: r489754
  
  Fix illegal instruction when running in kvm/qemu
  
  Fix illegal instruction when running xserver in kvm or qemu (and possibly
  others) virtualisation.  This is solved by disabling sse instructions while
  compiling the xf86SlowBcopy (don't ask) function.
  
  This fix was originally committed by dim as r396167 in 2015, and then most
  likely accidentally removed in r433863 in 2017.
  
  Bump portrevision
  
  Original commit message:
  
  > Disable use of SSE instructions in Xorg's xf86SlowBcopy() function.
  >
  > When such instructions are used to copy data from/to mapped video
  > memory, some hypervisors (e.g. KVM, Microsoft Hyper-V) can generate
  > SIGILL or SIGBUS exceptions, causing Xorg to crash.
  
  PR:		202643
  Reported by:	nogcjx at fastmail.fm
  Requested by:	dim
  Diagnose and fix by:	dim
  
  Approved by:	ports-secteam (miwi)

Added:
  branches/2019Q1/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in
     - copied unchanged from r489754, head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in
Modified:
  branches/2019Q1/x11-servers/xorg-server/Makefile
Directory Properties:
  branches/2019Q1/   (props changed)

Modified: branches/2019Q1/x11-servers/xorg-server/Makefile
==============================================================================
--- branches/2019Q1/x11-servers/xorg-server/Makefile	Wed Jan  9 16:45:54 2019	(r489816)
+++ branches/2019Q1/x11-servers/xorg-server/Makefile	Wed Jan  9 17:52:03 2019	(r489817)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	xorg-server
 PORTVERSION?=	1.18.4
-PORTREVISION?=	10
+PORTREVISION?=	11
 PORTEPOCH?=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver

Copied: branches/2019Q1/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in (from r489754, head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2019Q1/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in	Wed Jan  9 17:52:03 2019	(r489817, copy of r489754, head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in)
@@ -0,0 +1,12 @@
+--- hw/xfree86/os-support/misc/Makefile.in.orig	2015-09-23 10:21:18.470900000 +0200
++++ hw/xfree86/os-support/misc/Makefile.in	2015-09-23 10:22:34.979974000 +0200
+@@ -530,7 +530,8 @@
+ 
+ #AM_LDFLAGS = -r
+ AM_CPPFLAGS = $(XORG_INCS)
+-AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
++ at I386_VIDEO_TRUE@I386_VIDEO_CFLAGS = -mno-sse
++AM_CFLAGS = $(I386_VIDEO_CFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS)
+ EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS)
+ all: all-am
+