xserver: Branch 'master' - 2 commits

[Keith Packard]

 hw/xfree86/Makefile.am |    7 ++++++-
 os/utils.c             |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 5f1e832694e57986c0185048a941b3af51b2f85f
Author: Julien Cristau <jcristau at debian.org>
Date:   Tue Nov 5 07:08:21 2013 -0800

    os: Actually use the computed clockid in GetTimeInMicros
    
    The selection of which clock to use for this function was not actually
    getting used when fetching the final clock value.
    
    Reported-by: Julien Cristau <jcristau at debian.org>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/os/utils.c b/os/utils.c
index 995f62a..fb20da7 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -480,7 +480,7 @@ GetTimeInMicros(void)
         else
             clockid = ~0L;
     }
-    if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
+    if (clockid != ~0L && clock_gettime(clockid, &tp) == 0)
         return (CARD64) tp.tv_sec * (CARD64)1000000 + tp.tv_nsec / 1000;
 #endif
 
commit 903a058370645ea075ea98d380fd565efb6160c9
Author: Keith Packard <keithp at keithp.com>
Date:   Mon Nov 4 19:01:26 2013 -0800

    hw/xfree86: Link libdri3 only when DRI3 is defined
    
    Don't attempt to link non-existant libraries...
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index eea16a8..485386f 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -9,6 +9,11 @@ DRI2_SUBDIR = dri2
 DRI2_LIB = dri2/libdri2.la
 endif
 
+if DRI3
+DRI3_BUILDDIR = $(top_builddir)/dri3
+DRI3_LIB = $(DRI3_BUILDDIR)/libdri3.la
+endif
+
 if XF86UTILS
 XF86UTILS_SUBDIR = utils
 endif
@@ -59,7 +64,7 @@ LOCAL_LIBS = \
             dixmods/libxorgxkb.la \
             $(DRI_LIB) \
             $(DRI2_LIB) \
-	    $(top_builddir)/dri3/libdri3.la \
+	    $(DRI3_LIB) \
 	    $(top_builddir)/miext/sync/libsync.la \
             $(top_builddir)/mi/libmi.la \
             $(top_builddir)/os/libos.la