update to 2.21.15

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7889 ec354946-7b23-47d6-9f5a-488ba84defc7

x/xorg-x11-drv-intel/xorg-x11-drv-intel-vl.spec

@@ -1,12 +1,21 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
+%define gputoolsdate1 20130611
+%define gputoolsdate2 20110817
+
+%if "%{?_dist_release}" >= "vl7"
+%define accel sna
+%define gputoolsdate 20130611
+%else
+%define accel sna
 %define gputoolsdate 20110817
+%endif
 
 Summary:   Xorg X11 Intel video driver
 Summary(ja):   Xorg X11 Intel ビデオドライバ
 Name:      xorg-x11-drv-intel
 Epoch:     1
-Version:   2.21.8
+Version:   2.21.15
 Release:   1%{?_dist_release}
 URL:       http://intellinuxgraphics.org/
 License:   MIT
@@ -14,11 +23,8 @@ Group:     User Interface/X Hardware Support
 
 Source0:   http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2
 Source2:   intel.xinf
-Source3:   intel-gpu-tools-%{gputoolsdate}.tar.bz2
+Source3:   intel-gpu-tools-%{gputoolsdate1}.tar.bz2
-
+Source4:   intel-gpu-tools-%{gputoolsdate2}.tar.bz2
-# Clamp VGA pixel clock to 250MHz,
-# anything higher's going to look awful anyway. (#559426)
-Patch10: intel-2.11.0-vga-clock-max.patch
 
 # vine patch
 
@@ -34,6 +40,7 @@ BuildRequires: kernel-headers >= 2.6.33
 BuildRequires: libudev-devel
 BuildRequires: libxcb-devel >= 1.5
 BuildRequires: xcb-util-devel
+BuildRequires: cairo-devel
 
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg
@@ -46,6 +53,7 @@ Provides: xorg-x11-drv-i810
 
 Vendor: Project Vine
 Distribution: Vine Linux
+Packager: daisuke
 
 %description 
 X.Org X11 Intel video driver.
@@ -69,24 +77,26 @@ Debugging tools for Intel graphics chips
 
 
 %prep
-%setup -q -n xf86-video-intel-%{version} -b3
+%setup -q -n xf86-video-intel-%{version} -b3 -b4
-
-%patch10 -p1 -b .vga-clock
 
 %build
 autoreconf -vi
 
+%if "%{?_dist_release}" < "vl7"
+export CFLAGS="-I/usr/include/X11/dri"
+%endif
+
 %configure \
   --disable-static --libdir=%{_libdir} --mandir=%{_mandir} \
   --enable-dri --enable-xvmc \
   --enable-sna --enable-uxa \
-  --with-default-accel=sna \
+  --with-default-accel=%{accel} \
   --enable-xaa=no
 make
 
 pushd ../intel-gpu-tools-%{gputoolsdate}
 autoreconf -v --install
-%configure
+%configure --disable-nouveau --disable-dumper
 make
 popd
 
@@ -135,6 +145,9 @@ fi ||:
 
 
 %changelog
+* Thu Oct 10 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 2.21.15-1
+- new upstream release
+
 * Sat Jun 01 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 2.21.8-1
 - new upstream release
 - change default accel method to sna.