rpms/xorg-x11-server/devel commitid, NONE, 1.1 ddc-faster-plz.patch, NONE, 1.1 make-git-snapshot.sh, NONE, 1.1 no-sleep-at-exit.patch, NONE, 1.1 pogo-stick.patch, NONE, 1.1

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16937

Added Files:
	commitid ddc-faster-plz.patch make-git-snapshot.sh 
	no-sleep-at-exit.patch pogo-stick.patch 
Log Message:
* Fri Nov 02 2007 Adam Jackson <ajax at redhat.com> 1.4.99.1-0.6
- Merge a bunch of the more trivial patches upstream.
- New git snapshot containing the merged bits.
- Remove unused patches.
- Drop the XFree86 obsoletes.



--- NEW FILE commitid ---
7a0555e9bb59d02816803a1100f807d2d29f31d4

ddc-faster-plz.patch:

--- NEW FILE ddc-faster-plz.patch ---
>From 2c53e4d6fcb16784548bd755827de1ee5ddddeb8 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Thu, 8 Nov 2007 15:33:08 -0500
Subject: [PATCH] Speed up DDC probe.

---
 hw/xfree86/ddc/xf86DDC.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c
index e47b8b8..9d38aab 100644
--- a/hw/xfree86/ddc/xf86DDC.c
+++ b/hw/xfree86/ddc/xf86DDC.c
@@ -148,6 +148,9 @@ xf86DoEDID_DDC2(int scrnIndex, I2CBusPtr pBus)
     if (noddc || noddc2)
 	return NULL;
 
+    if (!xf86I2CProbeAddress(pBus, 0xA1))
+	return NULL;
+
     EDID_block = EDID1Read_DDC2(scrnIndex,pBus);
 
     if (EDID_block){
-- 
1.5.3.4



--- NEW FILE make-git-snapshot.sh ---
#!/bin/sh

DIRNAME=xorg-server-$( date +%Y%m%d )

rm -rf $DIRNAME
git clone -n git://git.freedesktop.org/git/xorg/xserver $DIRNAME
cd $DIRNAME
if [ -z "$1" ]; then
    git log | head -1
else
    git checkout $1
fi
git log | head -1 | awk '{ print $2 }' > ../commitid
git repack -a -d
cd ..
tar jcf $DIRNAME.tar.bz2 $DIRNAME
rm -rf $DIRNAME

no-sleep-at-exit.patch:

--- NEW FILE no-sleep-at-exit.patch ---
>From a45daf5bf587c584b0b6f1e1a7e1f0d5c983cf4f Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Thu, 8 Nov 2007 17:25:36 -0500
Subject: [PATCH] Don't sleep(1) at server exit.

---
 hw/xfree86/common/xf86Init.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 2f6e4dd..63df108 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1307,7 +1307,7 @@ AbortDDX()
   /*
    * try to restore the original video state
    */
-#ifdef HAS_USL_VTS
+#if defined(HAS_USL_VTS) && !defined(linux)
   /* Need the sleep when starting X from within another X session */
   sleep(1);
 #endif
-- 
1.5.3.4


pogo-stick.patch:

--- NEW FILE pogo-stick.patch ---
>From 5c62bc4a182f0e7810f442e418bb84cd964a7e22 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Fri, 9 Nov 2007 13:55:32 -0500
Subject: [PATCH] Add -pogo option for init/teardown performance testing.

---
 os/utils.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/os/utils.c b/os/utils.c
index 6fc1f7d..69803ae 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -941,6 +941,10 @@ ProcessCommandLine(int argc, char *argv[])
 	    else
 		UseMsg();
 	}
+	else if (strcmp(argv[i], "-pogo") == 0)
+	{
+	    dispatchException = DE_TERMINATE;
+	}
 	else if ( strcmp( argv[i], "-pn") == 0)
 	    PartialNetwork = TRUE;
 	else if ( strcmp( argv[i], "-nopn") == 0)
-- 
1.5.3.4