|
|
@@ -1,14 +1,14 @@
|
|
|
%define moduledir %(pkg-config xorg-server --variable=moduledir )
|
|
|
%define driverdir %{moduledir}/drivers
|
|
|
-%define gputoolsdate 20090908
|
|
|
+%define gputoolsdate 20100625
|
|
|
|
|
|
Summary: Xorg X11 Intel video driver
|
|
|
Summary(ja): Xorg X11 Intel ビデオドライバ
|
|
|
Name: xorg-x11-drv-intel
|
|
|
Epoch: 1
|
|
|
Version: 2.15.0
|
|
|
-Release: 2%{?_dist_release}
|
|
|
-URL: http://www.x.org
|
|
|
+Release: 3%{?_dist_release}
|
|
|
+URL: http://intellinuxgraphics.org/
|
|
|
License: MIT
|
|
|
Group: User Interface/X Hardware Support
|
|
|
|
|
|
@@ -16,14 +16,16 @@ Source0: http://xorg.freedesktop.org/archive/individual/driver/xf86-video-inte
|
|
|
Source2: intel.xinf
|
|
|
Source3: intel-gpu-tools-%{gputoolsdate}.tar.bz2
|
|
|
|
|
|
-# upstream patches
|
|
|
-Patch1: intel-2.15.0-unsigned-promotion-batch-overflows.patch
|
|
|
-Patch2: intel-2.15.0-increase-video-state-emission.patch
|
|
|
-Patch3: intel-2.15.0-use-swapbufferwait.patch
|
|
|
+# patches from upstream git
|
|
|
+# http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/
|
|
|
+Patch1: xf86-video-intel-2.15.0-git9d6e02.patch
|
|
|
|
|
|
# import from ubuntu/debian package
|
|
|
Patch101: intel-2.15.0-copy-fb.patch
|
|
|
|
|
|
+# vine patch
|
|
|
+# disable DRI on SandyBridge/IvyBridge for now.
|
|
|
+Patch200: intel-2.15.0-sandybridge-disable-dri.patch
|
|
|
|
|
|
|
|
|
ExclusiveArch: %{ix86} x86_64 ia64
|
|
|
@@ -71,11 +73,12 @@ Debugging tools for Intel graphics chips
|
|
|
%prep
|
|
|
%setup -q -n xf86-video-intel-%{version} -b3
|
|
|
|
|
|
-%patch1 -p1 -b .unsigned-promotion-batch-overflows
|
|
|
-%patch2 -p1 -b .increase-video-state-emission
|
|
|
-%patch3 -p1 -b .use-swapbufferwait
|
|
|
+%patch1 -p1 -b .git9d6e02
|
|
|
+
|
|
|
#%patch101 -p1 -b .copy-fb
|
|
|
|
|
|
+%patch200 -p1 -b .disable-dri
|
|
|
+
|
|
|
%build
|
|
|
autoreconf -vi
|
|
|
|
|
|
@@ -135,6 +138,11 @@ fi ||:
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Tue May 17 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.15.0-3
|
|
|
+- drop patch1-3 and replaced with new patch1 from git master
|
|
|
+- add Patch200 to disable DRI on SandyBridge/IvyBridge
|
|
|
+- update intel-gpu-tools
|
|
|
+
|
|
|
* Thu Apr 28 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.15.0-2
|
|
|
- add Patch1-3 from upstream
|
|
|
|
daisuke