--- xorg-x11-server.spec	2017-06-27 07:27:13.000000000 +0900
+++ xorg-x11-server.spec	2017-10-19 23:01:11.000000000 +0900
@@ -1,3 +1,4 @@
+%define buildid .v4
 # This package is an experiment in active integration of upstream SCM with
 # Fedora packaging.  It works something like this:
 #
@@ -42,7 +43,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.19.3
-Release:   11%{?gitdate:.%{gitdate}}%{?dist}
+Release:   11%{?gitdate:.%{gitdate}}%{?dist}%{?buildid}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -81,7 +82,8 @@
 Patch09: 0001-xfree86-Allow-mixed-fbdev-and-pci-setups.patch
 
 # RHEL-specific mustard
-Patch100: 0001-mustard-Don-t-probe-for-drivers-not-shipped-in-RHEL7.patch
+#Patch100: 0001-mustard-Don-t-probe-for-drivers-not-shipped-in-RHEL7.patch
+Patch100: patch-un-nouveau.patch
 Patch101: 0001-Always-install-vbe-and-int10-sdk-headers.patch
 Patch102: 0001-mustard-Enable-indirect-GLX-by-default.patch
 Patch103: 06_use-intel-only-on-pre-gen4.diff
@@ -391,6 +393,7 @@
 	--enable-xselinux --enable-record --enable-present \
 	--enable-config-udev \
 	--disable-unit-tests \
+	--disable-systemd-logind \
 	%{dri_flags} %{?bodhi_flags} \
 	${CONFIGURE}
         
@@ -579,6 +582,15 @@
 %{xserver_source_dir}
 
 %changelog
+* Tue Oct 17 2017 T.Kabe <kabe.sra-tohoku.co.jp> - 1.19.3-11.el7.v4
+- disable 0001-mustard-Don-t-probe-for-drivers-not-shipped-in-RHEL7.patch
+  to enable legacy device drivers
+
+  * Thu Mar  2 2017 T.Kabe <kabe.sra-tohoku.co.jp> - 1.17.2-22.el7.v2
+  - add --disable-systemd-logind, to match with mock build environment,
+  which lacks dbus-devel
+  (IOW systemd-logind never had been under serious test)
+
 * Mon Jun 26 2017 Adam Jackson <ajax@redhat.com> - 1.19.3-11
 - Fix off-by-one in X -configure
 

--- /dev/null	2018-05-28 20:28:22.234956756 +0900
+++ ../SOURCES/patch-un-nouveau.patch	2017-10-19 22:46:07.000000000 +0900
@@ -0,0 +1,20 @@
+diff -up ./hw/xfree86/common/xf86pciBus.c.v4 ./hw/xfree86/common/xf86pciBus.c
+--- ./hw/xfree86/common/xf86pciBus.c.v4	2017-10-19 22:42:56.000000000 +0900
++++ ./hw/xfree86/common/xf86pciBus.c	2017-10-19 22:45:32.000000000 +0900
+@@ -1202,15 +1202,8 @@ xf86VideoPtrToDriverList(struct pci_devi
+         break;
+     case 0x10de:
+     case 0x12d2:
+-    {
+-        int idx = 0;
+-
+-#ifdef __linux__
+-        driverList[idx++] = "nouveau";
+-#endif
+-        driverList[idx++] = "nv";
++        driverList[0] = "nouveau";
+         break;
+-    }
+     case 0x1106:
+         driverList[0] = "openchrome";
+         break;
--- /dev/null	2017-10-17 21:33:33.235522963 +0900
+++ ../SOURCES/patch-xfree86-use-modesetting-driver-by-default-on-GeForce.patch	2017-10-18 00:16:01.000000000 +0900
@@ -0,0 +1,53 @@
+From f374410a00145d1703633547e90f10d43b3ded9f Mon Sep 17 00:00:00 2001
+From: Ben Skeggs <bskeggs@redhat.com>
+Date: Thu, 27 Apr 2017 10:52:24 +1000
+Subject: [PATCH] xfree86: use modesetting driver by default on GeForce 8 and
+ newer
+
+Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+---
+ hw/xfree86/common/xf86pciBus.c | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff -up ./hw/xfree86/common/xf86pciBus.c.v4 ./hw/xfree86/common/xf86pciBus.c
+--- ./hw/xfree86/common/xf86pciBus.c.v4	2017-10-18 00:00:47.000000000 +0900
++++ ./hw/xfree86/common/xf86pciBus.c	2017-10-18 00:13:38.000000000 +0900
+@@ -37,6 +37,7 @@
+ #include <unistd.h>
+ #include <X11/X.h>
+ #include <pciaccess.h>
++#include <xf86drm.h>
+ #include "os.h"
+ #include "Pci.h"
+ #include "xf86.h"
+@@ -1203,12 +1204,26 @@ xf86VideoPtrToDriverList(struct pci_devi
+     case 0x10de:
+     case 0x12d2:
+     {
+-        int idx = 0;
++        char busid[32];
++        int fd;
++
++        snprintf(busid, sizeof(busid), "pci:%04x:%02x:%02x.%d",
++                 dev->domain, dev->bus, dev->dev, dev->func);
++
++	/* 'modesetting' is preferred for GeForce 8 and newer GPUs */
++        fd = drmOpenWithType("nouveau", busid, DRM_NODE_RENDER);
++        if (fd >= 0) {
++            uint64_t args[] = { 11 /* NOUVEAU_GETPARAM_CHIPSET_ID */, 0 };
++            int ret = drmCommandWriteRead(fd, 0 /* DRM_NOUVEAU_GETPARAM */,
++                                          &args, sizeof(args));
++            drmClose(fd);
++            if (ret == 0) {
++                if (args[1] == 0x050 || args[1] >= 0x80)
++                    break;
++            }
++        }
+ 
+-#ifdef __linux__
+         driverList[idx++] = "nouveau";
+-#endif
+-        driverList[idx++] = "nv";
+         break;
+     }
+     case 0x1106: