From 0cec674f6f7ae1a648c5c718db5c19faaeeb3dd3 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Fri, 12 Feb 2010 06:22:58 +0100
Subject: [PATCH] xorg-server: - readd boottime patch

---
 .../xorg-server/patches/xserver-boottime.diff | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 packages/x11/xserver/xorg-server/patches/xserver-boottime.diff

diff --git a/packages/x11/xserver/xorg-server/patches/xserver-boottime.diff b/packages/x11/xserver/xorg-server/patches/xserver-boottime.diff
new file mode 100644
index 0000000000..4029260d14
--- /dev/null
+++ b/packages/x11/xserver/xorg-server/patches/xserver-boottime.diff
@@ -0,0 +1,48 @@
+diff -Nurb xorg-server-1.7.3.orig/os/log.c xorg-server-1.7.3/os/log.c
+--- xorg-server-1.7.3.orig/os/log.c	2009-10-27 23:56:24.000000000 -0700
++++ xorg-server-1.7.3/os/log.c	2010-01-26 11:26:25.683679988 -0800
+@@ -259,6 +259,36 @@
+     static char tmpBuffer[1024];
+     int len = 0;
+ 
++    struct timeval time;
++    time_t tv_sec;
++    suseconds_t tv_usec;
++    static Bool first = TRUE;
++    static Bool newline = TRUE;
++    static time_t start_tv_sec;
++    static suseconds_t start_usec;
++    int diff_sec, diff_usec;
++
++    gettimeofday(&time, NULL);
++    tv_sec = time.tv_sec;
++    tv_usec = time.tv_usec;
++    if (first == TRUE) {
++	start_tv_sec = tv_sec;
++	start_usec = tv_usec;
++	first = FALSE;
++    }
++    diff_sec = (int)difftime(tv_sec, start_tv_sec);
++    diff_usec = (tv_usec - start_usec);
++    if (diff_usec < 0) {
++	diff_sec--;
++	diff_usec += 1000000;
++    }
++    if (newline) {
++	sprintf(tmpBuffer, "[%d.%03d] ", diff_sec , diff_usec / 1000);
++	len = strlen(tmpBuffer);
++	if (logFile)
++	    fwrite(tmpBuffer, len, 1, logFile);
++    }
++
+     /*
+      * Since a va_list can only be processed once, write the string to a
+      * buffer, and then write the buffer out to the appropriate output
+@@ -268,6 +298,7 @@
+ 	vsnprintf(tmpBuffer, sizeof(tmpBuffer), f, args);
+ 	len = strlen(tmpBuffer);
+     }
++    newline = (tmpBuffer[len-1] == '\n');
+     if ((verb < 0 || logVerbosity >= verb) && len > 0)
+ 	fwrite(tmpBuffer, len, 1, stderr);
+     if ((verb < 0 || logFileVerbosity >= verb) && len > 0) {