From 81c5019f54f6d6d74bef3f65e789e7432fb4e0f4 Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@fedoraproject.org>
Date: Apr 01 2008 19:30:46 +0000
Subject: * Tue Apr  1 2008 Kristian Høgsberg <krh@redhat.com> 1.4.99.901-14.20080401

- Rebase to new snapshot to pull in DRI2 direct rendering work.

---

diff --git a/.cvsignore b/.cvsignore
index 85e5405..7bcbd9e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xorg-server-20080314.tar.bz2
+xorg-server-20080331.tar.bz2
diff --git a/commitid b/commitid
index 53c750f..e2509ee 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-4a61cf3b08942895868e18bff11e0e4e12f69a7e
+2156bdf3b7b5b7d3ee4d3278eac0f28c7bff830a
diff --git a/sources b/sources
index 2817175..ba09629 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-455e0406e3b9f7a22d33f596284f9cd0  xorg-server-20080314.tar.bz2
+e858611812f37e34092e13c51094e2ce  xorg-server-20080401.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 1e14079..3400a7d 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -15,7 +15,7 @@
 # RHEL5 bugfix sync
 
 %define pkgname xorg-server
-%define gitdate 20080314
+%define gitdate 20080401
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
@@ -90,7 +90,7 @@ BuildRequires: git-core
 BuildRequires: automake autoconf libtool pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.1.5
 
-BuildRequires: xorg-x11-proto-devel >= 7.3-7
+BuildRequires: xorg-x11-proto-devel >= 7.3-10
 BuildRequires: damageproto >= 1.1
 BuildRequires: fixesproto >= 4.0
 BuildRequires: glproto >= 1.4.9
@@ -115,8 +115,8 @@ BuildRequires: libXv-devel
 
 # openssl? really?
 BuildRequires: pixman-devel libpciaccess-devel openssl-devel byacc flex
-BuildRequires: mesa-libGL-devel >= 7.1-0.20
-BuildRequires: mesa-source >= 7.1-0.20
+BuildRequires: mesa-libGL-devel >= 7.1-0.21
+BuildRequires: mesa-source >= 7.1-0.21
 # XXX silly...
 BuildRequires: libdrm-devel >= 2.4.0
 %if %{with_hw_servers}
@@ -514,6 +514,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr  1 2008 Kristian Høgsberg <krh@redhat.com> 1.4.99.901-15.20080401
+- Rebase to new snapshot to pull in DRI2 direct rendering work.
+
 * Tue Apr 01 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-14.20080314
 - Remove vmmouse again, way too broken.  Let this be a lesson to you:
   never try.
diff --git a/xserver-1.5.0-xaa-sucks.patch b/xserver-1.5.0-xaa-sucks.patch
index f429375..8b17791 100644
--- a/xserver-1.5.0-xaa-sucks.patch
+++ b/xserver-1.5.0-xaa-sucks.patch
@@ -31,11 +31,12 @@ index 1b7c154..f3c8f56 100644
      { -1,				NULL,
  				OPTV_NONE,	{0}, FALSE }
  };
-@@ -518,7 +521,8 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
+@@ -532,8 +532,8 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
  #define XAAMSG(s) do { if (serverGeneration == 1) xf86ErrorF(s); } while (0)
  
      if((infoRec->Flags & OFFSCREEN_PIXMAPS) && HaveScreenToScreenCopy &&
--		!xf86IsOptionSet(options, XAAOPT_OFFSCREEN_PIXMAPS)) {
+-		!xf86ReturnOptValBool(options, XAAOPT_OFFSCREEN_PIXMAPS,
+-		                      FALSE)) {
 +		xf86IsOptionSet(options, XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE))
 +    {
  	XAAMSG("\tOffscreen Pixmaps\n");
@@ -43,4 +44,3 @@ index 1b7c154..f3c8f56 100644
  	infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
 -- 
 1.5.4.3
-