[xorg-x11-drv-intel] intel 2.17.0 intel-2.17.0-legacy-dri1.patch: Fix build with DRI1 disabled

[Adam Jackson]

commit f62312ac9b5738f97f52133d98df092e4f1f64c2
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Nov 18 13:28:43 2011 -0500

    intel 2.17.0
    intel-2.17.0-legacy-dri1.patch: Fix build with DRI1 disabled

 intel-2.17.0-legacy-dri1.patch |   16 ++++++++++++++++
 xorg-x11-drv-intel.spec        |   23 +++++++++++++----------
 2 files changed, 29 insertions(+), 10 deletions(-)
---
diff --git a/intel-2.17.0-legacy-dri1.patch b/intel-2.17.0-legacy-dri1.patch
new file mode 100644
index 0000000..a2734b9
--- /dev/null
+++ b/intel-2.17.0-legacy-dri1.patch
@@ -0,0 +1,16 @@
+diff -up xf86-video-intel-2.17.0/src/legacy/i810/Makefile.am.jx xf86-video-intel-2.17.0/src/legacy/i810/Makefile.am
+--- xf86-video-intel-2.17.0/src/legacy/i810/Makefile.am.jx	2011-11-07 15:14:43.000000000 -0500
++++ xf86-video-intel-2.17.0/src/legacy/i810/Makefile.am	2011-11-18 13:21:56.946525915 -0500
+@@ -25,10 +25,10 @@ liblegacy_i810_la_SOURCES +=\
+          i810_dri.c \
+          i810_dri.h \
+ 	 $(NULL)
+-endif
+-
+ if XVMC
+ liblegacy_i810_la_SOURCES += \
+ 	i810_hwmc.c \
+ 	$(NULL)
+ endif
++endif
++
diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec
index 9cbb4b0..18f4655 100644
--- a/xorg-x11-drv-intel.spec
+++ b/xorg-x11-drv-intel.spec
@@ -1,18 +1,18 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 %define gputoolsdate 20110817
-%define gitdate 20111110
+#define gitdate 20111110
 
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
-Version:   2.16.901
-Release:   2%{?dist}
+Version:   2.17.0
+Release:   1%{?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
 Source2:    intel.xinf
 Source3:    intel-gpu-tools-%{gputoolsdate}.tar.bz2
@@ -24,9 +24,7 @@ Patch1: kill-svideo.patch
 Patch2: copy-fb.patch
 # needs to be upstreamed
 Patch22: intel-2.11.0-vga-clock-max.patch
-# https://bugzilla.redhat.com/588421
-# deactivated for now, maybe no longer needed
-Patch62: intel-2.11-no-pageflipping.patch
+Patch23: intel-2.17.0-legacy-dri1.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -77,7 +75,7 @@ Debugging tools for Intel graphics chips
 %prep
 %setup -q -n xf86-video-intel-%{?gitdate:%{gitdate}}%{!?gitdate:%{dirsuffix}} -b3
 %patch22 -p1 -b .vga-clock
-#patch62 -p1 -b .no-flip
+%patch23 -p1 -b .legacy
 
 %build
  
@@ -85,7 +83,8 @@ Debugging tools for Intel graphics chips
 # Need autoreconf also when patching a release (to pick up -ludev)
 autoreconf -vi
 
-%configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri --enable-xvmc
+# don't freak out about --disable-dri; that's DRI1 not DRI2
+%configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri --enable-xvmc --disable-dri
 make
 
 pushd ../intel-gpu-tools-%{gputoolsdate}
@@ -132,6 +131,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Fri Nov 18 2011 Adam Jackson <ajax at redhat.com> 2.17.0-1
+- intel 2.17.0
+- intel-2.17.0-legacy-dri1.patch: Fix build with DRI1 disabled
+
 * Mon Nov 14 2011 Adam Jackson <ajax at redhat.com> - 2.16.901-2
 - ABI rebuild