fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-01 20:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'server-1.13-branch' of git://people.freedesktop.org/~jturney/xserver into server-1.13-branch

Browse source
This commit is contained in:
Matt Dew 2012-10-30 22:12:56 -06:00
commit 5a612aa44d
5 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
hw/xfree86/common/Makefile.am
View file

@ -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

5
hw/xwin/InitOutput.c
View file

@ -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);

3
hw/xwin/Makefile.am
View file

@ -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 \

3
hw/xwin/glx/Makefile.am
View file

@ -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

2
man/Xserver.man
View file

@ -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