[xorg-x11-drv-intel] DRI3 support causes gnome-shell to hang, disable for now

[Hans de Goede]

commit 67c6600873913cab1782185484e18fcedfa6339c
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Thu Jun 12 23:10:43 2014 +0200

    DRI3 support causes gnome-shell to hang, disable for now

 0001-HACK-quick-fix-disable-dri3.patch |   52 ++++++++++++++++++++++++++++++++
 xorg-x11-drv-intel.spec                |   12 ++++---
 2 files changed, 59 insertions(+), 5 deletions(-)
---
diff --git a/0001-HACK-quick-fix-disable-dri3.patch b/0001-HACK-quick-fix-disable-dri3.patch
new file mode 100644
index 0000000..db1c70f
--- /dev/null
+++ b/0001-HACK-quick-fix-disable-dri3.patch
@@ -0,0 +1,52 @@
+From 86b58835fce56ae13453a89a0b0d93c9517c2758 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede at redhat.com>
+Date: Thu, 12 Jun 2014 22:54:50 +0200
+Subject: [PATCH] HACK/quick-fix: disable dri3
+
+Signed-off-by: Hans de Goede <hdegoede at redhat.com>
+---
+ configure.ac | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b3b6e8e..2937afc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -248,7 +248,8 @@ if test "x$shm" = "xyes"; then
+ 		  AC_MSG_RESULT(assuming no))
+ fi
+ 
+-PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"])
++dnl PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"])
++x11_dri3="no"
+ AM_CONDITIONAL(X11_DRI3, test "x$x11_dri3" = "xyes" -a "x$shm" = "xyes")
+ 
+ AC_ARG_ENABLE(tools,
+@@ -264,7 +265,8 @@ fi
+ if test "x$tools" != "xno"; then
+ 	ivo_requires="xinerama xrandr xdamage xfixes xcursor xtst xrender xext x11 pixman-1"
+ 	PKG_CHECK_MODULES(IVO, [$ivo_requires], [ivo="yes"], [ivo="no"])
+-	PKG_CHECK_MODULES(IVO_DRI3, [xcb-dri3 xcb-sync x11-xcb xshmfence x11], [ivo_dri3="yes"], [ivo_dri3="no"])
++	dnl PKG_CHECK_MODULES(IVO_DRI3, [xcb-dri3 xcb-sync x11-xcb xshmfence x11], [ivo_dri3="yes"], [ivo_dri3="no"])
++	ivo_dri3="no"
+ 	if test "x$ivo_dri3" = "xyes"; then
+ 		IVO_CFLAGS="$IVO_CFLAGS $IVO_DRI3_CFLAGS -DDRI3"
+ 		IVO_LIBS="$IVO_LIBS $IVO_DRI3_LIBS"
+@@ -520,10 +522,10 @@ if test "x$DRI" != "xno"; then
+ 		CFLAGS=$save_CFLAGS
+ 	fi
+ 
+-	XORG_DRIVER_CHECK_EXT(DRI3, dri3proto)
+-	if test "x$_EXT_CHECK" != "xno"; then
+-		PKG_CHECK_MODULES(DRI3, [dri3proto], [DRI3=$DRI], [])
+-	fi
++	dnl XORG_DRIVER_CHECK_EXT(DRI3, dri3proto)
++	dnl if test "x$_EXT_CHECK" != "xno"; then
++	dnl	PKG_CHECK_MODULES(DRI3, [dri3proto], [DRI3=$DRI], [])
++	dnl fi
+ 	if test "x$DRI3" != "xno"; then
+ 		save_CFLAGS=$CFLAGS
+ 		CFLAGS="$XORG_CFLAGS $DRI3_CFLAGS"
+-- 
+2.0.0
+
diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec
index 1999d7f..4ca41c8 100644
--- a/xorg-x11-drv-intel.spec
+++ b/xorg-x11-drv-intel.spec
@@ -26,7 +26,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.99.912
-Release:   1%{?gitrev}%{?dist}
+Release:   2%{?gitrev}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -39,6 +39,7 @@ Source0:    http://xorg.freedesktop.org/archive/individual/driver/xf86-video-int
 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
+Patch1:     0001-HACK-quick-fix-disable-dri3.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -86,12 +87,10 @@ Debugging tools for Intel graphics chips
 
 %prep
 %setup -q -n xf86-video-intel-%{?gitdate:%{gitdate}}%{!?gitdate:%{dirsuffix}} -b3
+%patch1 -p1
+autoreconf -i -v
 
 %build
- 
-#export CFLAGS="$RPM_OPT_FLAGS -fno-omit-frame-pointer"
-%{?gitdate:autoreconf -v --install}
-
 %configure %{?kmsonly:--enable-kms-only}
 make %{?_smp_mflags}
 
@@ -149,6 +148,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libI*XvMC.so
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Thu Jun 12 2014 Hans de Goede <hdegoede at redhat.com> - 2.99.912-2
+- DRI3 support causes gnome-shell to hang, disable for now
+
 * Wed Jun 11 2014 Hans de Goede <hdegoede at redhat.com> - 2.99.912-1
 - Rebase to 2.99.911
 - Rebuild for xserver 1.15.99.903