[xorg-x11-drv-intel] Today's git snapshot

[Adam Jackson]

commit 02726df9e3582befdd66162a493219ff53d81334
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue May 29 16:49:55 2012 -0400

    Today's git snapshot
    
    - Enable SNA (default is still UXA, use Option "AccelMethod" to switch)
    - build-fix.patch: Fix build with Fedora's default cflags

 build-fix.patch         |   22 ++++++++++++++++++++++
 xorg-x11-drv-intel.spec |   20 +++++++++++++++-----
 2 files changed, 37 insertions(+), 5 deletions(-)
---
diff --git a/build-fix.patch b/build-fix.patch
new file mode 100644
index 0000000..695255a
--- /dev/null
+++ b/build-fix.patch
@@ -0,0 +1,22 @@
+diff -up xf86-video-intel-20120529/src/sna/sna_video_overlay.c.jx xf86-video-intel-20120529/src/sna/sna_video_overlay.c
+--- xf86-video-intel-20120529/src/sna/sna_video_overlay.c.jx	2012-05-29 16:20:25.000000000 -0400
++++ xf86-video-intel-20120529/src/sna/sna_video_overlay.c	2012-05-29 16:33:49.880486568 -0400
+@@ -34,6 +34,7 @@
+ #include <xf86xv.h>
+ #include <X11/extensions/Xv.h>
+ #include <fourcc.h>
++#include <xf86drm.h>
+ #include <i915_drm.h>
+ 
+ #include "intel_options.h"
+diff -up xf86-video-intel-20120529/src/sna/sna_video_sprite.c.jx xf86-video-intel-20120529/src/sna/sna_video_sprite.c
+--- xf86-video-intel-20120529/src/sna/sna_video_sprite.c.jx	2012-05-29 16:20:25.000000000 -0400
++++ xf86-video-intel-20120529/src/sna/sna_video_sprite.c	2012-05-29 16:37:05.749768749 -0400
+@@ -37,6 +37,7 @@
+ #include <X11/extensions/Xv.h>
+ #include <fourcc.h>
+ #include <drm_fourcc.h>
++#include <xf86drm.h>
+ #include <i915_drm.h>
+ 
+ #if DEBUG_VIDEO_OVERLAY
diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec
index f671734..696b247 100644
--- a/xorg-x11-drv-intel.spec
+++ b/xorg-x11-drv-intel.spec
@@ -1,24 +1,25 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 %define gputoolsdate 20110817
-#define gitdate 20111110
+%define gitdate 20120529
 
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.19.0
-Release:   3%{?dist}
+Release:   4.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 
-Source0:    http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 
-#Source0:    xf86-video-intel-%{gitdate}.tar.bz2
+#Source0:    http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 
+Source0:    xf86-video-intel-%{gitdate}.tar.bz2
 Source1:    make-intel-gpu-tools-snapshot.sh
 Source3:    intel-gpu-tools-%{gputoolsdate}.tar.bz2
 Source4:    make-git-snapshot.sh
 
 # port me dangit
 Patch2: copy-fb.patch
+Patch3: build-fix.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -63,16 +64,20 @@ Debugging tools for Intel graphics chips
 %prep
 %setup -q -n xf86-video-intel-%{?gitdate:%{gitdate}}%{!?gitdate:%{dirsuffix}} -b3
 #patch23 -p1 -b .legacy
+%patch3 -p1 -b .build-fix
 
 %build
  
 #export CFLAGS="$RPM_OPT_FLAGS -fno-omit-frame-pointer"
+%{?gitdate:autoreconf -v --install}
 
 %configure \
     %{?rhel:--enable-kms-only} \
     --disable-static \
     --enable-dri \
-    --enable-xvmc
+    --enable-xvmc \
+    --enable-sna \
+    --with-default-accel=uxa
 make
 
 pushd ../intel-gpu-tools-%{gputoolsdate}
@@ -116,6 +121,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Tue May 29 2012 Adam Jackson <ajax at redhat.com> 2.19.0-4.20120529
+- Today's git snapshot
+- Enable SNA (default is still UXA, use Option "AccelMethod" to switch)
+- build-fix.patch: Fix build with Fedora's default cflags
+
 * Tue May 29 2012 Adam Jackson <ajax at redhat.com> 2.19.0-3
 - Don't autoreconf the driver, fixes build on F16.