rpms/xorg-x11-drv-i810/devel .cvsignore, 1.31, 1.32 i810.xinf, 1.14, 1.15 sources, 1.32, 1.33 xorg-x11-drv-i810.spec, 1.113, 1.114 intel-2.4.2-cantiga-fix.patch, 1.1, NONE intel-2.4.2-git-diffs.patch, 1.3, NONE intel-2.4.2-macmini-fix.patch, 1.1, NONE intel-fix-irq.patch, 1.1, NONE

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11902

Modified Files:
	.cvsignore i810.xinf sources xorg-x11-drv-i810.spec 
Removed Files:
	intel-2.4.2-cantiga-fix.patch intel-2.4.2-git-diffs.patch 
	intel-2.4.2-macmini-fix.patch intel-fix-irq.patch 
Log Message:
- rebase to Intel 2.5.0 release



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	26 Aug 2008 16:49:27 -0000	1.31
+++ .cvsignore	21 Oct 2008 07:37:04 -0000	1.32
@@ -1 +1 @@
-xf86-video-intel-2.4.2.tar.bz2
+xf86-video-intel-2.5.0.tar.bz2


Index: i810.xinf
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/i810.xinf,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- i810.xinf	20 Aug 2007 20:45:41 -0000	1.14
+++ i810.xinf	21 Oct 2008 07:37:04 -0000	1.15
@@ -16,6 +16,11 @@
 alias pcivideo:v00008086d000029D2sv*sd*bc*sc*i* intel	# Q33
 alias pcivideo:v00008086d00002A02sv*sd*bc*sc*i* intel	# 965GM
 alias pcivideo:v00008086d00002A12sv*sd*bc*sc*i* intel	# 965GME
+alias pcivideo:v00008086d00002A42sv*sd*bc*sc*i* intel	# GM45
+alias pcivideo:v00008086d00002e02sv*sd*bc*sc*i* intel	# IGD_E_G
+alias pcivideo:v00008086d00002e12sv*sd*bc*sc*i* intel	# Q45
+alias pcivideo:v00008086d00002e22sv*sd*bc*sc*i* intel	# G45
+alias pcivideo:v00008086d00002e32sv*sd*bc*sc*i* intel	# G41
 alias pcivideo:v00008086d00003577sv*sd*bc*sc*i* intel	# i830
 alias pcivideo:v00008086d00003582sv*sd*bc*sc*i* intel	# 855GM
 alias pcivideo:v00008086d00007121sv*sd*bc*sc*i* intel	# i810


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	26 Aug 2008 16:49:27 -0000	1.32
+++ sources	21 Oct 2008 07:37:04 -0000	1.33
@@ -1 +1 @@
-5cd6b3ed57c7e78ab51e9d9266e73fb6  xf86-video-intel-2.4.2.tar.bz2
+462f205bd47766265246cc39801b75e7  xf86-video-intel-2.5.0.tar.bz2


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- xorg-x11-drv-i810.spec	14 Oct 2008 23:43:46 -0000	1.113
+++ xorg-x11-drv-i810.spec	21 Oct 2008 07:37:04 -0000	1.114
@@ -5,8 +5,8 @@
 
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
-Version:   2.4.2
-Release:   12%{?dist}
+Version:   2.5.0
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -20,12 +20,8 @@
 Source2:   i810.xinf
 Source3:   intel-stub.c
 
-Patch1: intel-2.4.2-git-diffs.patch
-Patch2: intel-2.4.2-cantiga-fix.patch
 Patch3: intel-2.1.1-fix-xv-reset.patch
 #Patch4: intel-fix-flip.patch
-Patch5: intel-fix-irq.patch
-Patch6: intel-2.4.2-macmini-fix.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -55,12 +51,8 @@
 
 %prep
 %setup -q -n xf86-video-intel-%{version}
-%patch1 -p1 -b .gitupdate
-%patch2 -p1 -b .cantiga
 %patch3 -p1 -b .xvfix
 #patch4 -p1 -b .fixflip
-%patch5 -p1 -b .irqfix
-%patch6 -p1 -b .mini
 
 %build
 
@@ -103,6 +95,9 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Tue Oct 21 2008 Dave Airlie <airlied at redhat.com> 2.5.0-1
+- rebase to Intel 2.5.0 release
+
 * Tue Oct 14 2008 Dave Airlie <airlied at redhat.com> 2.4.2-12
 - intel-2.4.2-cantiga-fix.patch - hopefully fix cantiga
 


--- intel-2.4.2-cantiga-fix.patch DELETED ---


--- intel-2.4.2-git-diffs.patch DELETED ---


--- intel-2.4.2-macmini-fix.patch DELETED ---


--- intel-fix-irq.patch DELETED ---