From 2e28281fbc28bbbca387465807a77904ae76c641 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 11 Feb 2010 07:16:57 +0100 Subject: [PATCH] xorg-server: - update to xorg-server-20100209 --- ...xkbcomp-output-for-fast-start-up-v5.3.diff | 0 packages/x11/xserver/xorg-server/build | 1 - .../xorg-server/patches/xserver-boottime.diff | 48 ------------------- packages/x11/xserver/xorg-server/url | 2 +- 4 files changed, 1 insertion(+), 50 deletions(-) rename packages/x11/xserver/xorg-server/{patches => }/01_cache-xkbcomp-output-for-fast-start-up-v5.3.diff (100%) delete mode 100644 packages/x11/xserver/xorg-server/patches/xserver-boottime.diff diff --git a/packages/x11/xserver/xorg-server/patches/01_cache-xkbcomp-output-for-fast-start-up-v5.3.diff b/packages/x11/xserver/xorg-server/01_cache-xkbcomp-output-for-fast-start-up-v5.3.diff similarity index 100% rename from packages/x11/xserver/xorg-server/patches/01_cache-xkbcomp-output-for-fast-start-up-v5.3.diff rename to packages/x11/xserver/xorg-server/01_cache-xkbcomp-output-for-fast-start-up-v5.3.diff diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build index 22c96f5b6f..6580d23474 100755 --- a/packages/x11/xserver/xorg-server/build +++ b/packages/x11/xserver/xorg-server/build @@ -51,7 +51,6 @@ cd $PKG_BUILD --enable-glx-tls \ --enable-registry \ --enable-composite \ - --enable-null-root-cursor \ --enable-mitshm \ --disable-xres \ --disable-record \ diff --git a/packages/x11/xserver/xorg-server/patches/xserver-boottime.diff b/packages/x11/xserver/xorg-server/patches/xserver-boottime.diff deleted file mode 100644 index 4029260d14..0000000000 --- a/packages/x11/xserver/xorg-server/patches/xserver-boottime.diff +++ /dev/null @@ -1,48 +0,0 @@ -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) { diff --git a/packages/x11/xserver/xorg-server/url b/packages/x11/xserver/xorg-server/url index 0dd081733e..61cd44c6eb 100644 --- a/packages/x11/xserver/xorg-server/url +++ b/packages/x11/xserver/xorg-server/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xorg-server-20100108.tar.bz2 +http://sources.openelec.tv/svn/xorg-server-20100209.tar.bz2