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

[Dave Airlie]

commit ee5779ad34676eca0207afd15c94fa5aaebced99
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Sep 10 10:53:53 2014 +1000

    Rebase to 2.99.916

 .gitignore                                         |    1 +
 ...ids-Use-the-corrected-trapezoid-origin-fo.patch |  126 -----
 sources                                            |    2 +-
 uxa-mst.patch                                      |  588 --------------------
 xorg-x11-drv-intel.spec                            |   12 +-
 5 files changed, 7 insertions(+), 722 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index abddeee..9314820 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,4 @@ xf86-video-intel-2.10.0.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
+/xf86-video-intel-2.99.916.tar.bz2
diff --git a/sources b/sources
index 2965145..6a42f29 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b53d96cb42fb1d71f0b671dd2064cba4  xf86-video-intel-2.99.914.tar.bz2
 680b95fd4f73f2d3b9004d2a2fb57f77  intel-gpu-tools-1.7.tar.bz2
+7e24551eae0b952f4d795e791e88ebe5  xf86-video-intel-2.99.916.tar.bz2
diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec
index b8bee0b..68c98be 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.914
-Release:   4%{?gitrev}%{?dist}
+Version:   2.99.916
+Release:   1%{?gitrev}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -40,9 +40,6 @@ 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-sna-dri3-Mesa-relies-upon-implicit-fences.patch
-Patch2:     0001-sna-trapezoids-Use-the-corrected-trapezoid-origin-fo.patch
-
-Patch10: uxa-mst.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -91,9 +88,7 @@ Debugging tools for Intel graphics chips
 %prep
 %setup -q -n xf86-video-intel-%{?gitdate:%{gitdate}}%{!?gitdate:%{dirsuffix}} -b3
 %patch1 -p1
-%patch2 -p1
 
-%patch10 -p1 -b .mst
 %build
 %configure %{?kmsonly:--enable-kms-only}
 make %{?_smp_mflags}
@@ -152,6 +147,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libI*XvMC.so
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Wed Sep 10 2014 Dave Airlie <airlied at redhat.com> 2.99.916-1
+- Rebase to 2.99.916
+
 * Wed Sep 03 2014 Dave Airlie <airlied at redhat.com> 2.99.914-4
 - Add UXA MST support as a fallback