Mon Jul 5 00:07:08 UTC 2010

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29302

Modified Files:
	.cvsignore commitid sources xorg-x11-server.spec 
	xserver-1.4.99-pic-libxf86config.patch 
	xserver-1.4.99-ssh-isnt-local.patch 
	xserver-1.5.0-bg-none-root.patch 
	xserver-1.5.0-projector-fb-size.patch 
	xserver-1.5.1-mode-debug.patch xserver-1.6.0-displayfd.patch 
	xserver-1.6.0-less-acpi-brokenness.patch 
	xserver-1.6.1-nouveau.patch xserver-1.6.99-default-modes.patch 
	xserver-1.6.99-randr-error-debugging.patch 
	xserver-1.6.99-right-of.patch 
	xserver-1.7.0-randr-gamma-restore.patch 
	xserver-1.7.1-gamma-kdm-fix.patch xserver-1.7.1-multilib.patch 
	xserver-1.8-disable-vboxvideo.patch 
	xserver-1.8-udev-warning.patch xserver-1.8.0-no-xorg.patch 
Log Message:
* Mon Jul 05 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.8.99.904-1
- Update to current git master (1.9 snapshot 4).
- New ABIS: videodrv 8, input 11, extension 4
- Drop upstreamed patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85

--- .cvsignore	7 Apr 2010 00:18:15 -0000	1.84
+++ .cvsignore	5 Jul 2010 00:07:04 -0000	1.85
@@ -1 +1 @@
-xorg-server-1.8.0.tar.bz2
+xorg-server-20100702.tar.xz


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- commitid	19 Mar 2010 03:37:30 -0000	1.41
+++ commitid	5 Jul 2010 00:07:04 -0000	1.42
@@ -1 +1 @@
-67a8c659f25218904bae64aac6e98e326c90330b
+a71dbc03e65cf7b0654a6eca93ce0bf6a1711ffa


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- sources	7 Apr 2010 00:18:16 -0000	1.80
+++ sources	5 Jul 2010 00:07:04 -0000	1.81
@@ -1 +1 @@
-7cec3a11890bb53f4a07854319360348  xorg-server-1.8.0.tar.bz2
+2b3ef22b08ef2477f7a23213303066e7  xorg-server-20100702.tar.xz


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -p -r1.511 -r1.512
--- xorg-x11-server.spec	24 Jun 2010 15:22:15 -0000	1.511
+++ xorg-x11-server.spec	5 Jul 2010 00:07:04 -0000	1.512
@@ -17,20 +17,20 @@
 # because rpm is a terrible language.  HTFU.
 %define ansic_major 0
 %define ansic_minor 4
-%define videodrv_major 7
+%define videodrv_major 8
 %define videodrv_minor 0
-%define xinput_major 9
+%define xinput_major 11 
 %define xinput_minor 0
-%define extension_major 3
+%define extension_major 4
 %define extension_minor 0
 
 %define pkgname xorg-server
-#define gitdate 20100319
+%define gitdate 20100702
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.8.0
-Release:   8%{?gitdate:.%{gitdate}}%{dist}
+Version:   1.8.99.904
+Release:   1%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -95,10 +95,6 @@ Patch6052: xserver-1.8-udev-warning.patc
 # fallback to vesa when module is missing seems broken
 Patch6053: xserver-1.8-disable-vboxvideo.patch
 
-Patch6055: xserver-1.7.6-export-dix-functions.patch
-Patch6056: xserver-1.7.6-export-more-dix-functions.patch
-Patch6057: xserver-1.8.0-xorg.conf.d-changes.patch
-
 # https://bugs.freedesktop.org/show_bug.cgi?id=28672
 Patch7000: xserver-1.8.0-no-xorg.patch
 
@@ -460,8 +456,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xorg/modules/extensions/libextmod.so
 %{_libdir}/xorg/modules/extensions/librecord.so
 %dir %{_libdir}/xorg/modules/input
-%dir %{_libdir}/xorg/modules/linux
-%{_libdir}/xorg/modules/linux/libfbdevhw.so
+%{_libdir}/xorg/modules/libfbdevhw.so
 %dir %{_libdir}/xorg/modules/multimedia
 %{_libdir}/xorg/modules/multimedia/bt829_drv.so
 %{_libdir}/xorg/modules/multimedia/fi1236_drv.so
@@ -546,6 +541,11 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Jul 05 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.8.99.904-1
+- Update to current git master (1.9 snapshot 4).
+- New ABIS: videodrv 8, input 11, extension 4
+- Drop upstreamed patches.
+
 * Thu Jun 24 2010 Adam Jackson <ajax at redhat.com>
 - Drop a bunch of old Obsoletes from F11 and earlier.
 - Drop explicit driver Requires.

xserver-1.4.99-pic-libxf86config.patch:
 Makefile.am |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: xserver-1.4.99-pic-libxf86config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.4.99-pic-libxf86config.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xserver-1.4.99-pic-libxf86config.patch	15 Apr 2010 06:57:32 -0000	1.3
+++ xserver-1.4.99-pic-libxf86config.patch	5 Jul 2010 00:07:04 -0000	1.4
@@ -1,11 +1,14 @@
-From dc9f6e5021699fef97318ebc43f0e6c58a12d696 Mon Sep 17 00:00:00 2001
+From d88b91cd4fa9f93b91824b00a61b64ecac752bb1 Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax at redhat.com>
 Date: Mon, 10 Dec 2007 11:26:57 -0500
-Subject: [PATCH] Build libxf86config with -fPIC.
+Subject: [PATCH 01/17] Build libxf86config with -fPIC.
 
+---
+ hw/xfree86/parser/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
-index 49c191f..fea3b24 100644
+index caf7079..655e73f 100644
 --- a/hw/xfree86/parser/Makefile.am
 +++ b/hw/xfree86/parser/Makefile.am
 @@ -32,7 +32,7 @@ libxf86config_internal_la_SOURCES = \
@@ -15,8 +18,8 @@ index 49c191f..fea3b24 100644
 -libxf86config_a_CFLAGS = $(AM_CFLAGS)
 +libxf86config_a_CFLAGS = $(AM_CFLAGS) -fPIC -fvisibility=hidden
  
- AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
- 
+ AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \
+ 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 -- 
-1.6.6.1
+1.7.1
 

xserver-1.4.99-ssh-isnt-local.patch:
 shm.c |   17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

Index: xserver-1.4.99-ssh-isnt-local.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.4.99-ssh-isnt-local.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xserver-1.4.99-ssh-isnt-local.patch	10 Dec 2007 20:34:09 -0000	1.2
+++ xserver-1.4.99-ssh-isnt-local.patch	5 Jul 2010 00:07:04 -0000	1.3
@@ -1,17 +1,17 @@
-From 4306b434038de7e2b17d3c4a6cfd87db469d3bda Mon Sep 17 00:00:00 2001
+From b7979b8521272d53531ffd1cf3566ce4e5c0469b Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax at redhat.com>
 Date: Mon, 10 Dec 2007 11:26:57 -0500
-Subject: [PATCH] Hack for proper MIT-SHM rejection for ssh-forwarded clients.
+Subject: [PATCH 04/17] Hack for proper MIT-SHM rejection for ssh-forwarded clients.
 
 ---
- Xext/shm.c |   15 +++++++++++++++
- 1 files changed, 15 insertions(+), 0 deletions(-)
+ Xext/shm.c |   16 ++++++++++++++++
+ 1 files changed, 16 insertions(+), 0 deletions(-)
 
 diff --git a/Xext/shm.c b/Xext/shm.c
-index 5937a03..5376c19 100644
+index 3230d83..7f0ad91 100644
 --- a/Xext/shm.c
 +++ b/Xext/shm.c
-@@ -381,8 +381,21 @@
+@@ -389,8 +389,21 @@ shm_access(ClientPtr client, SHMPERM_TYPE *perm, int readonly)
      mode_t mask;
      int uidset = 0, gidset = 0;
      LocalClientCredRec *lcc;
@@ -33,7 +33,7 @@ index 5937a03..5376c19 100644
  
  	if (lcc->fieldsSet & LCC_UID_SET) {
  	    uid = lcc->euid;
-@@ -401,6 +414,9 @@
+@@ -409,6 +422,9 @@ shm_access(ClientPtr client, SHMPERM_TYPE *perm, int readonly)
  	}
  #endif
  	FreeLocalClientCreds(lcc);
@@ -44,5 +44,5 @@ index 5937a03..5376c19 100644
  	if (uidset) {
  	    /* User id 0 always gets access */
 -- 
-1.5.3.4
+1.7.1
 

xserver-1.5.0-bg-none-root.patch:
 dix/globals.c                |    1 +
 dix/window.c                 |   12 +++++++-----
 hw/xfree86/common/xf86Init.c |   11 +++++++++++
 hw/xfree86/common/xf86str.h  |    5 ++++-
 include/opaque.h             |    1 +
 os/utils.c                   |    4 +++-
 6 files changed, 27 insertions(+), 7 deletions(-)

Index: xserver-1.5.0-bg-none-root.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.5.0-bg-none-root.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- xserver-1.5.0-bg-none-root.patch	21 Jan 2010 07:31:41 -0000	1.8
+++ xserver-1.5.0-bg-none-root.patch	5 Jul 2010 00:07:05 -0000	1.9
@@ -1,7 +1,7 @@
-From eff3bb9c6f0b71a57705885a3fe6e6469d252d2b Mon Sep 17 00:00:00 2001
+From c89255169f6de9dcaec67509cec1c9b5048b2155 Mon Sep 17 00:00:00 2001
 From: Fedora X Ninjas <x at fedoraproject.org>
 Date: Wed, 20 Jan 2010 14:46:12 +1300
-Subject: [PATCH] Add nr for background=none root
+Subject: [PATCH 02/17] Add nr for background=none root
 
 ---
  dix/globals.c                |    1 +
@@ -13,22 +13,22 @@ Subject: [PATCH] Add nr for background=n
  6 files changed, 27 insertions(+), 6 deletions(-)
 
 diff --git a/dix/globals.c b/dix/globals.c
-index c24a94f..907a5e8 100644
+index b128569..95dde2d 100644
 --- a/dix/globals.c
 +++ b/dix/globals.c
-@@ -124,6 +124,7 @@ FontPtr defaultFont;   /* not declared in dix.h to avoid including font.h in
+@@ -122,6 +122,7 @@ FontPtr defaultFont;   /* not declared in dix.h to avoid including font.h in
  CursorPtr rootCursor;
  Bool party_like_its_1989 = FALSE;
  Bool whiteRoot = FALSE;
 +Bool bgNoneRoot = FALSE;
  
- int cursorScreenDevPriv[MAXSCREENS];
- 
+ TimeStamp currentTime;
+ TimeStamp lastDeviceEventTime;
 diff --git a/dix/window.c b/dix/window.c
-index caff1cb..be1d1c4 100644
+index 4a47dd5..67da401 100644
 --- a/dix/window.c
 +++ b/dix/window.c
-@@ -466,22 +466,24 @@ InitRootWindow(WindowPtr pWin)
+@@ -459,22 +459,24 @@ InitRootWindow(WindowPtr pWin)
      pWin->optional->cursor = rootCursor;
      rootCursor->refcnt++;
  
@@ -59,18 +59,18 @@ index caff1cb..be1d1c4 100644
      MapWindow(pWin, serverClient);
  }
 diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index 6707448..776b898 100644
+index ca532ee..6843273 100644
 --- a/hw/xfree86/common/xf86Init.c
 +++ b/hw/xfree86/common/xf86Init.c
-@@ -77,6 +77,7 @@
- #ifdef RENDER
+@@ -76,6 +76,7 @@
+ #include "xf86Xinput.h"
+ #include "xf86InPriv.h"
  #include "picturestr.h"
- #endif
 +#include "xace.h"
  
+ #include "xf86Bus.h"
  #include "xf86VGAarbiter.h"
- #include "globals.h"
-@@ -254,6 +255,7 @@ xf86CreateRootWindow(WindowPtr pWin)
+@@ -242,6 +243,7 @@ xf86CreateRootWindow(WindowPtr pWin)
    int ret = TRUE;
    int err = Success;
    ScreenPtr pScreen = pWin->drawable.pScreen;
@@ -78,7 +78,7 @@ index 6707448..776b898 100644
    RootWinPropPtr pProp;
    CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr)
        dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey);
-@@ -305,6 +307,15 @@ xf86CreateRootWindow(WindowPtr pWin)
+@@ -293,6 +295,15 @@ xf86CreateRootWindow(WindowPtr pWin)
      }
    }
  
@@ -92,13 +92,13 @@ index 6707448..776b898 100644
 +  }
 +
    DebugF("xf86CreateRootWindow() returns %d\n", ret);
-   return (ret);
+   return ret;
  }
 diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
-index de1f1b6..5c3aa00 100644
+index c9b261d..f96fc5d 100644
 --- a/hw/xfree86/common/xf86str.h
 +++ b/hw/xfree86/common/xf86str.h
-@@ -503,7 +503,7 @@ typedef struct _confdrirec {
+@@ -502,7 +502,7 @@ typedef struct _confdrirec {
  } confDRIRec, *confDRIPtr;
  
  /* These values should be adjusted when new fields are added to ScrnInfoRec */
@@ -107,7 +107,7 @@ index de1f1b6..5c3aa00 100644
  #define NUM_RESERVED_POINTERS		14
  #define NUM_RESERVED_FUNCS		11
  
-@@ -775,6 +775,9 @@ typedef struct _ScrnInfoRec {
+@@ -774,6 +774,9 @@ typedef struct _ScrnInfoRec {
      ClockRangePtr	clockRanges;
      int			adjustFlags;
  
@@ -130,10 +130,10 @@ index b3c7c70..fcc8c95 100644
  extern _X_EXPORT Bool CoreDump;
  
 diff --git a/os/utils.c b/os/utils.c
-index d7c8388..40583d0 100644
+index 51455cc..64810cf 100644
 --- a/os/utils.c
 +++ b/os/utils.c
-@@ -513,6 +513,7 @@ void UseMsg(void)
+@@ -502,6 +502,7 @@ void UseMsg(void)
  #endif
      ErrorF("-nolisten string       don't listen on protocol\n");
      ErrorF("-noreset               don't reset after last client exists\n");
@@ -141,7 +141,7 @@ index d7c8388..40583d0 100644
      ErrorF("-reset                 reset after last client exists\n");
      ErrorF("-p #                   screen-saver pattern duration (minutes)\n");
      ErrorF("-pn                    accept failure to listen on all ports\n");
-@@ -856,6 +857,8 @@ ProcessCommandLine(int argc, char *argv[])
+@@ -841,6 +842,8 @@ ProcessCommandLine(int argc, char *argv[])
  	    defaultBackingStore = WhenMapped;
          else if ( strcmp( argv[i], "-wr") == 0)
              whiteRoot = TRUE;
@@ -151,5 +151,5 @@ index d7c8388..40583d0 100644
               if(++i < argc) {
                   long reqSizeArg = atol(argv[i]);
 -- 
-1.6.6
+1.7.1
 

xserver-1.5.0-projector-fb-size.patch:
 xf86Crtc.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Index: xserver-1.5.0-projector-fb-size.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.5.0-projector-fb-size.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xserver-1.5.0-projector-fb-size.patch	11 Sep 2008 17:19:26 -0000	1.3
+++ xserver-1.5.0-projector-fb-size.patch	5 Jul 2010 00:07:05 -0000	1.4
@@ -1,17 +1,17 @@
-From dc5cedd61e00afec33cbfaa7fdfbb6c357074dbd Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <sandmann at redhat.com>
+From 4a1ad0a98f4ca1ebe21f1fe22975318cff0de8f1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <sandmann at redhat.com>
 Date: Thu, 11 Sep 2008 12:51:31 -0400
-Subject: [PATCH] Make room for an external monitor if we have enough video RAM
+Subject: [PATCH 03/17] Make room for an external monitor if we have enough video RAM
 
 ---
  hw/xfree86/modes/xf86Crtc.c |    9 +++++++++
  1 files changed, 9 insertions(+), 0 deletions(-)
 
 diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 4de7e05..9bcf81b 100644
+index b2daec7..85d499a 100644
 --- a/hw/xfree86/modes/xf86Crtc.c
 +++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -987,6 +987,15 @@ xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp,
+@@ -1074,6 +1074,15 @@ xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp,
  	if (crtc_height > height)
  	    height = crtc_height;
      }
@@ -28,5 +28,5 @@ index 4de7e05..9bcf81b 100644
      if (config->maxHeight && height > config->maxHeight) height = config->maxHeight;
      if (config->minWidth && width < config->minWidth) width = config->minWidth;
 -- 
-1.6.0.1
+1.7.1
 

xserver-1.5.1-mode-debug.patch:
 xf86Crtc.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Index: xserver-1.5.1-mode-debug.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.5.1-mode-debug.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xserver-1.5.1-mode-debug.patch	7 Oct 2008 15:35:37 -0000	1.1
+++ xserver-1.5.1-mode-debug.patch	5 Jul 2010 00:07:05 -0000	1.2
@@ -1,17 +1,17 @@
-From 079910986a1b8f5042e16ee2ba3ad9ed843b67ca Mon Sep 17 00:00:00 2001
+From e3824df6768a3d254d02de65b514cdf561838bb8 Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax at redhat.com>
 Date: Tue, 7 Oct 2008 11:09:14 -0400
-Subject: [PATCH] Force ModeDebug on.
+Subject: [PATCH 05/17] Force ModeDebug on.
 
 ---
  hw/xfree86/modes/xf86Crtc.c |    3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)
 
 diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 9bcf81b..a953c8a 100644
+index 85d499a..883bf3b 100644
 --- a/hw/xfree86/modes/xf86Crtc.c
 +++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -2084,8 +2084,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
+@@ -2363,8 +2363,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
      xf86ProcessOptions (scrn->scrnIndex,
  			scrn->options,
  			config->options);
@@ -22,5 +22,5 @@ index 9bcf81b..a953c8a 100644
      if (scrn->display->virtualX)
  	width = scrn->display->virtualX;
 -- 
-1.6.0.1
+1.7.1
 

xserver-1.6.0-displayfd.patch:
 dix/globals.c    |    1 
 include/opaque.h |    1 
 os/connection.c  |   72 +++++++++++++++++++++++++++++++++++++------------------
 os/utils.c       |   12 ++++++++-
 4 files changed, 62 insertions(+), 24 deletions(-)

Index: xserver-1.6.0-displayfd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.0-displayfd.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xserver-1.6.0-displayfd.patch	19 Jun 2009 07:03:33 -0000	1.2
+++ xserver-1.6.0-displayfd.patch	5 Jul 2010 00:07:05 -0000	1.3
@@ -1,7 +1,7 @@
-From 1766352059d0db67bff3f7dd0820563a30f54858 Mon Sep 17 00:00:00 2001
+From e947d22be5c559c9c19e13a42b8f39a2e3746ae3 Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax at redhat.com>
 Date: Thu, 18 Jun 2009 16:56:41 +1000
-Subject: [PATCH] displayfd hack
+Subject: [PATCH 08/17] displayfd hack
 
 ---
  dix/globals.c    |    1 +
@@ -11,10 +11,10 @@ Subject: [PATCH] displayfd hack
  4 files changed, 62 insertions(+), 23 deletions(-)
 
 diff --git a/dix/globals.c b/dix/globals.c
-index 907a5e8..c1e64d3 100644
+index 95dde2d..2ea9480 100644
 --- a/dix/globals.c
 +++ b/dix/globals.c
-@@ -135,6 +135,7 @@ int defaultColorVisualClass = -1;
+@@ -131,6 +131,7 @@ int defaultColorVisualClass = -1;
  int monitorResolution = 0;
  
  char *display;
@@ -35,7 +35,7 @@ index fcc8c95..2a08e2d 100644
  extern _X_EXPORT int defaultBackingStore;
  extern _X_EXPORT Bool disableBackingStore;
 diff --git a/os/connection.c b/os/connection.c
-index 0c72b67..05d95c4 100644
+index c143fb6..0d1e1de 100644
 --- a/os/connection.c
 +++ b/os/connection.c
 @@ -146,6 +146,7 @@ Bool NewOutputPending;		/* not yet attempted to write some new output */
@@ -104,7 +104,7 @@ index 0c72b67..05d95c4 100644
 +	Bool found = 0;
 +	for (i = 0; i < 65535 - 1024; i++)
  	{
--	    ListenTransFds = xalloc (ListenTransCount * sizeof (int));
+-	    ListenTransFds = malloc(ListenTransCount * sizeof (int));
 -
 -	    for (i = 0; i < ListenTransCount; i++)
 +	    if (!TryCreateSocket(i, &partial) && !partial)
@@ -146,10 +146,10 @@ index 0c72b67..05d95c4 100644
      }
  
 diff --git a/os/utils.c b/os/utils.c
-index 7bfdf8b..37a93b1 100644
+index 64810cf..c292702 100644
 --- a/os/utils.c
 +++ b/os/utils.c
-@@ -678,6 +678,17 @@ ProcessCommandLine(int argc, char *argv[])
+@@ -660,6 +660,17 @@ ProcessCommandLine(int argc, char *argv[])
  	    else
  		UseMsg();
  	}
@@ -168,5 +168,5 @@ index 7bfdf8b..37a93b1 100644
  	else if ( strcmp( argv[i], "dpms") == 0)
  	    /* ignored for compatibility */ ;
 -- 
-1.6.3.rc1.2.g0164.dirty
+1.7.1
 

xserver-1.6.0-less-acpi-brokenness.patch:
 configure.ac |    3 ---
 1 file changed, 3 deletions(-)

Index: xserver-1.6.0-less-acpi-brokenness.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.0-less-acpi-brokenness.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xserver-1.6.0-less-acpi-brokenness.patch	11 Mar 2009 18:20:28 -0000	1.1
+++ xserver-1.6.0-less-acpi-brokenness.patch	5 Jul 2010 00:07:05 -0000	1.2
@@ -1,7 +1,7 @@
-From a8079882f1884edc62a9de28af915bd8b65dfbbe Mon Sep 17 00:00:00 2001
+From 9a399f86295b571812133ccb06618c7befa36ad6 Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax at redhat.com>
 Date: Wed, 11 Mar 2009 14:02:11 -0400
-Subject: [PATCH] Don't build the ACPI code.
+Subject: [PATCH 06/17] Don't build the ACPI code.
 
 No good can come of this.
 ---
@@ -9,10 +9,10 @@ No good can come of this.
  1 files changed, 0 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 72ae67e..04716f8 100644
+index b3b752c..8d874cb 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1269,13 +1269,11 @@ if test "x$XORG" = xyes; then
+@@ -1624,13 +1624,11 @@ if test "x$XORG" = xyes; then
  		case $host_cpu in
  		  ia64*)
  			linux_ia64=yes
@@ -27,5 +27,5 @@ index 72ae67e..04716f8 100644
  		  *)
  			;;
 -- 
-1.6.1.3
+1.7.1
 

xserver-1.6.1-nouveau.patch:
 glx/glxdri.c                   |    7 +++++--
 glx/glxdri2.c                  |    7 +++++--
 hw/xfree86/common/xf86pciBus.c |   19 +++++++++++++++++--
 3 files changed, 27 insertions(+), 6 deletions(-)

Index: xserver-1.6.1-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.1-nouveau.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xserver-1.6.1-nouveau.patch	16 Feb 2010 05:59:01 -0000	1.3
+++ xserver-1.6.1-nouveau.patch	5 Jul 2010 00:07:05 -0000	1.4
@@ -1,17 +1,17 @@
-From 05c3ac7e882e0f46f908cc165f87d0e81399431d Mon Sep 17 00:00:00 2001
+From 9edb8ba5f8217f6f8ed80e064d57a97f4f3e9201 Mon Sep 17 00:00:00 2001
 From: Fedora X Ninjas <x at fedoraproject.org>
 Date: Tue, 16 Feb 2010 11:38:17 +1000
-Subject: [PATCH] autoconfig: select nouveau by default for NVIDIA GPUs
+Subject: [PATCH 07/17] autoconfig: select nouveau by default for NVIDIA GPUs
 
 Also, don't treat DRI setup failure as an error for nouveau.
 ---
- glx/glxdri.c                       |    7 +++++--
- glx/glxdri2.c                      |    7 +++++--
- hw/xfree86/common/xf86AutoConfig.c |   18 +++++++++++++++++-
+ glx/glxdri.c                   |    7 +++++--
+ glx/glxdri2.c                  |    7 +++++--
+ hw/xfree86/common/xf86pciBus.c |   18 +++++++++++++++++-
  3 files changed, 27 insertions(+), 5 deletions(-)
 
 diff --git a/glx/glxdri.c b/glx/glxdri.c
-index 21e44d1..30b820c 100644
+index 32b35db..f3a501e 100644
 --- a/glx/glxdri.c
 +++ b/glx/glxdri.c
 @@ -968,6 +968,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
@@ -33,9 +33,9 @@ index 21e44d1..30b820c 100644
  		   filename, dlerror());
          goto handle_error;
      }
-@@ -1184,7 +1187,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+@@ -1185,7 +1188,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
  
-     xfree(screen);
+     free(screen);
  
 -    LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n");
 +    LogMessage(from, "AIGLX: reverting to software rendering\n");
@@ -43,18 +43,18 @@ index 21e44d1..30b820c 100644
      return NULL;
  }
 diff --git a/glx/glxdri2.c b/glx/glxdri2.c
-index 0f998de..a244809 100644
+index 970a51a..c78d4b3 100644
 --- a/glx/glxdri2.c
 +++ b/glx/glxdri2.c
-@@ -676,6 +676,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+@@ -696,6 +696,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
      const __DRIextension **extensions;
      const __DRIconfig **driConfigs;
      int i;
 +    int from = X_ERROR;
  
-     screen = xcalloc(1, sizeof *screen);
+     screen = calloc(1, sizeof *screen);
      if (screen == NULL)
-@@ -702,7 +703,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+@@ -722,7 +723,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
  
      screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
      if (screen->driver == NULL) {
@@ -65,20 +65,20 @@ index 0f998de..a244809 100644
  		   filename, dlerror());
          goto handle_error;
      }
-@@ -793,7 +796,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+@@ -816,7 +819,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
  
-     xfree(screen);
+     free(screen);
  
 -    LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n");
 +    LogMessage(from, "AIGLX: reverting to software rendering\n");
  
      return NULL;
  }
-diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index 7f4ada8..369101c 100644
---- a/hw/xfree86/common/xf86AutoConfig.c
-+++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -192,7 +192,23 @@ videoPtrToDriverList(struct pci_device *dev,
+diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
+index 74016af..9c296f5 100644
+--- a/hw/xfree86/common/xf86pciBus.c
++++ b/hw/xfree86/common/xf86pciBus.c
+@@ -1118,7 +1118,23 @@ videoPtrToDriverList(struct pci_device *dev,
  	    break;
  	case 0x102b:		    driverList[0] = "mga";	break;
  	case 0x10c8:		    driverList[0] = "neomagic"; break;
@@ -104,5 +104,5 @@ index 7f4ada8..369101c 100644
          case 0x1b36:		    driverList[0] = "qxl"; break;
  	case 0x1163:		    driverList[0] = "rendition"; break;
 -- 
-1.6.6.1
+1.7.1
 

xserver-1.6.99-default-modes.patch:
 xf86Crtc.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: xserver-1.6.99-default-modes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.99-default-modes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xserver-1.6.99-default-modes.patch	4 Mar 2010 05:40:17 -0000	1.3
+++ xserver-1.6.99-default-modes.patch	5 Jul 2010 00:07:05 -0000	1.4
@@ -1,26 +1,17 @@
-From ca85ebddd804305322014c6a71b4122a56c5e634 Mon Sep 17 00:00:00 2001
+From 92a02d58bf4e1d0b4779d37401d40c28e3a4ba2a Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax at redhat.com>
 Date: Thu, 4 Mar 2010 15:18:38 +1000
-Subject: [PATCH] tweak default mode list yet again
+Subject: [PATCH 11/17] tweak default mode list yet again
 
 ---
- hw/xfree86/modes/xf86Crtc.c |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
+ hw/xfree86/modes/xf86Crtc.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
 
 diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 03277be..571ffd0 100644
+index d907eb2..dc159a1 100644
 --- a/hw/xfree86/modes/xf86Crtc.c
 +++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -1582,7 +1582,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
- 	int		    min_clock = 0;
- 	int		    max_clock = 0;
- 	double		    clock;
--	Bool                add_default_modes = TRUE;
-+	Bool                add_default_modes;
- 	Bool		    debug_modes = config->debug_modes ||
- 					  xf86Initialising;
- 	enum det_monrec_source sync_source = sync_default;
-@@ -1628,6 +1628,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
+@@ -1630,6 +1630,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
  	}
  	
  	output_modes = (*output->funcs->get_modes) (output);
@@ -31,5 +22,5 @@ index 03277be..571ffd0 100644
  	edid_monitor = output->MonInfo;
  	
 -- 
-1.6.6.1
+1.7.1
 

xserver-1.6.99-randr-error-debugging.patch:
 randr.c |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

Index: xserver-1.6.99-randr-error-debugging.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.99-randr-error-debugging.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xserver-1.6.99-randr-error-debugging.patch	15 Sep 2009 15:10:02 -0000	1.2
+++ xserver-1.6.99-randr-error-debugging.patch	5 Jul 2010 00:07:05 -0000	1.3
@@ -1,17 +1,17 @@
-From 16be69ef1e2ea9f19cd596b99b5ede7567d374b8 Mon Sep 17 00:00:00 2001
+From 86b93dc922cda2464e81fa48de1fc2648b1ac4c6 Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax at redhat.com>
 Date: Mon, 27 Jul 2009 16:52:42 -0400
-Subject: [PATCH 11/16] additional randr debugging
+Subject: [PATCH 09/17] additional randr debugging
 
 ---
  randr/randr.c |   16 +++++++++++++++-
  1 files changed, 15 insertions(+), 1 deletions(-)
 
 diff --git a/randr/randr.c b/randr/randr.c
-index 1c1d0c4..accf614 100644
+index f52a46a..a994110 100644
 --- a/randr/randr.c
 +++ b/randr/randr.c
-@@ -477,10 +477,24 @@ RRVerticalRefresh (xRRModeInfo *mode)
+@@ -480,10 +480,24 @@ RRVerticalRefresh (xRRModeInfo *mode)
  static int
  ProcRRDispatch (ClientPtr client)
  {
@@ -38,5 +38,5 @@ index 1c1d0c4..accf614 100644
  
  static int
 -- 
-1.6.4.2
+1.7.1
 

xserver-1.6.99-right-of.patch:
 common/xf86str.h |    9 +++++-
 modes/xf86Crtc.c |   75 +++++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 74 insertions(+), 10 deletions(-)

Index: xserver-1.6.99-right-of.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.99-right-of.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xserver-1.6.99-right-of.patch	25 Feb 2010 02:00:43 -0000	1.3
+++ xserver-1.6.99-right-of.patch	5 Jul 2010 00:07:05 -0000	1.4
@@ -1,7 +1,7 @@
-From ba73535b8af8e3540d7fddc0a4b8a85ad2ffa891 Mon Sep 17 00:00:00 2001
+From 1897cfb0c09b11ebc5e3de3391150cfa6666d901 Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax at redhat.com>
 Date: Tue, 28 Jul 2009 11:07:13 -0400
-Subject: [PATCH] RANDR: right-of placement by default
+Subject: [PATCH 10/17] RANDR: right-of placement by default
 
 [Enhanced to add a new prefer clone option for drivers. This
 allows for servers like RN50 where two heads are disjoint. - airlied]
@@ -11,10 +11,10 @@ allows for servers like RN50 where two h
  2 files changed, 74 insertions(+), 9 deletions(-)
 
 diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
-index 2b8f998..acc7d07 100644
+index f96fc5d..c47601a 100644
 --- a/hw/xfree86/common/xf86str.h
 +++ b/hw/xfree86/common/xf86str.h
-@@ -516,10 +516,13 @@ typedef struct _confdrirec {
+@@ -502,10 +502,13 @@ typedef struct _confdrirec {
  } confDRIRec, *confDRIPtr;
  
  /* These values should be adjusted when new fields are added to ScrnInfoRec */
@@ -29,7 +29,7 @@ index 2b8f998..acc7d07 100644
  typedef pointer (*funcPointer)(void);
  
  /* flags for depth 24 pixmap options */
-@@ -685,7 +688,6 @@ typedef void xf86SetOverscanProc          (ScrnInfoPtr, int);
+@@ -671,7 +674,6 @@ typedef void xf86SetOverscanProc          (ScrnInfoPtr, int);
   * are to be dependent on compile-time defines.
   */
  
@@ -37,21 +37,21 @@ index 2b8f998..acc7d07 100644
  typedef struct _ScrnInfoRec {
      int			driverVersion;
      char *		driverName;		/* canonical name used in */
-@@ -790,6 +792,9 @@ typedef struct _ScrnInfoRec {
- 
+@@ -777,6 +779,9 @@ typedef struct _ScrnInfoRec {
      /* -nr support */
      int                 canDoBGNoneRoot;
-+
+ 
 +    /* initial rightof support disable */
 +    int                 preferClone;
- 
++
      /*
       * These can be used when the minor ABI version is incremented.
+      * The NUM_* parameters must be reduced appropriately to keep the
 diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 9370640..a710b23 100644
+index 883bf3b..d907eb2 100644
 --- a/hw/xfree86/modes/xf86Crtc.c
 +++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -1137,6 +1137,15 @@ xf86InitialOutputPositions (ScrnInfoPtr scrn, DisplayModePtr *modes)
+@@ -1148,6 +1148,15 @@ xf86InitialOutputPositions (ScrnInfoPtr scrn, DisplayModePtr *modes)
      int			o;
      int			min_x, min_y;
      
@@ -67,7 +67,7 @@ index 9370640..a710b23 100644
      for (o = 0; o < config->num_output; o++)
      {
  	xf86OutputPtr	output = config->output[o];
-@@ -1995,6 +2004,57 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect)
+@@ -2032,6 +2041,57 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect)
      return match;
  }
  
@@ -125,7 +125,7 @@ index 9370640..a710b23 100644
  static Bool
  xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
  		    DisplayModePtr *modes, Bool *enabled,
-@@ -2052,13 +2112,9 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
+@@ -2089,13 +2149,9 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
       * biggest mode for its aspect ratio, assuming one exists.
       */
      if (!ret) do {
@@ -140,16 +140,16 @@ index 9370640..a710b23 100644
  	    break;
  
  	p = -1;
-@@ -2346,6 +2402,8 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
- 
-     if (xf86TargetUserpref(scrn, config, modes, enabled, width, height))
- 	xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n");
-+    else if (xf86TargetRightOf(scrn, config, modes, enabled, width, height))
-+	xf86DrvMsg(i, X_INFO, "Using spanning desktop for initial modes\n");
-     else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height))
- 	xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n");
-     else if (xf86TargetAspect(scrn, config, modes, enabled, width, height))
-@@ -2362,8 +2420,10 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
+@@ -2388,6 +2444,8 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
+     } else {
+ 	if (xf86TargetUserpref(scrn, config, modes, enabled, width, height))
+ 	    xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n");
++	else if (xf86TargetRightOf(scrn, config, modes, enabled, width, height))
++	    xf86DrvMsg(i, X_INFO, "Using spanning desktop for initial modes\n");
+ 	else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height))
+ 	    xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n");
+ 	else if (xf86TargetAspect(scrn, config, modes, enabled, width, height))
+@@ -2405,8 +2463,10 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
  			config->output[o]->name);
  	else
  	    xf86DrvMsg (scrn->scrnIndex, X_INFO,
@@ -163,5 +163,5 @@ index 9370640..a710b23 100644
  
      /*
 -- 
-1.6.5.2
+1.7.1
 

xserver-1.7.0-randr-gamma-restore.patch:
 xf86RandR12.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: xserver-1.7.0-randr-gamma-restore.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.7.0-randr-gamma-restore.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xserver-1.7.0-randr-gamma-restore.patch	21 Jan 2010 07:31:41 -0000	1.2
+++ xserver-1.7.0-randr-gamma-restore.patch	5 Jul 2010 00:07:05 -0000	1.3
@@ -1,25 +1,25 @@
-From 18d2bd8cb513a0436739916620532247f13dbf03 Mon Sep 17 00:00:00 2001
+From a4d1b05d1f8e98d4ecc332d9573f207e86234e18 Mon Sep 17 00:00:00 2001
 From: Fedora X Ninjas <x at fedoraproject.org>
 Date: Thu, 8 Oct 2009 15:25:24 -0400
-Subject: [PATCH] randr gamma reload hack
+Subject: [PATCH 12/17] randr gamma reload hack
 
 ---
- hw/xfree86/loader/sdksyms.c    |    4 ++++
  hw/xfree86/modes/xf86RandR12.c |    6 ++++++
- 2 files changed, 10 insertions(+), 0 deletions(-)
+ 1 files changed, 6 insertions(+), 0 deletions(-)
 
 diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
-index 6ea9d26..41bac11 100644
+index 043ceee..a73b003 100644
 --- a/hw/xfree86/modes/xf86RandR12.c
 +++ b/hw/xfree86/modes/xf86RandR12.c
-@@ -1746,12 +1746,18 @@ xf86RandR12EnterVT (int screen_index, int flags)
- {
+@@ -1775,6 +1775,7 @@ xf86RandR12EnterVT (int screen_index, int flags)
      ScreenPtr        pScreen = screenInfo.screens[screen_index];
+     ScrnInfoPtr	     pScrn = xf86Screens[screen_index];
      XF86RandRInfoPtr randrp  = XF86RANDRINFO(pScreen);
 +    rrScrPrivPtr     rp = rrGetScrPriv(pScreen);
+     Bool	     ret;
  
      if (randrp->orig_EnterVT) {
- 	if (!randrp->orig_EnterVT (screen_index, flags))
+@@ -1786,6 +1787,11 @@ xf86RandR12EnterVT (int screen_index, int flags)
  	    return FALSE;
      }
  
@@ -32,5 +32,5 @@ index 6ea9d26..41bac11 100644
  }
  
 -- 
-1.6.5.rc2
+1.7.1
 

xserver-1.7.1-gamma-kdm-fix.patch:
 xf86RandR12.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Index: xserver-1.7.1-gamma-kdm-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.7.1-gamma-kdm-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xserver-1.7.1-gamma-kdm-fix.patch	7 Jan 2010 02:14:20 -0000	1.1
+++ xserver-1.7.1-gamma-kdm-fix.patch	5 Jul 2010 00:07:05 -0000	1.2
@@ -1,17 +1,17 @@
-From acc64ce5be7383c09e88a23aab06ebc2403f2ca3 Mon Sep 17 00:00:00 2001
+From 0087041fe9315e7f1e04c485cbdb885752181502 Mon Sep 17 00:00:00 2001
 From: Bill Nottingham <notting at redhat.com>
 Date: Fri, 6 Nov 2009 10:32:27 +1000
-Subject: [PATCH] fix KDM gamma issue on vt switch
+Subject: [PATCH 14/17] fix KDM gamma issue on vt switch
 
 ---
  hw/xfree86/modes/xf86RandR12.c |    4 ++++
  1 files changed, 4 insertions(+), 0 deletions(-)
 
 diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
-index 6ea9d26..ece12b9 100644
+index a73b003..6db73bd 100644
 --- a/hw/xfree86/modes/xf86RandR12.c
 +++ b/hw/xfree86/modes/xf86RandR12.c
-@@ -1761,6 +1761,7 @@ xf86RandR12Init12 (ScreenPtr pScreen)
+@@ -1801,6 +1801,7 @@ xf86RandR12Init12 (ScreenPtr pScreen)
      ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
      rrScrPrivPtr	rp = rrGetScrPriv(pScreen);
      XF86RandRInfoPtr	randrp  = XF86RANDRINFO(pScreen);
@@ -19,7 +19,7 @@ index 6ea9d26..ece12b9 100644
  
      rp->rrGetInfo = xf86RandR12GetInfo12;
      rp->rrScreenSetSize = xf86RandR12ScreenSetSize;
-@@ -1790,6 +1791,9 @@ xf86RandR12Init12 (ScreenPtr pScreen)
+@@ -1830,6 +1831,9 @@ xf86RandR12Init12 (ScreenPtr pScreen)
       */
      if (!xf86RandR12SetInfo12 (pScreen))
  	return FALSE;
@@ -30,5 +30,5 @@ index 6ea9d26..ece12b9 100644
  }
  
 -- 
-1.6.5.1
+1.7.1
 

xserver-1.7.1-multilib.patch:
 colormapst.h     |    4 ++--
 xorg-server.h.in |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

Index: xserver-1.7.1-multilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.7.1-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xserver-1.7.1-multilib.patch	7 Jan 2010 02:14:20 -0000	1.1
+++ xserver-1.7.1-multilib.patch	5 Jul 2010 00:07:05 -0000	1.2
@@ -1,7 +1,7 @@
-From 6d9585ba6a5784328de479c6b648d7b7d6cec64c Mon Sep 17 00:00:00 2001
+From 450e2e95f0f15e983f6a8f01bdd3a7b5ba91f5b8 Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax at redhat.com>
 Date: Thu, 29 Oct 2009 19:04:10 -0400
-Subject: [PATCH] multilib fix for -devel subpackage
+Subject: [PATCH 13/17] multilib fix for -devel subpackage
 
 ---
  include/colormapst.h     |    4 ++--
@@ -28,7 +28,7 @@ index f1fc8eb..274cd65 100644
  #endif
      ScreenPtr	pScreen;	/* screen map is associated with */
 diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
-index 76cab16..081b8f3 100644
+index 76cab16..d12fd23 100644
 --- a/include/xorg-server.h.in
 +++ b/include/xorg-server.h.in
 @@ -157,9 +157,6 @@
@@ -51,5 +51,5 @@ index 76cab16..081b8f3 100644
 +
  #endif /* _XORG_SERVER_H_ */
 -- 
-1.6.5.2
+1.7.1
 

xserver-1.8-disable-vboxvideo.patch:
 xf86pciBus.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: xserver-1.8-disable-vboxvideo.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.8-disable-vboxvideo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xserver-1.8-disable-vboxvideo.patch	19 Mar 2010 03:37:30 -0000	1.1
+++ xserver-1.8-disable-vboxvideo.patch	5 Jul 2010 00:07:05 -0000	1.2
@@ -1,17 +1,17 @@
-From 1f315578bf759c85261b1f2295efbf0dba852f73 Mon Sep 17 00:00:00 2001
+From 8b4ebd77eef247d85091a1f66c61a7bb1d17948d Mon Sep 17 00:00:00 2001
 From: Adam Williamson <adamwill at shaw.ca>
 Date: Thu, 25 Feb 2010 10:34:49 -0800
-Subject: [PATCH] disable vboxvideo driver in autodetect code
+Subject: [PATCH 16/17] disable vboxvideo driver in autodetect code
 
 ---
- hw/xfree86/common/xf86AutoConfig.c |    2 +-
+ hw/xfree86/common/xf86pciBus.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index 7f4ada8..4e944ea 100644
---- a/hw/xfree86/common/xf86AutoConfig.c
-+++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -220,7 +220,7 @@ videoPtrToDriverList(struct pci_device *dev,
+diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
+index 9c296f5..001625c 100644
+--- a/hw/xfree86/common/xf86pciBus.c
++++ b/hw/xfree86/common/xf86pciBus.c
+@@ -1162,7 +1162,7 @@ videoPtrToDriverList(struct pci_device *dev,
  	case 0x1011:		    driverList[0] = "tga"; break;
  	case 0x1023:		    driverList[0] = "trident"; break;
  	case 0x100c:		    driverList[0] = "tseng"; break;
@@ -21,5 +21,5 @@ index 7f4ada8..4e944ea 100644
  	case 0x18ca:
  	    if (dev->device_id == 0x47)
 -- 
-1.7.0
+1.7.1
 

xserver-1.8-udev-warning.patch:
 xf86Config.c |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

Index: xserver-1.8-udev-warning.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.8-udev-warning.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xserver-1.8-udev-warning.patch	17 Feb 2010 05:12:42 -0000	1.1
+++ xserver-1.8-udev-warning.patch	5 Jul 2010 00:07:05 -0000	1.2
@@ -1,7 +1,7 @@
-From 57a188877b0472edb12bdf707b1550abbeb85af8 Mon Sep 17 00:00:00 2001
+From d955517a5005e02b16fc6a5945d8d0de8937aa18 Mon Sep 17 00:00:00 2001
 From: Fedora X Ninjas <x at fedoraproject.org>
 Date: Wed, 17 Feb 2010 11:12:36 +1000
-Subject: [PATCH] Stick giant warning into logfiles about udev configuration changes.
+Subject: [PATCH 15/17] Stick giant warning into logfiles about udev configuration changes.
 
 Signed-off-by: Fedora X Ninjas <x at fedoraproject.org>
 ---
@@ -9,10 +9,10 @@ Signed-off-by: Fedora X Ninjas <x at fedora
  1 files changed, 13 insertions(+), 0 deletions(-)
 
 diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 132e8bc..b1722cd 100644
+index 28786ba..26adf0b 100644
 --- a/hw/xfree86/common/xf86Config.c
 +++ b/hw/xfree86/common/xf86Config.c
-@@ -1472,6 +1472,19 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
+@@ -1455,6 +1455,19 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
  	                "input devices.\n\tIf no devices become available, "
  	                "reconfigure %s or disable AutoAddDevices.\n",
  			config_backend, config_backend);
@@ -33,5 +33,5 @@ index 132e8bc..b1722cd 100644
  	xf86Msg(X_INFO, "Hotplugging is disabled and no input devices were configured.\n"
  			"\tTry disabling AllowEmptyInput.\n");
 -- 
-1.6.6.1
+1.7.1
 

xserver-1.8.0-no-xorg.patch:
 Makefile.am |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: xserver-1.8.0-no-xorg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.8.0-no-xorg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xserver-1.8.0-no-xorg.patch	22 Jun 2010 16:54:57 -0000	1.1
+++ xserver-1.8.0-no-xorg.patch	5 Jul 2010 00:07:05 -0000	1.2
@@ -1,14 +1,14 @@
-From d7ad35e125cb9456d12abbd66ab061425d5e5564 Mon Sep 17 00:00:00 2001
+From 24f403a5b3f29016a135c615d6cb87bafcea4583 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
 Date: Tue, 22 Jun 2010 18:19:38 +0200
-Subject: [PATCH] XF86CONFIGDIR is undefined when built with --disable-xorg
+Subject: [PATCH 17/17] XF86CONFIGDIR is undefined when built with --disable-xorg
 
 ---
  config/Makefile.am |    2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)
 
 diff --git a/config/Makefile.am b/config/Makefile.am
-index 675a3b2..4bea057 100644
+index e1f1c4e..4a2e873 100644
 --- a/config/Makefile.am
 +++ b/config/Makefile.am
 @@ -9,8 +9,10 @@ AM_CFLAGS += $(UDEV_CFLAGS)
@@ -23,5 +23,5 @@ index 675a3b2..4bea057 100644
  else
  
 -- 
-1.6.6.1
+1.7.1
 

