ajax pushed to xorg-x11-drv-intel (f22). "Today's git snap (..more)"

[notifications at fedoraproject.org]

From 26cd5983d4368e92d9b7c4b68a072ed756530973 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Wed, 20 May 2015 13:02:25 -0400
Subject: Today's git snap

- Don't force the default to DRI3, use upstream's preference
- Fix build failure due to GCC PR65873

diff --git a/.gitignore b/.gitignore
index 209bb73..09dda9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,4 @@ xf86-video-intel-2.10.0.tar.bz2
 /xf86-video-intel-2.99.917.tar.bz2
 /intel-gpu-tools-1.9.tar.bz2
 /xf86-video-intel-20150211.tar.bz2
+/xf86-video-intel-20150520.tar.bz2
diff --git a/intel-gcc-pr65873.patch b/intel-gcc-pr65873.patch
new file mode 100644
index 0000000..ed05bce
--- /dev/null
+++ b/intel-gcc-pr65873.patch
@@ -0,0 +1,12 @@
+diff -up xf86-video-intel-20150520/src/sna/compiler.h.jx xf86-video-intel-20150520/src/sna/compiler.h
+--- xf86-video-intel-20150520/src/sna/compiler.h.jx	2015-05-19 07:44:26.000000000 -0400
++++ xf86-video-intel-20150520/src/sna/compiler.h	2015-05-20 12:53:54.797918726 -0400
+@@ -64,7 +64,7 @@
+ #endif
+ 
+ #if HAS_GCC(4, 6) && defined(__OPTIMIZE__)
+-#define fast __attribute__((optimize("Ofast")))
++#define fast __attribute__((optimize("O3")))
+ #else
+ #define fast
+ #endif
diff --git a/sources b/sources
index c542dde..3432b89 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 1e768f2b1edc8613911b1d33bb361a7f  intel-gpu-tools-1.9.tar.bz2
-279ea4929133e34cbbed5b877c0a9b02  xf86-video-intel-20150211.tar.bz2
+a8aec3b439b3e9ded9d78c8000cc8786  xf86-video-intel-20150520.tar.bz2
diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec
index e7c9d58..3a3edde 100644
--- a/xorg-x11-drv-intel.spec
+++ b/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 20150211
+%define gitdate 20150520
 %define gitrev .%{gitdate}
 
 %undefine _hardened_build
@@ -28,7 +28,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.99.917
-Release:   8%{?gitrev}%{?dist}
+Release:   9%{?gitrev}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -42,6 +42,7 @@ Source1:    make-intel-gpu-tools-snapshot.sh
 Source3:    http://xorg.freedesktop.org/archive/individual/app/intel-gpu-tools-%{gputoolsver}.tar.bz2
 Source4:    make-git-snapshot.sh
 
+Patch0:	    intel-gcc-pr65873.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -98,11 +99,12 @@ Debugging tools for Intel graphics chips
 
 %prep
 %setup -q -n xf86-video-intel-%{?gitdate:%{gitdate}}%{!?gitdate:%{dirsuffix}} -b3
+%patch0 -p1 -b .gcc
 
 %build
 autoreconf -f -i -v
-%configure %{?kmsonly:--enable-kms-only} --with-default-dri=3 --enable-tools
-make %{?_smp_mflags}
+%configure %{?kmsonly:--enable-kms-only} --enable-tools
+make %{?_smp_mflags} V=1
 
 pushd ../intel-gpu-tools-%{gputoolsver}
 # this is missing from the tarbal, having it empty is ok
@@ -159,6 +161,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libI*XvMC.so
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Wed May 20 2015 Adam Jackson <ajax at redhat.com> 2.99.917-9
+- Today's git snap
+- Don't force the default to DRI3, use upstream's preference
+- Fix build failure due to GCC PR65873
+
 * Mon Mar 02 2015 Dave Airlie <airlied at redhat.com> 2.99.917-8
 - this time for sure, now less hardended.
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/xorg-x11-drv-intel.git/commit/?h=f22&id=26cd5983d4368e92d9b7c4b68a072ed756530973