xserver: Branch 'master' - 2 commits
Drew Parsons
dparsons at kemper.freedesktop.org
Fri May 9 07:06:28 PDT 2008
configure.ac | 2 +-
hw/xprint/ddxInit.c | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 7b3066d9b9099135d9c49e0682161d5568fc535b
Merge: 2a3d142... 315f089...
Author: Drew Parsons <drew at emerall.com>
Date: Sat May 10 00:01:15 2008 +1000
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver into upstream-experimental
commit 2a3d1421e0cc18822ae8f478fcc272e16a9e9340
Author: Drew Parsons <dparsons at debian.org>
Date: Fri May 9 23:20:11 2008 +1000
Disable D-BUS from Xprint.
Use dummy config functions to replace those from config/config.c, and
therefore do not link Xprt with $CONFIG_LIB.
Works around an endlessly spinning loop in dix/dispatch.c::Dispatch()
(WaitForSomething() not waiting) when built with dbus, which was
causing Xprt to use 95% cpu.
diff --git a/configure.ac b/configure.ac
index f695551..64fd946 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1610,7 +1610,7 @@ AC_MSG_RESULT([$XPRINT])
if test "x$XPRINT" = xyes; then
PKG_CHECK_MODULES([XPRINTMODULES], [printproto x11 xfont $XDMCP_MODULES xau])
XPRINT_CFLAGS="$XPRINTMODULES_CFLAGS -DXPRINT"
- XPRINT_LIBS="$XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS $MIEXT_DAMAGE_LIB $XKB_LIB $XKB_STUB_LIB"
+ XPRINT_LIBS="$XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS $MIEXT_DAMAGE_LIB $XKB_LIB $XKB_STUB_LIB"
XPRINT_SYS_LIBS="$XPRINTMODULES_LIBS"
xpconfigdir=$libdir/X11/xserver
diff --git a/hw/xprint/ddxInit.c b/hw/xprint/ddxInit.c
index d744121..7950521 100644
--- a/hw/xprint/ddxInit.c
+++ b/hw/xprint/ddxInit.c
@@ -291,6 +291,12 @@ ddxProcessArgument (
#include "XIstubs.h"
#include "exglobals.h"
+/* Place dummy config functions here instead of config/config.c,
+ since Xprint does not use D-BUS */
+void config_init() { }
+void config_fini() { }
+
+
int
ChangePointerDevice (
DeviceIntPtr old_dev,
More information about the xorg-commit
mailing list