diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-15 16:56:14 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-15 16:56:14 +0200 |
| commit | f15a40afaf6d1b3a4841d25631f947da1b289f89 (patch) | |
| tree | f2066dc8caaf2fddd3b88251d18839d5878bfd9b /xorg-server | |
| parent | f2a3390c8b2052e8f65d3502dd703b5c5b23a28e (diff) | |
| parent | 54db46582aba2252d544fa3956522f9ef06b49cb (diff) | |
| download | vcxsrv-f15a40afaf6d1b3a4841d25631f947da1b289f89.tar.gz vcxsrv-f15a40afaf6d1b3a4841d25631f947da1b289f89.tar.bz2 vcxsrv-f15a40afaf6d1b3a4841d25631f947da1b289f89.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa pixman git update 15 oct 2012
Conflicts:
xorg-server/hw/xwin/InitOutput.c
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/hw/xfree86/common/Makefile.am | 3 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/Makefile.am | 3 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/glx/Makefile.am | 3 | ||||
| -rw-r--r-- | xorg-server/man/Xserver.man | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/xorg-server/hw/xfree86/common/Makefile.am b/xorg-server/hw/xfree86/common/Makefile.am index f8fcde956..532d87bbe 100644 --- a/xorg-server/hw/xfree86/common/Makefile.am +++ b/xorg-server/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 diff --git a/xorg-server/hw/xwin/Makefile.am b/xorg-server/hw/xwin/Makefile.am index 50f99b68c..003a9a272 100644 --- a/xorg-server/hw/xwin/Makefile.am +++ b/xorg-server/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/xorg-server/hw/xwin/glx/Makefile.am b/xorg-server/hw/xwin/glx/Makefile.am index 7222a9f21..59f6879a7 100644 --- a/xorg-server/hw/xwin/glx/Makefile.am +++ b/xorg-server/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 diff --git a/xorg-server/man/Xserver.man b/xorg-server/man/Xserver.man index 8d243d6b7..b103551fa 100644 --- a/xorg-server/man/Xserver.man +++ b/xorg-server/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 |