[xorg-x11-drv-intel] Rebase to 2.99.914

[Hans de Goede]

commit ce382bcb7266027bc51716d238ab9a033a13ed74
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Jul 28 13:04:19 2014 +0200

    Rebase to 2.99.914

 .gitignore                                         |    1 +
 ...ix-security-issues-in-handling-of-the-int.patch |   42 --------------------
 ...sna-dri3-Mesa-relies-upon-implicit-fences.patch |    4 +-
 0002-backlight-Fix-compile-error.patch             |   39 ------------------
 sources                                            |    2 +-
 xorg-x11-drv-intel.spec                            |   15 +++----
 6 files changed, 11 insertions(+), 92 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 576ed3a..abddeee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@ xf86-video-intel-2.10.0.tar.bz2
 /xf86-video-intel-2.99.911.tar.bz2
 /xf86-video-intel-2.99.912.tar.bz2
 /intel-gpu-tools-1.7.tar.bz2
+/xf86-video-intel-2.99.914.tar.bz2
diff --git a/0001-sna-dri3-Mesa-relies-upon-implicit-fences.patch b/0001-sna-dri3-Mesa-relies-upon-implicit-fences.patch
index 5773223..8374b9f 100644
--- a/0001-sna-dri3-Mesa-relies-upon-implicit-fences.patch
+++ b/0001-sna-dri3-Mesa-relies-upon-implicit-fences.patch
@@ -24,8 +24,8 @@ index 78f422d..1b488e7 100644
 +		sna_accel_watch_flush(sna, -1);
 +
  	if (priv->header) {
- 		assert(!priv->shm);
  		assert(pixmap->drawable.pScreen == sna->scrn->pScreen);
+ 		assert(!priv->shm);
 diff --git a/src/sna/sna_dri3.c b/src/sna/sna_dri3.c
 index 5d51b41..61ebbe4 100644
 --- a/src/sna/sna_dri3.c
@@ -91,7 +91,7 @@ index 5d51b41..61ebbe4 100644
  free_pixmap:
 @@ -338,6 +360,8 @@ static int sna_dri3_fd_from_pixmap(ScreenPtr screen,
  		priv->pinned |= PIN_DRI3;
- 	}
+ 	list_move(&priv->cow_list, &sna->dri3.pixmaps);
  
 +	mark_dri3_pixmap(sna, priv, bo);
 +
diff --git a/sources b/sources
index d9be62e..2965145 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-88d1a884f9b7bd07bf0755cfa34052d4  xf86-video-intel-2.99.912.tar.bz2
+b53d96cb42fb1d71f0b671dd2064cba4  xf86-video-intel-2.99.914.tar.bz2
 680b95fd4f73f2d3b9004d2a2fb57f77  intel-gpu-tools-1.7.tar.bz2
diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec
index 747968a..ba8070a 100644
--- a/xorg-x11-drv-intel.spec
+++ b/xorg-x11-drv-intel.spec
@@ -25,8 +25,8 @@
 
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
-Version:   2.99.912
-Release:   6%{?gitrev}%{?dist}
+Version:   2.99.914
+Release:   1%{?gitrev}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -39,9 +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-backlight-Fix-security-issues-in-handling-of-the-int.patch
-Patch2:     0002-backlight-Fix-compile-error.patch
-Patch3:     0001-sna-dri3-Mesa-relies-upon-implicit-fences.patch
+Patch1:     0001-sna-dri3-Mesa-relies-upon-implicit-fences.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -90,8 +88,6 @@ Debugging tools for Intel graphics chips
 %prep
 %setup -q -n xf86-video-intel-%{?gitdate:%{gitdate}}%{!?gitdate:%{dirsuffix}} -b3
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %configure %{?kmsonly:--enable-kms-only}
@@ -151,6 +147,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libI*XvMC.so
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Mon Jul 28 2014 Hans de Goede <hdegoede at redhat.com> - 2.99.914-1
+- Rebase to 2.99.914
+
 * Tue Jul 22 2014 Adel Gadllah <adel.gadllah at gmail.com> - 2.99.912-6
 - Apply fix for sna render corruption due to missing fencing, FDO #81551
 
@@ -167,7 +166,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libI*XvMC.so
 - 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
+- Rebase to 2.99.912
 - Rebuild for xserver 1.15.99.903
 - Update intel-gpu-tools to 1.7 release