[xorg-x11-drv-intel] intel 2.21.24

[Dave Airlie]

commit 9ce0f559b68b7955b34f6538ab70103511e05044
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Aug 6 13:05:52 2013 +1000

    intel 2.21.24
    
    - add fix to make build - re-enable autoreconf

 ...e.ac-fix-dri-enabled-with-kms-only-picked.patch |   29 ++++++++++++++++++++
 xorg-x11-drv-intel.spec                            |    8 ++++-
 2 files changed, 35 insertions(+), 2 deletions(-)
---
diff --git a/0001-configure.ac-fix-dri-enabled-with-kms-only-picked.patch b/0001-configure.ac-fix-dri-enabled-with-kms-only-picked.patch
new file mode 100644
index 0000000..1663804
--- /dev/null
+++ b/0001-configure.ac-fix-dri-enabled-with-kms-only-picked.patch
@@ -0,0 +1,29 @@
+From 2937b2135efb1855e9881ec84ddc37a28535e312 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at redhat.com>
+Date: Tue, 6 Aug 2013 13:02:42 +1000
+Subject: [PATCH] configure.ac: fix dri enabled with kms only picked
+
+Otherwise we'd fail saying DRI1 wasn't possible, when that
+is exactly what we asked for.
+
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 104113e..88f29cc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -433,7 +433,7 @@ else
+         DRI1_CFLAGS=""
+         DRI1_LIBS=""
+ 
+-        if test "x$enable_dri" = "xyes"; then
++        if test "x$enable_dri" = "xyes" -a "x$KMS_ONLY" != "xyes"; then
+                 AC_MSG_ERROR([DRI1 requested but prerequisites not found])
+         fi
+ fi
+-- 
+1.8.3.1
+
diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec
index 3436f3f..265e5f1 100644
--- a/xorg-x11-drv-intel.spec
+++ b/xorg-x11-drv-intel.spec
@@ -38,6 +38,7 @@ Source1:    make-intel-gpu-tools-snapshot.sh
 Source3:    intel-gpu-tools-%{gputoolsdate}.tar.bz2
 Source4:    make-git-snapshot.sh
 
+Patch0: 0001-configure.ac-fix-dri-enabled-with-kms-only-picked.patch
 ExclusiveArch: %{ix86} x86_64 ia64
 
 BuildRequires: autoconf automake libtool
@@ -82,11 +83,13 @@ Debugging tools for Intel graphics chips
 
 %prep
 %setup -q -n xf86-video-intel-%{?gitdate:%{gitdate}}%{!?gitdate:%{dirsuffix}} -b3
-
+%patch0 -p1 -b .buildfix
 %build
  
 #export CFLAGS="$RPM_OPT_FLAGS -fno-omit-frame-pointer"
-%{?gitdate:autoreconf -v --install}
+# we patched configure.ac
+#%{?gitdate:autoreconf -v --install}
+autoreconf -v --install
 
 %configure \
 %ifnarch %{ix86}
@@ -154,6 +157,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue Aug 06 2013 Dave Airlie <airlied at redhat.com> 2.21.14-1
 - intel 2.21.24
+- add fix to make build - re-enable autoreconf
 
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.21.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild