rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.461, 1.462 xserver-1.6.99-vga-arb.patch, 1.4, 1.5

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-server.spec xserver-1.6.99-vga-arb.patch 
Log Message:
* Wed Aug 05 2009 Adam Jackson <ajax at redhat.com> 1.6.99-27.20090804
- xserver-1.6.99-vga-arb.patch: Fix crashes from miscompilation without
  xorg-config.h.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -p -r1.461 -r1.462
--- xorg-x11-server.spec	5 Aug 2009 05:55:36 -0000	1.461
+++ xorg-x11-server.spec	5 Aug 2009 17:55:58 -0000	1.462
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   26.%{gitdate}%{?dist}
+Release:   27.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -527,6 +527,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 05 2009 Adam Jackson <ajax at redhat.com> 1.6.99-27.20090804
+- xserver-1.6.99-vga-arb.patch: Fix crashes from miscompilation without
+  xorg-config.h.
+
 * Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 1.6.99-26.20090804
 - fix VGA arb device lookup - noticed by mclasen in qemu
 
@@ -568,7 +572,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Thu Jul 23 2009 Adam Jackson <ajax at redhat.com> 1.6.99-16.20090721
 - xserver-1.6.99-linkmap.patch: Print load offsets of all DSOs on backtrace
-  so we addr2line afterwards.
+  so we can addr2line afterwards.
 
 * Tue Jul 21 2009 Adam Jackson <ajax at redhat.com> 1.6.99-15.20090721
 - Today's git snapshot.

xserver-1.6.99-vga-arb.patch:
 configure.ac                           |    1 
 hw/xfree86/common/Makefile.am          |    6 
 hw/xfree86/common/xf86Bus.c            |   15 
 hw/xfree86/common/xf86DPMS.c           |    4 
 hw/xfree86/common/xf86Init.c           |   11 
 hw/xfree86/common/xf86PM.c             |    6 
 hw/xfree86/common/xf86VGAarbiter.c     | 1151 +++++++++++++++++++++++++++++++++
 hw/xfree86/common/xf86VGAarbiter.h     |   48 +
 hw/xfree86/common/xf86VGAarbiterPriv.h |  266 +++++++
 hw/xfree86/common/xf86str.h            |    4 
 hw/xfree86/dri/dri.c                   |    7 
 hw/xfree86/dri2/dri2.c                 |    7 
 hw/xfree86/int10/generic.c             |    2 
 hw/xfree86/loader/sdksyms.sh           |    1 
 include/xorg-config.h.in               |    4 
 15 files changed, 1522 insertions(+), 11 deletions(-)

Index: xserver-1.6.99-vga-arb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.99-vga-arb.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xserver-1.6.99-vga-arb.patch	5 Aug 2009 06:03:51 -0000	1.4
+++ xserver-1.6.99-vga-arb.patch	5 Aug 2009 17:55:58 -0000	1.5
@@ -1,7 +1,7 @@
-From 0fa02caca3108dee3f1ddfb8ba8ce0b6bb61bcd1 Mon Sep 17 00:00:00 2001
+From 1dd898dc07dadbb2f115bbb177bb52d05bea2df3 Mon Sep 17 00:00:00 2001
 From: Dave Airlie <airlied at redhat.com>
 Date: Mon, 3 Aug 2009 14:09:32 +1000
-Subject: [PATCH] X server: VGA arbitration.
+Subject: [PATCH 03/15] X server: VGA arbitration.
 
 This patch adds the VGA arb paths to the X server.
 
@@ -14,7 +14,7 @@ test with lots more sigio mouse movement
  hw/xfree86/common/xf86DPMS.c           |    4 +-
  hw/xfree86/common/xf86Init.c           |   11 +-
  hw/xfree86/common/xf86PM.c             |    6 +-
- hw/xfree86/common/xf86VGAarbiter.c     | 1149 ++++++++++++++++++++++++++++++++
+ hw/xfree86/common/xf86VGAarbiter.c     | 1151 ++++++++++++++++++++++++++++++++
  hw/xfree86/common/xf86VGAarbiter.h     |   48 ++
  hw/xfree86/common/xf86VGAarbiterPriv.h |  266 ++++++++
  hw/xfree86/common/xf86str.h            |    4 +-
@@ -23,7 +23,7 @@ test with lots more sigio mouse movement
  hw/xfree86/int10/generic.c             |    2 +
  hw/xfree86/loader/sdksyms.sh           |    1 +
  include/xorg-config.h.in               |    3 +
- 15 files changed, 1520 insertions(+), 10 deletions(-)
+ 15 files changed, 1522 insertions(+), 10 deletions(-)
  create mode 100644 hw/xfree86/common/xf86VGAarbiter.c
  create mode 100644 hw/xfree86/common/xf86VGAarbiter.h
  create mode 100644 hw/xfree86/common/xf86VGAarbiterPriv.h
@@ -225,10 +225,10 @@ index f6138c3..fa24813 100644
  	}
 diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c
 new file mode 100644
-index 0000000..9f12490
+index 0000000..13802cd
 --- /dev/null
 +++ b/hw/xfree86/common/xf86VGAarbiter.c
-@@ -0,0 +1,1149 @@
+@@ -0,0 +1,1151 @@
 +/*
 + * This code was stolen from RAC and adapted to control the legacy vga
 + * interface.
@@ -259,13 +259,15 @@ index 0000000..9f12490
 + *
 + */
 +
-+#define DEBUG
++#include "xorg-config.h"
++
 +#include "xf86VGAarbiter.h"
 +#include "xf86VGAarbiterPriv.h"
 +#include "xf86Bus.h"
 +#include "pciaccess.h"
 +
 +#ifdef DEBUG
++#error no, really, you don't want to do this
 +#define DPRINT_S(x,y) ErrorF(x ": %i\n",y);
 +#define DPRINT(x) ErrorF(x "\n");
 +#else
@@ -1821,5 +1823,5 @@ index ffb35f8..603ae13 100644
  #undef PCI_TXT_IDS_PATH
  
 -- 
-1.5.4.1
+1.6.4