rpms/xorg-x11-drv-i810/devel .cvsignore, 1.13, 1.14 intel-prune-by-edid-pixclock.patch, 1.1, 1.2 sources, 1.13, 1.14 xorg-x11-drv-i810.spec, 1.29, 1.30 intel-virtual-sizing-bogon.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Aug 8 15:31:33 UTC 2006


Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-i810/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32404/devel

Modified Files:
	.cvsignore intel-prune-by-edid-pixclock.patch sources 
	xorg-x11-drv-i810.spec 
Removed Files:
	intel-virtual-sizing-bogon.patch 
Log Message:
auto-import xorg-x11-drv-i810-1.6.0-14.20060808modeset.fc6 on branch devel from xorg-x11-drv-i810-1.6.0-14.20060808modeset.fc6.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	24 Jul 2006 18:23:23 -0000	1.13
+++ .cvsignore	8 Aug 2006 15:31:21 -0000	1.14
@@ -1 +1 @@
-xf86-video-intel-1.6.0-git-modesetting-20060717.tar.bz2
+xf86-video-intel-1.6.0-git-modesetting-20060808.tar.bz2

intel-prune-by-edid-pixclock.patch:
 i830_modes.c     |    8 +++++++-
 i830_xf86Modes.c |   21 +++++++++++++++++++++
 i830_xf86Modes.h |    4 ++++
 3 files changed, 32 insertions(+), 1 deletion(-)

Index: intel-prune-by-edid-pixclock.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/intel-prune-by-edid-pixclock.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- intel-prune-by-edid-pixclock.patch	3 Aug 2006 01:00:51 -0000	1.1
+++ intel-prune-by-edid-pixclock.patch	8 Aug 2006 15:31:21 -0000	1.2
@@ -1,5 +1,5 @@
---- xf86-video-intel/src/i830_xf86Modes.h.edid-pixclock	2006-07-24 14:13:53.000000000 -0400
-+++ xf86-video-intel/src/i830_xf86Modes.h	2006-08-02 17:57:59.000000000 -0400
+--- xf86-video-intel/src/i830_xf86Modes.h.edid-pixclock	2006-08-08 11:14:35.000000000 -0400
++++ xf86-video-intel/src/i830_xf86Modes.h	2006-08-08 11:22:48.000000000 -0400
 @@ -57,6 +57,10 @@
  			  MonPtr mon);
  
@@ -11,8 +11,8 @@
  i830xf86PruneInvalidModes(ScrnInfoPtr pScrn, DisplayModePtr *modeList,
  			  Bool verbose);
  
---- xf86-video-intel/src/i830_modes.c.edid-pixclock	2006-07-24 14:13:53.000000000 -0400
-+++ xf86-video-intel/src/i830_modes.c	2006-08-02 18:28:04.000000000 -0400
+--- xf86-video-intel/src/i830_modes.c.edid-pixclock	2006-08-08 11:14:35.000000000 -0400
++++ xf86-video-intel/src/i830_modes.c	2006-08-08 11:23:19.000000000 -0400
 @@ -601,7 +601,7 @@
      xf86MonPtr ddc;
      MonPtr mon;
@@ -32,15 +32,15 @@
  	    break;
  	default:
  	    /* We probably don't care about trying to contruct ranges around
-@@ -642,6 +645,7 @@
- 	i830xf86ValidateModesSize(pScrn, userModes, ddc->features.hsize,
- 				  ddc->features.vsize, -1);
-     }
+@@ -638,6 +641,7 @@
+     userModes = i830DuplicateModes(pScrn, pScrn->monitor->Modes);
+ 
+     i830xf86ValidateModesSync(pScrn, userModes, mon);
 +    i830xf86ValidateModesClock(pScrn, userModes, mon);
      i830xf86PruneInvalidModes(pScrn, &userModes, TRUE);
  
      i830AppendModes(pScrn, &mon->Modes, userModes);
-@@ -806,6 +810,8 @@
+@@ -802,6 +806,8 @@
  				   V_INTERLACE);
  	i830xf86ValidateModesClocks(pScrn, pI830->pipeMon[pipe]->Modes,
  				    &minclock, &maxclock, 1);
@@ -49,8 +49,8 @@
  
  	i830xf86PruneInvalidModes(pScrn, &pI830->pipeMon[pipe]->Modes, TRUE);
  
---- xf86-video-intel/src/i830_xf86Modes.c.edid-pixclock	2006-07-24 14:13:53.000000000 -0400
-+++ xf86-video-intel/src/i830_xf86Modes.c	2006-08-02 17:57:59.000000000 -0400
+--- xf86-video-intel/src/i830_xf86Modes.c.edid-pixclock	2006-08-08 11:14:35.000000000 -0400
++++ xf86-video-intel/src/i830_xf86Modes.c	2006-08-08 11:22:48.000000000 -0400
 @@ -373,6 +373,27 @@
  }
  


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	24 Jul 2006 18:23:23 -0000	1.13
+++ sources	8 Aug 2006 15:31:21 -0000	1.14
@@ -1 +1 @@
-2a94ea7a4714f02d71a4f50935a0893b  xf86-video-intel-1.6.0-git-modesetting-20060717.tar.bz2
+666c06eedbe560fce410ab2f198bae5d  xf86-video-intel-1.6.0-git-modesetting-20060808.tar.bz2


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xorg-x11-drv-i810.spec	3 Aug 2006 01:00:51 -0000	1.29
+++ xorg-x11-drv-i810.spec	8 Aug 2006 15:31:21 -0000	1.30
@@ -8,13 +8,13 @@
 %define with_dri        0
 %endif
 
-%define gitdate 20060717
+%define gitdate 20060808
 
 # GIT SNAPSHOT.  EATS BABIES.
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
 Version:   1.6.0
-Release:   13.%{gitdate}modeset%{?dist}
+Release:   14.%{gitdate}modeset%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -25,7 +25,6 @@
 Source1:   i810.xinf
 
 Patch0: intel-prune-by-edid-pixclock.patch
-Patch1: intel-virtual-sizing-bogon.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -54,8 +53,9 @@
 %prep
 #%setup -q -n %{tarball}-%{version}
 %setup -q -n xf86-video-intel
+%if 0
 %patch0 -p1 -b .edid-pixclock
-%patch1 -p1 -b .virtual-bogon
+%endif
 
 %build
 ./autogen.sh --disable-static \
@@ -104,6 +104,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Tue Aug  8 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-14.20060808modeset.fc6
+- Today's snapshot: I2C bus creation fix.
+
 * Wed Aug  2 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-13.20060717modeset.fc6
 - intel-prune-by-edid-pixclock.patch: Honor the EDID-reported maximum pixel
   clock when computing the modes list.


--- intel-virtual-sizing-bogon.patch DELETED ---




More information about the fedora-cvs-commits mailing list