[Xquartz-changes] xserver: Branch 'server-1.14-branch' - 3 commits

[Jeremy Huddleston]

 configure.ac               |    6 +++---
 glx/glxdricommon.c         |    2 +-
 hw/xquartz/X11Controller.m |    5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit f665960c7aa6e4ebd7e927c1697339edc0ee88ef
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Sun Apr 6 05:32:00 2014 -0700

    XQuartz: Ensure we wait for the server thread to terminate
    
    AKA: XQuartz 2.7.5 doesn't delete its /tmp/.X$d-lock
    
    http://xquartz.macosforge.org/trac/ticket/823
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 5445c6f..022e832 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -942,9 +942,8 @@ extern char *bundle_id_prefix;
     /* shutdown the X server, it will exit () for us. */
     DarwinSendDDXEvent(kXquartzQuit, 0);
 
-    /* In case it doesn't, exit anyway after a while. */
-    remain = 10000000;
-    while ((remain = usleep(remain)) > 0) ;
+    /* In case it doesn't, exit anyway after 5s. */
+    [NSThread sleepForTimeInterval:5.0];
 
     exit(1);
 }
commit 46bcfa0a33123ba8d8dc0ee183cfd8d7fa3e063b
Author: Matt Dew <marcoz at osource.org>
Date:   Sun Apr 13 20:16:29 2014 -0600

    Bump version to 1.14.6

diff --git a/configure.ac b/configure.ac
index 3860f9d..9f4e60a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.14.5.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2014-03-21"
-RELEASE_NAME="Purple Haze-rc1"
+AC_INIT([xorg-server], 1.14.6, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2014-04-13"
+RELEASE_NAME="Purple Haze"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
commit b83f2f74fc6a584fd8823e192d21097dab7796b9
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Mar 6 18:50:07 2014 -0800

    glx: Clear new FBConfig attributes to 0 by default.
    
    The visualSelectGroup wasn't getting set (since our DRI drivers don't
    use it), and and since it's the top priority in the sort order, you
    got random sorting of your visuals unless malloc really returned you
    new memory.  This manifested as Xephyr -glamor rendering to a
    multisampled window on my system, which as you might guess was
    slightly lower performance than expected.
    
    Signed-off-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c
index 5686c5f..b1c3ca2 100644
--- a/glx/glxdricommon.c
+++ b/glx/glxdricommon.c
@@ -128,7 +128,7 @@ createModeFromConfig(const __DRIcoreExtension * core,
     unsigned int attrib, value;
     int i;
 
-    config = malloc(sizeof *config);
+    config = calloc(1, sizeof *config);
 
     config->driConfig = driConfig;