From dd838171f4f4dbfda35337510dfe5f4810585164 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 30 2018 05:17:07 +0000
Subject: import xorg-x11-drv-intel-2.99.917-28.20180530.el7


---

diff --git a/.gitignore b/.gitignore
index 9829984..b5fa2b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 SOURCES/intel-gpu-tools-1.9.tar.bz2
-SOURCES/xf86-video-intel-20160929.tar.bz2
+SOURCES/xf86-video-intel-20180530.tar.bz2
diff --git a/.xorg-x11-drv-intel.metadata b/.xorg-x11-drv-intel.metadata
index 955b246..c961c29 100644
--- a/.xorg-x11-drv-intel.metadata
+++ b/.xorg-x11-drv-intel.metadata
@@ -1,2 +1,2 @@
 396e9f50283681d50364b86a7af9988c56148ac8 SOURCES/intel-gpu-tools-1.9.tar.bz2
-e56f94aa2246745fa523f164557a557fb96131c7 SOURCES/xf86-video-intel-20160929.tar.bz2
+d455a39db7f79f2dfa2775e63076a8f1b25bde51 SOURCES/xf86-video-intel-20180530.tar.bz2
diff --git a/SPECS/xorg-x11-drv-intel.spec b/SPECS/xorg-x11-drv-intel.spec
index 087a0c6..e2a5804 100644
--- a/SPECS/xorg-x11-drv-intel.spec
+++ b/SPECS/xorg-x11-drv-intel.spec
@@ -1,7 +1,7 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 %define gputoolsver 1.9
-%define gitdate 20160929
+%define gitdate 20180530
 %define gitrev .%{gitdate}
 
 %undefine _hardened_build
@@ -9,9 +9,6 @@
 %if 0%{?rhel} == 7
 %define rhel7 1
 %endif
-%if 0%{?rhel} == 6
-%define rhel6 1
-%endif
 
 %if 0%{?rhel7} || 0%{?fedora} > 17
 %define prime 1
@@ -19,16 +16,12 @@
 
 %if 0%{?rhel7} || 0%{?fedora} > 20
 %define kmsonly 1
-%else
-%ifnarch %{ix86}
-%define kmsonly 1
-%endif
 %endif
 
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.99.917
-Release:   27%{?gitrev}%{?dist}
+Release:   28%{?gitrev}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -120,7 +113,8 @@ popd
 
 %build
 autoreconf -f -i -v
-%configure %{?kmsonly:--enable-kms-only} --with-default-dri=3 --enable-tools
+%configure %{?kmsonly:--enable-kms-only} --with-default-dri=3 --enable-tools || \
+    (cat config.log ; exit 1)
 make %{?_smp_mflags} V=1
 
 pushd ../intel-gpu-tools-%{gputoolsver}
@@ -181,6 +175,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libI*XvMC.so
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Wed May 30 2018 Adam Jackson <ajax@redhat.com> - 2.99.917-28
+- Today's git snapshot (commit 35947721)
+
+* Wed May 30 2018 Adam Jackson <ajax@redhat.com> - 2.99.917-27.20160929.1
+- Rebuild for xserver 1.20
+
 * Fri Jan 12 2018 Adam Jackson <ajax@redhat.com> - 2.99.917-27
 - Re-enable skylake support, as we're now defaulting to modesetting in the
   server.