rpms/xorg-x11-drv-i810/F-7 intel-2.1.1-fix-texoffset-start.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 sources, 1.23, 1.24 xorg-x11-drv-i810.spec, 1.59, 1.60 intel-2.0.0-to-404fd475.patch, 1.1, NONE

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20368/F-7

Modified Files:
	.cvsignore sources xorg-x11-drv-i810.spec 
Added Files:
	intel-2.1.1-fix-texoffset-start.patch 
Removed Files:
	intel-2.0.0-to-404fd475.patch 
Log Message:
2.1.1 update


intel-2.1.1-fix-texoffset-start.patch:

--- NEW FILE intel-2.1.1-fix-texoffset-start.patch ---
diff -up xf86-video-intel-2.1.1/src/i830_dri.c.texoffsetstart xf86-video-intel-2.1.1/src/i830_dri.c
--- xf86-video-intel-2.1.1/src/i830_dri.c.texoffsetstart	2007-08-14 14:58:29.000000000 +1000
+++ xf86-video-intel-2.1.1/src/i830_dri.c	2007-08-15 18:23:34.000000000 +1000
@@ -602,6 +602,7 @@ I830DRIScreenInit(ScreenPtr pScreen)
 #endif
 #if DRIINFO_MAJOR_VERSION > 5 || \
     (DRIINFO_MAJOR_VERSION == 5 && DRIINFO_MINOR_VERSION >= 3)
+      if (pI830->useEXA)
 	 pDRIInfo->texOffsetStart = I830TexOffsetStart;
 #endif
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/F-7/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	24 Apr 2007 02:48:10 -0000	1.22
+++ .cvsignore	30 Aug 2007 17:46:30 -0000	1.23
@@ -1,2 +1,2 @@
 xf86-video-i810-1.6.5.tar.bz2
-xf86-video-intel-2.0.0.tar.bz2
+xf86-video-intel-2.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/F-7/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	3 Jul 2007 18:14:25 -0000	1.23
+++ sources	30 Aug 2007 17:46:30 -0000	1.24
@@ -1,2 +1,2 @@
 fc1e0da3430551bf25a7babf7ccfd3bf  xf86-video-i810-1.6.5.tar.bz2
-a564a1fbb7ed9fcbcf81e15aedc92578  xf86-video-intel-2.1.0.tar.bz2
+a645aa1a8e1e6031e1f817d2cda9db1d  xf86-video-intel-2.1.1.tar.bz2


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/F-7/xorg-x11-drv-i810.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- xorg-x11-drv-i810.spec	3 Jul 2007 18:02:10 -0000	1.59
+++ xorg-x11-drv-i810.spec	30 Aug 2007 17:46:30 -0000	1.60
@@ -6,8 +6,8 @@
 
 Summary:   Xorg X11 i810 video driver(s)
 Name:      xorg-x11-drv-i810
-Version:   2.1.0
-Release:   1%{?dist}
+Version:   2.1.1
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -18,6 +18,7 @@
 Source2:   i810.xinf
 
 # new school intel driver patches
+Patch0: intel-2.1.1-fix-texoffset-start.patch
 
 # legacy i810 driver patches
 Patch100: i810-1.6.5-to-git-20060911.patch
@@ -61,6 +62,8 @@
 tar jxf %{SOURCE1}
 cd xf86-video-intel-%{version}
 
+%patch0 -p1 -b .texoffsetstart
+
 %build
 OPTS="--disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri"
 ./configure ${OPTS} && make || exit 1
@@ -102,6 +105,16 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Mon Aug 20 2007 Adam Jackson <ajax at redhat.com> 2.1.1-3
+- i810.xinf: Flip everything over to -intel by default now.  Still install
+  i810 driver just in case.
+
+* Wed Aug 15 2007 Dave Airlie <airlied at redhat.com> 2.1.1-2
+- intel-2.1.1-fix-texoffset-start.patch - shouldn't set texoffsetstart when not using EXA
+
+* Tue Aug 14 2007 Dave Airlie <airlied at redhat.com> 2.1.1-1
+- xf86-video-intel 2.1.1.
+
 * Tue Jul 03 2007 Adam Jackson <ajax at redhat.com> 2.1.0-1
 - xf86-video-intel 2.1.0.
 


--- intel-2.0.0-to-404fd475.patch DELETED ---