From cdd7413bbe1d8b9b64f5315ecd5ba5cdcba38a2c Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Sun, 2 Sep 2012 14:55:25 +0100 Subject: [PATCH 1/4] Correct description of -displayfd option in man page. A display number, not a port number, is written to the specified fd. Signed-off-by: Jon TURNEY Reviewed-by: Alan Coopersmith (cherry picked from commit 7ceb85481280fecbf033f147f0f7834cad3890c6) --- man/Xserver.man | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/Xserver.man b/man/Xserver.man index 8d243d6b7..b103551fa 100644 --- a/man/Xserver.man +++ b/man/Xserver.man @@ -130,7 +130,7 @@ causes the server to generate a core dump on fatal errors. .B \-displayfd \fIfd\fP specifies a file descriptor in the launching process. Rather than specify a display number, the X server will attempt to listen on successively higher -display numbers, and upon finding a free one, will write the port number back +display numbers, and upon finding a free one, will write the display number back on this file descriptor as a newline-terminated string. The \-pn option is ignored when using \-displayfd. .TP 8 From d46af347327bd60a4b2a8066b8b7af11f530590d Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Sun, 2 Sep 2012 15:17:05 +0100 Subject: [PATCH 2/4] hw/xwin: Only add GLX extension once. Using of LoadExtension() to add GLX onto to the end of the list of extensions on every server regeneration leads to hilarious consequences (i.e. crashing) after the first regeneration :-) Possibly xf86ExtensionInit() and QuartzExtensionInit() need a similar fix. Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison Tested-by: Colin Harrison (cherry picked from commit 25741b1aa3a0fb39cb842a43ab52935673cfdefa) --- hw/xwin/InitOutput.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 37cd8b357..1cf0f02eb 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -164,7 +164,7 @@ void XwinExtensionInit(void) int i; #ifdef XWIN_GLX_WINDOWS - if ((g_fNativeGl) && (serverGeneration == 1)) { + if (g_fNativeGl) { /* install the native GL provider */ glxWinPushNativeProvider(); } @@ -901,7 +901,8 @@ InitOutput(ScreenInfo * screenInfo, int argc, char *argv[]) { int i; - XwinExtensionInit(); + if (serverGeneration == 1) + XwinExtensionInit(); /* Log the command line */ winLogCommandLine(argc, argv); From 018248136aae19887f10860f33f085f6211a4ceb Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Thu, 6 Sep 2012 13:51:38 +0100 Subject: [PATCH 3/4] Fix compilation of Xorg DDX without XF86VIDMODE Fix compilation of Xorg DDX without XF86VIDMODE since 6e74fdda, by putting xf86vmode.c back under the XF86VIDMODE automake conditional it was accidentally taken out of. Signed-off-by: Jon TURNEY Tested-by: Yaakov Selkowitz Reviewed-by: Daniel Stone (cherry picked from commit 1d9fd7ffb03ff6e44f3a8736a94e4558203ce607) --- hw/xfree86/common/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am index f8fcde956..532d87bbe 100644 --- a/hw/xfree86/common/Makefile.am +++ b/hw/xfree86/common/Makefile.am @@ -15,6 +15,7 @@ XVSDKINCS = xf86xv.h xf86xvmc.h xf86xvpriv.h endif if XF86VIDMODE +XF86VMODESOURCES = xf86vmode.c XF86VMODE_SDK = vidmodeproc.h endif @@ -47,7 +48,7 @@ libcommon_la_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \ xf86VidMode.c xf86fbman.c xf86cmap.c \ xf86Helper.c xf86PM.c xf86Xinput.c xisb.c \ xf86Mode.c xorgHelper.c xf86Extensions.h \ - xf86Extensions.c xf86vmode.c \ + xf86Extensions.c $(XF86VMODESOURCES) \ $(XVSOURCES) $(BUSSOURCES) $(RANDRSOURCES) nodist_libcommon_la_SOURCES = xf86DefModeSet.c xf86Build.h libcommon_la_LIBADD = $(top_builddir)/config/libconfig.la From 0456d56092e7617131c77b50a7e7f501e6d9d275 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Fri, 7 Sep 2012 14:58:06 +0100 Subject: [PATCH 4/4] Fix 'make distcheck' for hw/xwin Add some missing header files to _SOURCES so they get distributed properly Signed-off-by: Jon TURNEY Reviewed-by: Yaakov Selkowitz (cherry picked from commit a69429a17bf4630f6e26f61630a1c2b287202627) --- hw/xwin/Makefile.am | 3 +++ hw/xwin/glx/Makefile.am | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am index 4c2f04ef0..33729a906 100644 --- a/hw/xwin/Makefile.am +++ b/hw/xwin/Makefile.am @@ -109,13 +109,16 @@ SRCS = InitInput.c \ winclipboard.h \ winconfig.h \ win.h \ + winglobals.h \ winkeybd.h \ winkeynames.h \ winlayouts.h \ winmessages.h \ + winmonitors.h \ winmsg.h \ winms.h \ winmultiwindowclass.h \ + winmultiwindowicons.h \ winprefs.h \ winresource.h \ winwindow.h \ diff --git a/hw/xwin/glx/Makefile.am b/hw/xwin/glx/Makefile.am index 7222a9f21..59f6879a7 100644 --- a/hw/xwin/glx/Makefile.am +++ b/hw/xwin/glx/Makefile.am @@ -6,7 +6,8 @@ libXwinGLX_la_SOURCES = \ glwindows.h \ glwrap.c \ indirect.c \ - wgl_ext_api.c + wgl_ext_api.c \ + wgl_ext_api.h if XWIN_MULTIWINDOW DEFS_MULTIWINDOW = -DXWIN_MULTIWINDOW