Attachment 230 Details for Bug 542 – Patch for xc/programs/Xserver/ sources to enable GLX for Xprint

[patch] Patch for xc/programs/Xserver/ sources to enable GLX for Xprint

patch.gudiff (text/plain), 2.17 KB, created by Roland Mainz on 2004-04-23 18:22:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-04-23 18:22:29 UTC

Size: 2.17 KB

patch

obsolete

>Index: xc/programs/Xserver/Xprint/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/Imakefile,v
>retrieving revision 1.1.4.6
>diff -u -r1.1.4.6 Imakefile
>--- a/xc/programs/Xserver/Xprint/Imakefile	21 Apr 2004 10:03:35 -0000	1.1.4.6
>+++ b/xc/programs/Xserver/Xprint/Imakefile	23 Apr 2004 08:19:44 -0000
>@@ -105,7 +105,7 @@
> SpecialCObjectRule(ddxInit,$(ICONFIGFILES),$(PO_DEFINES) $(OS_DEFINES) $(EXT_DEFINES))
> #if XprtServer && (PrintOnlyServer || defined(PrintServerExtensions))
> LinkSourceFile(miinitext.c,$(SERVERSRC)/mi)
>-SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(PO_DEFINES) $(OS_DEFINES) $(XPEXT_DEFINES) -DXPRINT -UGLXEXT)
>+SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(PO_DEFINES) $(OS_DEFINES) $(XPEXT_DEFINES) -DXPRINT)
> #if PrintOnlyServer
> LinkSourceFile(dpmsstubs.c,$(SERVERSRC)/Xext)
> LinkSourceFile(dpmsproc.h,$(SERVERSRC)/Xext)
>Index: xc/programs/Xserver/mi/miinitext.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/mi/miinitext.c,v
>retrieving revision 1.1.4.8
>diff -u -r1.1.4.8 miinitext.c
>--- a/xc/programs/Xserver/mi/miinitext.c	21 Apr 2004 23:24:20 -0000	1.1.4.8
>+++ b/xc/programs/Xserver/mi/miinitext.c	23 Apr 2004 08:19:47 -0000
>@@ -62,6 +62,10 @@
> #undef GLXEXT
> #endif
> 
>+#ifndef GLXEXT
>+#error blabla no GLXEXT
>+#endif 
>+
> /* Make sure Xprt only announces extensions it supports */
> #ifdef PRINT_ONLY_SERVER
> #undef MITSHM /* this is incompatible to the vector-based Xprint DDX */
>@@ -69,7 +73,6 @@
> #undef PANORAMIX
> #undef RES
> #undef XIE
>-#undef GLXEXT /* not yet */
> #undef XINPUT
> #undef XV
> #undef SCREENSAVER
>@@ -379,14 +382,12 @@
> #endif
> #endif
> #ifdef GLXEXT
>-#ifndef XPRINT	/* we don't want Glx in the Xprint server */
> #ifndef __DARWIN__
>     GlxExtensionInit();
> #else
>     DarwinGlxExtensionInit();
> #endif
> #endif
>-#endif
> #ifdef DPSEXT
> #ifndef XPRINT
>     DPSExtensionInit();
>@@ -408,14 +409,12 @@
> {
>     miResetInitVisuals();
> #ifdef GLXEXT
>-#ifndef XPRINT
> #ifndef __DARWIN__
>     GlxWrapInitVisuals(&miInitVisualsProc);
> #else
>     DarwinGlxWrapInitVisuals(&miInitVisualsProc);
> #endif
> #endif
>-#endif
> }
> 
> #else /* XFree86LOADER */

Actions: View | Splinter Review

Attachments on bug 542: 229 | 230 | 231 | 237 | 238 | 243

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.