Attachment 510 Details for Bug 570 – Get the X Server to build to completion with DPMS

[patch] Get the X Server to build to completion with DPMS

dpms-buildfix.diff (text/plain), 4.73 KB, created by Eric Anholt on 2004-07-21 14:03:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Anholt

Created: 2004-07-21 14:03:50 UTC

Size: 4.73 KB

patch

obsolete

>Index: programs/Xserver/hw/dmx/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/dmx/Imakefile,v
>retrieving revision 1.3
>diff -u -r1.3 Imakefile
>--- programs/Xserver/hw/dmx/Imakefile	6 Jul 2004 23:51:00 -0000	1.3
>+++ programs/Xserver/hw/dmx/Imakefile	21 Jul 2004 20:50:38 -0000
>@@ -14,8 +14,12 @@
> GLXPROXY_SUBDIR = glxProxy
> #endif
> 
>-#define IHaveSubdirs
>+#if BuildDPMS
>+DPMS_SRCS = dmxdpms.c
>+DPMS_OBJS = dmxdpms.o
>+#endif /* BuildDPMS */
> 
>+#define IHaveSubdirs
> #if BuildServersOnly && !BuildDmxDevelTools
> SUBDIRS = input config $(GLXPROXY_SUBDIR)
> #else
>@@ -32,7 +36,6 @@
> 	dmxshadow.c \
> 	dmxcursor.c \
> 	dmxinput.c \
>-	dmxdpms.c \
> 	dmxgc.c \
> 	dmxgcops.c \
> 	dmxwindow.c \
>@@ -47,6 +50,7 @@
> 	dmxsync.c \
> 	dmxextension.c \
> 	miinitext.c \
>+	$(DPMS_SRCS) \
> 	$(GLX_SRCS) \
> 	$(RENDER_SRCS)
> 
>@@ -55,7 +59,6 @@
> 	dmxshadow.o \
> 	dmxcursor.o \
> 	dmxinput.o \
>-	dmxdpms.o \
> 	dmxgc.o \
> 	dmxgcops.o \
> 	dmxwindow.o \
>@@ -70,6 +73,7 @@
> 	dmxsync.o \
> 	dmxextension.o \
> 	miinitext.o \
>+	$(DPMS_OBJS) \
> 	$(GLX_OBJS) \
> 	$(RENDER_OBJS)
> 
>Index: programs/Xserver/hw/dmx/dmxscrinit.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/dmx/dmxscrinit.c,v
>retrieving revision 1.1
>diff -u -r1.1 dmxscrinit.c
>--- programs/Xserver/hw/dmx/dmxscrinit.c	30 Jun 2004 20:06:53 -0000	1.1
>+++ programs/Xserver/hw/dmx/dmxscrinit.c	21 Jul 2004 20:50:38 -0000
>@@ -104,8 +104,10 @@
>     pScreen->whitePixel = dmxScreen->beWhitePixel;
>     pScreen->blackPixel = dmxScreen->beBlackPixel;
> 
>+#ifdef DPMSExtension
>     /* Handle screen savers and DPMS on the backend */
>     dmxDPMSInit(dmxScreen);
>+#endif /* DPMSExtension */
> 
>     /* Create root window for screen */
>     mask = CWBackPixel | CWEventMask | CWColormap | CWOverrideRedirect;
>@@ -396,8 +398,10 @@
>     DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
>     int            i;
> 
>+#ifdef DPMSExtension
>     /* Restore the back-end screen-saver and DPMS state. */
>     dmxDPMSTerm(dmxScreen);
>+#endif /* DPMSExtension */
> 
>     /* Free the screen resources */
> 
>Index: programs/Xserver/hw/dmx/input/dmxeq.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/dmx/input/dmxeq.c,v
>retrieving revision 1.1
>diff -u -r1.1 dmxeq.c
>--- programs/Xserver/hw/dmx/input/dmxeq.c	30 Jun 2004 20:06:55 -0000	1.1
>+++ programs/Xserver/hw/dmx/input/dmxeq.c	21 Jul 2004 20:50:38 -0000
>@@ -249,7 +249,10 @@
>     xEvent	xe[2];
> 
>     while (dmxEventQueue.head != dmxEventQueue.tail) {
>+#ifdef DPMSExtension
>         dmxDPMSWakeup();        /* Handles screen saver and DPMS */
>+#endif /* DPMSExtension */
>+
> 	e = &dmxEventQueue.events[dmxEventQueue.head];
>         DMXDBG5("dmxeqProcessInputEvents: type=%d screen=%p,%p root=%d,%d\n",
>                 e->event.u.u.type,
>Index: programs/Xserver/hw/xfree86/loader/dixsym.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v
>retrieving revision 1.2
>diff -u -r1.2 dixsym.c
>--- programs/Xserver/hw/xfree86/loader/dixsym.c	23 Apr 2004 19:54:06 -0000	1.2
>+++ programs/Xserver/hw/xfree86/loader/dixsym.c	21 Jul 2004 20:50:39 -0000
>@@ -198,6 +198,7 @@
>     SYMFUNC(VerifyRectOrder)
>     SYMFUNC(SetDashes)
>     /* globals.c */
>+#ifdef DPMSExtension
>     SYMVAR(DPMSEnabled)
>     SYMVAR(DPMSCapableFlag)
>     SYMVAR(DPMSOffTime)
>@@ -207,6 +208,7 @@
>     SYMVAR(DPMSEnabledSwitch)
>     SYMVAR(DPMSDisabledSwitch)
>     SYMVAR(defaultDPMSEnabled)
>+#endif /* DPMSExtension */
>     /* bigreq */
>     SYMVAR(maxBigRequestSize)
> #ifdef XV
>@@ -345,7 +347,9 @@
>     SYMFUNC(TimerFree)
>     SYMFUNC(TimerSet)
>     SYMFUNC(TimerCancel)
>+#ifdef DPMSExtension
>     SYMFUNC(SetDPMSTimers)
>+#endif /* DPMSExtension */
>     /* io.c */
>     SYMFUNC(WriteToClient)
>     SYMFUNC(SetCriticalOutputPending)
>Index: programs/Xserver/hw/xfree86/loader/xf86sym.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/xf86sym.c,v
>retrieving revision 1.1.1.2
>diff -u -r1.1.1.2 xf86sym.c
>--- programs/Xserver/hw/xfree86/loader/xf86sym.c	25 Nov 2003 19:28:50 -0000	1.1.1.2
>+++ programs/Xserver/hw/xfree86/loader/xf86sym.c	21 Jul 2004 20:50:39 -0000
>@@ -400,7 +400,9 @@
>     SYMFUNC(DGACloseFramebuffer)
> 
>     /* xf86DPMS.c */
>+#ifdef DPMSExtension
>     SYMFUNC(xf86DPMSInit)
>+#endif /* DPMSExtension */
> 
>     /* xf86Events.c */
>     SYMFUNC(SetTimeSinceLastInputEvent)
>@@ -695,9 +697,12 @@
>     SYMFUNC(xf86XInputSetSendCoreEvents)
> /* End merged segment */
> #endif
>+#ifdef DPMSExtension
>     SYMFUNC(DPMSGet)
>     SYMFUNC(DPMSSet)
>     SYMFUNC(DPMSSupported)
>+#endif /* DPMSExtension */
>+
> /* xf86Debug.c */
> #ifdef BUILDDEBUG
>     SYMFUNC(xf86Break1)

Actions: View | Splinter Review

Attachments on bug 570: 510

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.