xserver: Branch 'server-1.8-branch' - 4 commits
Peter Hutterer
whot at kemper.freedesktop.org
Thu Apr 8 20:57:33 PDT 2010
configure.ac | 37 +++++++++++++++++++++++--------------
1 file changed, 23 insertions(+), 14 deletions(-)
New commits:
commit 11afa5e56e9561d214b0a4c13ed60bc2d106fbbb
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date: Wed Feb 24 15:17:42 2010 -0600
Cygwin/X: Add configure option for WindowsWM
WindowsWM support is still experimental, and uses the Rootless extension
which currently breaks the simultaneous build of the other DDXs (see
commit b3415187e92960cbff784108b5a3a8d130dc34c5). So we disable it by
default for now; once the latter issue is fixed we can make this 'auto'.
Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
(cherry picked from commit c983f40fe4f30311f31a9df699cdc888709251d0)
diff --git a/configure.ac b/configure.ac
index f4a7b34..4c1034f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -644,6 +644,7 @@ AC_ARG_ENABLE(xaa, AS_HELP_STRING([--enable-xaa], [Build XAA (defa
AC_ARG_ENABLE(vgahw, AS_HELP_STRING([--enable-vgahw], [Build Xorg with vga access (default: enabled)]), [VGAHW=$enableval], [VGAHW=yes])
AC_ARG_ENABLE(vbe, AS_HELP_STRING([--enable-vbe], [Build Xorg with VBE module (default: enabled)]), [VBE=$enableval], [VBE=yes])
AC_ARG_ENABLE(int10-module, AS_HELP_STRING([--enable-int10-module], [Build Xorg with int10 module (default: enabled)]), [INT10MODULE=$enableval], [INT10MODULE=yes])
+AC_ARG_ENABLE(windowswm, AS_HELP_STRING([--enable-windowswm], [Build XWin with WindowsWM extension (default: no)]), [WINDOWSWM=$enableval], [WINDOWSWM=no])
dnl DDXes.
AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
@@ -1845,26 +1846,30 @@ fi
AC_MSG_RESULT([$XWIN])
if test "x$XWIN" = xyes; then
- PKG_CHECK_EXISTS($WINDOWSWMPROTO, [WINDOWSWM=yes], [WINDOWSWM=no])
AC_DEFINE_DIR(SYSCONFDIR, sysconfdir, [Location of system.XWinrc])
AC_DEFINE_DIR(DEFAULT_LOGDIR, logdir, [Default log location])
AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])
AC_CHECK_TOOL(WINDRES, windres)
+
+ PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau xfont])
+
+ if test "x$WINDOWSWM" = xauto; then
+ PKG_CHECK_EXISTS($WINDOWSWMPROTO, [WINDOWSWM=yes], [WINDOWSWM=no])
+ fi
+ if test "x$WINDOWSWM" = xyes ; then
+ PKG_CHECK_MODULES(WINDOWSWM, $WINDOWSWMPROTO)
+ XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS $WINDOWSWM_CFLAGS"
+ AC_DEFINE(ROOTLESS,1,[Build Rootless code])
+ fi
+
case $host_os in
cygwin*)
XWIN_SERVER_NAME=XWin
- PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau xfont])
AC_DEFINE(HAS_DEVWINDOWS,1,[Cygwin has /dev/windows for signaling new win32 messages])
-
- dnl if we have windowswmproto, build rootless extension for multwindowextwm mode
- if test "x$WINDOWSWM" = xyes ; then
- AC_DEFINE(ROOTLESS,1,[Build Rootless code])
- fi
;;
mingw*)
XWIN_SERVER_NAME=Xming
- PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau xfont])
AC_DEFINE(RELOCATE_PROJECTROOT,1,[Make PROJECT_ROOT relative to the xserver location])
AC_DEFINE(HAS_WINSOCK,1,[Use Windows sockets])
XWIN_SYS_LIBS=-lwinsock2
commit 76e548d09195de750a532ee568171b931c1216fe
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Thu Feb 18 14:19:21 2010 -0600
Don't enable ROOTLESS_WORKAROUND, it breaks composite
This possibly brings back whatever the bug is in
http://bugs.freedesktop.org/show_bug.cgi?id=1168 for
-rootless mode, but since we don't have reproduction
steps for that, I can't test that...
Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Tested-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
(cherry picked from commit 20701522be803fe47e921fcf059dadf64c7f287d)
diff --git a/configure.ac b/configure.ac
index 3176790..f4a7b34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1860,7 +1860,6 @@ if test "x$XWIN" = xyes; then
dnl if we have windowswmproto, build rootless extension for multwindowextwm mode
if test "x$WINDOWSWM" = xyes ; then
AC_DEFINE(ROOTLESS,1,[Build Rootless code])
- CFLAGS="$CFLAGS -DROOTLESS_WORKAROUND"
fi
;;
mingw*)
commit 4f2489bdf36ac4d6a340e2a327798a1da394573a
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date: Wed Mar 24 00:08:23 2010 -0500
Cygwin/X: Disable unsupported extensions in configure
Several extensions are not supported by XWin, some of which are enabled
by default in configure. We forcefully disable these early on so that
configure will succeed without arguments and without the corresponding
proto installed.
Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
(cherry picked from commit 95c9947f6244d37592958b70760bd1ac885b625a)
diff --git a/configure.ac b/configure.ac
index 1e65c51..3176790 100644
--- a/configure.ac
+++ b/configure.ac
@@ -724,8 +724,16 @@ XORG_CHECK_LINUXDOC
dnl Handle installing libxf86config
AM_CONDITIONAL(INSTALL_LIBXF86CONFIG, [test "x$INSTALL_LIBXF86CONFIG" = xyes])
-dnl XQuartz DDX Detection... Yes, it's ugly to have it here... but we need to handle this early on
+dnl DDX Detection... Yes, it's ugly to have it here... but we need to
+dnl handle this early on so that we don't require unsupported extensions
case $host_os in
+ cygwin*)
+ DGA=no
+ DRI2=no
+ XF86VIDMODE=no
+ XSELINUX=no
+ XV=no
+ ;;
darwin*)
DRI2=no
@@ -1877,10 +1885,6 @@ if test "x$XWIN" = xyes; then
AC_DEFINE(DDXOSVERRORF, 1, [Use OsVendorVErrorF])
AC_DEFINE(DDXBEFORERESET, 1, [Use ddxBeforeReset ])
- if test "x$XF86VIDMODE" = xyes; then
- AC_MSG_NOTICE([Disabling XF86VidMode extension])
- XF86VIDMODE=no
- fi
fi
AM_CONDITIONAL(XWIN, [test "x$XWIN" = xyes])
AM_CONDITIONAL(XWIN_MULTIWINDOW, [test "x$XWIN" = xyes])
commit f121ce4d22ff23f16cc374c9a125d3815765bb0c
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date: Mon Mar 22 12:47:52 2010 -0500
Disable setuid configure test on Cygwin
Only Xorg is installed setuid, so there is no need to run this configure
test on Cygwin.
Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
(cherry picked from commit 24c9d48cd6999f1e90f9f0e2bbfebd8e95d314d8)
diff --git a/configure.ac b/configure.ac
index 48cb724..1e65c51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -673,6 +673,7 @@ AC_ARG_ENABLE(install-setuid,
AC_MSG_CHECKING([to see if we can install the Xorg server as root])
if test "x$SETUID" = "xauto" ; then
case $host_os in
+ cygwin*) SETUID="no" ;;
darwin*) SETUID="no" ;;
*)
case $host_cpu in
More information about the xorg-commit
mailing list