rpms/xorg-x11-server/devel .cvsignore, 1.69, 1.70 commitid, 1.32, 1.33 sources, 1.64, 1.65 xorg-x11-server.spec, 1.477, 1.478 xserver-1.6.99-vga-arb.patch, 1.6, 1.7

[Peter Hutterer]

Author: whot

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

Modified Files:
	.cvsignore commitid sources xorg-x11-server.spec 
	xserver-1.6.99-vga-arb.patch 
Log Message:
* Tue Aug 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-41.20090825
- Today's git snapshot.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore	20 Aug 2009 21:40:48 -0000	1.69
+++ .cvsignore	25 Aug 2009 08:24:54 -0000	1.70
@@ -1 +1 @@
-xorg-server-20090820.tar.xz
+xorg-server-20090825.tar.xz


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- commitid	20 Aug 2009 21:40:48 -0000	1.32
+++ commitid	25 Aug 2009 08:24:54 -0000	1.33
@@ -1 +1 @@
-9d8fc33cae2fee7777edd20658dbf6a3ffb3d557
+0f9ffc887ca1471e98df746253d9300e03e46a15


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	20 Aug 2009 21:40:48 -0000	1.64
+++ sources	25 Aug 2009 08:24:54 -0000	1.65
@@ -1 +1 @@
-ea807505ea5c7e6c2d1a7f1cadce4f6f  xorg-server-20090820.tar.xz
+2155224c1468113477aed53561b09063  xorg-server-20090825.tar.xz


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -p -r1.477 -r1.478
--- xorg-x11-server.spec	24 Aug 2009 05:05:49 -0000	1.477
+++ xorg-x11-server.spec	25 Aug 2009 08:24:54 -0000	1.478
@@ -14,12 +14,12 @@
 # Fix rhpxl to no longer need vesamodes/extramodes
 
 %define pkgname xorg-server
-%define gitdate 20090820
+%define gitdate 20090825
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   40.%{gitdate}%{?dist}
+Release:   41.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -507,6 +507,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Aug 25 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-41.20090825
+- Today's git snapshot.
+
 * Mon Aug 24 2009 Ben Skeggs <bskeggs at redhat.com> 1.6.99-40.20090820
 - xserver-1.6.1-nouveau.patch: remove vesa fallback for 0x08xx chips, KMS
   should work on them now, there's accel issues on some of them but we can

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.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xserver-1.6.99-vga-arb.patch	11 Aug 2009 04:13:13 -0000	1.6
+++ xserver-1.6.99-vga-arb.patch	25 Aug 2009 08:24:55 -0000	1.7
@@ -39,7 +39,7 @@ index 1e3438e..a1219d6 100644
 +	AC_CHECK_FUNCS([pci_device_vgaarb_init])
  	LIBS=$SAVE_LIBS
  	CFLAGS=$SAVE_CFLAGS
- 	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS"
+ 	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS $SELINUX_LIB"
 diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
 index f3e201b..ad27210 100644
 --- a/hw/xfree86/common/Makefile.am