From 495c109534b32be107c55864c0818df9387284cf Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Mon, 9 May 2011 15:13:14 +0800 Subject: xserver-xf86-dri-lite_git: upgrade to 1.10.2 RC1 snapshot - the following patches are no longer used, so remove them doublefix.patch drmfix.patch fix_macros.patch libdri-xinerama-symbol.patch xorg-server-disable-dri_sarea.patch xorg-server-enable-dri2.patch xserver-1.5.0-bg-none-root.patch xserver-DRI2Swapbuffer.patch xserver-boottime.patch xserver-no-root-2.patch - update the patch upstream status (From OE-Core rev: 642f7199c2a5221a45be25b4aa008fde25a5c07a) Signed-off-by: Yu Ke Signed-off-by: Richard Purdie --- .../xserver-xf86-dri-lite/xserver-boottime.patch | 38 ---------------------- 1 file changed, 38 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-boottime.patch (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-boottime.patch') diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-boottime.patch b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-boottime.patch deleted file mode 100644 index efc85a42ab..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/xserver-boottime.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/os/log.c b/os/log.c -index 0860847..2c46f1a 100644 ---- a/os/log.c -+++ b/os/log.c -@@ -255,6 +255,33 @@ LogVWrite(int verb, const char *f, va_list args) - static char tmpBuffer[1024]; - int len = 0; - -+ struct timeval time; -+ time_t tv_sec; -+ suseconds_t tv_usec; -+ static Bool first = 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; -+ } -+ sprintf(tmpBuffer, "[%d sec: %06d usec]", diff_sec , diff_usec); -+ 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 -- cgit v1.2.3-54-g00ecf