Index: xc/ChangeLog =================================================================== RCS file: /cvs/xorg/xc/ChangeLog,v retrieving revision 1.795 diff -u -2 -0 -r1.795 ChangeLog --- xc/ChangeLog 5 Mar 2005 20:47:12 -0000 1.795 +++ xc/ChangeLog 5 Mar 2005 21:32:38 -0000 @@ -1,21 +1,30 @@ 2005-03-05 Roland Mainz + * xc/programs/Xserver/Imakefile + * xc/programs/Xserver/hw/xnest/Imakefile + * xc/programs/Xserver/hw/xnest/Init.c + Bugzilla #2653 (https://bugs.freedesktop.org/show_bug.cgi?id=2653) + attachment #xxx (https://bugs.freedesktop.org/attachment.cgi?id=xxx): + Cleanup Xnest usage of the DPMS dummy stub functions from dpmsstubs.c + instead of using it's own copy of these functions. + +2005-03-05 Roland Mainz * xc/programs/Xserver/hw/xfree86/common/xf86Events.c Bugzilla #2543 (https://bugs.freedesktop.org/show_bug.cgi?id=2543) attachment #2019 (https://bugs.freedesktop.org/attachment.cgi?id=2019): Fix |xf86SignalHandler()| which resets the signal handler before setting the flag indicating a signal has been caught, theoretically allowing the possibility of infinite recursion. Patch by Andrew Church . 2005-03-04 Vladimir Dergachev Modified: * programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c Let through all chips R300 and above - presumably the filtering should take place at the DRM driver level. Correct cut'n'paste position misprint. Big thanks for Michel Danzer for pointing out both improvements. 2005-03-04 Vladimir Dergachev Modified: Index: xc/programs/Xserver/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/Imakefile,v retrieving revision 1.28 diff -u -2 -0 -r1.28 Imakefile --- xc/programs/Xserver/Imakefile 2 Feb 2005 14:26:24 -0000 1.28 +++ xc/programs/Xserver/Imakefile 5 Mar 2005 21:32:54 -0000 @@ -857,47 +857,50 @@ #if HasParallelMake MakeMutex($(XPSUBDIRS) $(XPOBJS) $(XPLIBS) $(XPSYSLIBS)) #endif #if ForceServerRemake $(XPOBJS) $(XPLIBS) $(XPSYSLIBS):: $(XPSUBDIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif ServerTarget(Xprt,$(XPSUBDIRS),$(XPOBJS), \ $(LIBCWRAPPER) $(XPLIBS) $(LOADABLEEXTS),$(XPSYSLIBS)) #endif /* XprtServer */ #if defined(XnestServer) && XnestServer XCOMM XCOMM Server with Xlib-based ddx XCOMM #ifndef Win32Architecture XNESTDDXDIR = hw/xnest #else XNESTDDXDIR = hw #endif +#if BuildDPMS +XNESTDPMSSTUBOBJS = $(XNESTDDXDIR)/dpmsstubs.o +#endif XNESTDIRS = $(STDDIRS) $(XNESTDDXDIR) $(DEPDIRS) #if !defined(LynxOSArchitecture) && \ !defined(Win32Architecture) && \ !defined(QNX4Architecture) -XNESTOBJS = hw/xnest/miinitext.o +XNESTOBJS = hw/xnest/miinitext.o $(XNESTDPMSSTUBOBJS) #else -XNESTOBJS = hw/xnest/miinitext.o dix/main.o +XNESTOBJS = hw/xnest/miinitext.o dix/main.o $(XNESTDPMSSTUBOBJS) #endif XNEST = hw/xnest/LibraryTargetName(xnest) XNESTLIBS = PreFbLibs $(XNEST) NoMfbPostFbLibs $(XNEST) XNESTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) #if HasParallelMake MakeMutex($(XNESTDIRS) $(XNESTOBJS) $(XNESTLIBS) $(XNESTSYSLIBS)) #endif #if ForceServerRemake $(XNESTOBJS) $(XNESTLIBS) $(XNESTSYSLIBS):: $(XNESTDIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif ServerTarget(Xnest,$(XNESTDIRS),$(XNESTOBJS) $(XNESTDEFFILE), \ $(LIBCWRAPPER) $(XNESTLIBS) $(LOADABLEEXTS),$(XNESTSYSLIBS)) #endif /* XnestServer */ #if defined(XnonServer) && XnonServer XCOMM XCOMM non server, just compile sources for build test XCOMM Index: xc/programs/Xserver/hw/xnest/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xnest/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xnest/Imakefile 23 Apr 2004 19:54:21 -0000 1.2 +++ xc/programs/Xserver/hw/xnest/Imakefile 5 Mar 2005 21:32:59 -0000 @@ -1,29 +1,34 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ XCOMM $XFree86: xc/programs/Xserver/hw/xnest/Imakefile,v 3.28 2003/10/02 13:30:08 eich Exp $ #include +#if BuildDPMS +DPMSSRC = dpmsstubs.c +DPMSOBJS = dpmsstubs.o +#endif + #ifdef OS2Architecture SRCS1 = os2Stub.c OBJS1 = os2Stub.o #endif SRCS = Args.c \ Color.c \ Cursor.c \ Display.c \ Events.c \ Font.c \ GC.c \ GCOps.c \ GetTime.c \ Handlers.c \ Init.c \ Keyboard.c \ Pixmap.c \ Pointer.c \ Screen.c \ @@ -47,34 +52,39 @@ Keyboard.o \ Pixmap.o \ Pointer.o \ Screen.o \ TestExt.o \ Visual.o \ Window.o \ stubs.o \ miinitext.o $(OBJS1) INCLUDES = -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \ -I../../mi -I../../include -I../../os \ -I$(EXTINCSRC) -I$(XINCLUDESRC) -I$(LIBSRC) -I$(SERVERSRC)/Xext DEFINES = $(OS_DEFINES) $(EXT_DEFINES) -DNO_HW_ONLY_EXTS \ -UXFree86LOADER -UMITSHM $(XKBDEFRULESDEFS) XKB_DEFINES = -DXKB_BASE_DIRECTORY=\"$(LIBDIR)/xkb/\" -all:: $(OBJS) +all:: $(OBJS) $(DPMSOBJS) LinkSourceFile(stubs.c,$(SERVERSRC)/Xi) SpecialCObjectRule(Init,$(ICONFIGFILES),$(_NOOP_)) LinkSourceFile(miinitext.c,$(SERVERSRC)/mi) SpecialCObjectRule(miinitext,$(ICONFIGFILES),-UDPMSExtension) SpecialCObjectRule(Keyboard,$(ICONFIGFILES),$(XKB_DEFINES)) +#if BuildDPMS +LinkSourceFile(dpmsstubs.c,$(SERVERSRC)/Xext) +SpecialCObjectRule(dpmsstubs,$(ICONFIGFILES),$(EXT_DEFINES)) +#endif + NormalLibraryObjectRule() NormalLibraryTarget(xnest,$(OBJS)) InstallManPage(Xnest,$(MANDIR)) DependTarget() Index: xc/programs/Xserver/hw/xnest/Init.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xnest/Init.c,v retrieving revision 1.3 diff -u -2 -0 -r1.3 Init.c --- xc/programs/Xserver/hw/xnest/Init.c 21 Jun 2004 13:40:25 -0000 1.3 +++ xc/programs/Xserver/hw/xnest/Init.c 5 Mar 2005 21:32:59 -0000 @@ -143,45 +143,20 @@ void OsVendorInit() { return; } void OsVendorFatalError() { return; } void ddxBeforeReset(void) { return; } /* this is just to get the server to link on AIX */ #ifdef AIXV3 int SelectWaitTime = 10000; /* usec */ #endif -#ifdef DPMSExtension -/************************************************************** - * DPMSSet(), DPMSGet(), DPMSSupported() - * - * stubs - * - ***************************************************************/ - -void -DPMSSet(int level) -{ -} - -int -DPMSGet(int *level) -{ - return -1; -} - -Bool -DPMSSupported() -{ - return FALSE; -} -#endif