[Xquartz-changes] xserver: Branch 'master' - 5 commits

[Jeremy Huddleston]

Rebased ref, commits from common ancestor:
commit cafc5bb1c055dbb032bed4ea07a383c883b95d06
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Tue Jan 10 00:53:10 2012 -0800

    XQuartz: Check client->local rather than LocalClient(client)
    
    Regression From: 49d38b75c8f3276cfce33ffe6b8c4fbeb1081b96
    
    CC: Daniel Stone <daniel at fooishbar.org>
    CC: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/hw/xquartz/xpr/appledri.c b/hw/xquartz/xpr/appledri.c
index 091145b..64dea1b 100644
--- a/hw/xquartz/xpr/appledri.c
+++ b/hw/xquartz/xpr/appledri.c
@@ -495,7 +495,7 @@ SProcAppleDRIDispatch (
         return SProcAppleDRIQueryDirectRenderingCapable(client);
     }
 
-    if (!LocalClient(client))
+    if (!client->local)
         return DRIErrorBase + AppleDRIClientNotLocal;
 
     switch (stuff->data)
commit 0cdce8e4fea55b888b97d2196c475f50022d5114
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Tue Jan 10 00:50:50 2012 -0800

    os: Build Fix for io.c's redefinition of
    
    Regression from: 48e7a2ef574c8b38c4f8f07b45f54c8bfd02552b
    
    Found-by: Tinderbox
    
    CC: Daniel Stone <daniel at fooishbar.org>
    CC: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/os/io.c b/os/io.c
index 78b7260..fa49d66 100644
--- a/os/io.c
+++ b/os/io.c
@@ -92,14 +92,14 @@ typedef struct _connectionInput {
     int lenLastReq;
     int size;
     unsigned int ignoreBytes;   /* bytes to ignore before the next request */
-} ConnectionInput, *ConnectionInputPtr;
+} ConnectionInput;
 
 typedef struct _connectionOutput {
     struct _connectionOutput *next;
     unsigned char *buf;
     int size;
     int count;
-} ConnectionOutput, *ConnectionOutputPtr;
+} ConnectionOutput;
 
 static ConnectionInputPtr AllocateInputBuffer(void);
 static ConnectionOutputPtr AllocateOutputBuffer(void);
commit 5f3105897aab66299411c5f66f5cb7e4d67ac588
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Mon Jan 9 00:14:29 2012 -0800

    xfree86: Don't link libxorgxkb against libdix.la
    
    libdix.a is already provided by XSERVER_LIBS.  Including it in libxorgxkb
    results in duplicate symbols landing in the Xorg binary.
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index b6eb54f..a5be3ae 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -65,4 +65,3 @@ libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
 libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS)
 
 libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
-libxorgxkb_la_LIBADD = $(top_builddir)/dix/libdix.la
commit aa8319a1b2dfc7ad4e5cab2e7e5655e9d7d63111
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Mon Jan 9 00:40:10 2012 -0800

    configure.ac: Remove MIEXT_SHADOW_LIB from XORG_LIBS
    
    This is provided by dixmods/libshadow.so and is not part of the main binary.
    
    This addresses a build failure on darwin due to MIEXT_SHADOW_LIB having
    unsatisfied dependencies (FB_LIB) in XORG_LIBS.
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/configure.ac b/configure.ac
index c9acb2b..1c374c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1535,7 +1535,7 @@ if test "x$XORG" = xyes; then
 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
 	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
 	XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
-	XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB"
+	XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $XI_LIB $XKB_LIB"
 
 	dnl ==================================================================
 	dnl symbol visibility
commit db9b4bef6d1ab282c95d2315dd6c31d05758ad6c
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Mon Jan 9 00:28:02 2012 -0800

    configure.ac: Use -Wl,-all_load when building Xorg on darwin
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/configure.ac b/configure.ac
index a203ab2..c9acb2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1461,6 +1461,9 @@ AC_SUBST([UTILS_SYS_LIBS])
 # Some platforms require extra flags to do this.   libtool should set the
 # necessary flags for each platform when -export-dynamic is passed to it.
 LD_EXPORT_SYMBOLS_FLAG="-export-dynamic"
+case $host_os in
+  darwin*)  LD_EXPORT_SYMBOLS_FLAG="$LD_EXPORT_SYMBOLS_FLAG -Wl,-all_load" ;;
+esac
 AC_SUBST([LD_EXPORT_SYMBOLS_FLAG])
 
 dnl Imake defines SVR4 on SVR4 systems, and many files check for it, so
@@ -1687,6 +1690,12 @@ if test "x$XORG" = xyes; then
 	  gnu*)
 		XORG_OS_SUBDIR="hurd"
 		;;
+	  darwin*)
+		XORG_OS_SUBDIR="stub"
+		AC_MSG_NOTICE([m4_text_wrap(m4_join([ ],
+		[Support for the Xorg DDX on Mac OS X is in the early stages.],
+		[If you intended to build XQuartz, please reconfigure with the appropriate options.]))])
+		;;
 	  *)
 		XORG_OS_SUBDIR="stub"
 		AC_MSG_NOTICE([m4_text_wrap(m4_join([ ],