Author: branden
Date: 2005-06-16 03:58:06 -0500 (Thu, 16 Jun 2005)
New Revision: 226
Modified:
trunk/debian/changelog
trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff
Log:
Convert local includes to system includes in the GLU library and X server
so that the RENDER protocol headers can actually be found.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-06-16 07:25:44 UTC (rev 225)
+++ trunk/debian/changelog 2005-06-16 08:58:06 UTC (rev 226)
@@ -183,12 +183,14 @@
already four identical copies of config-subst in X.Org 6.8.2 anyway, so
this decision didn't help matters much. :) ) Update the Imakefiles to look
for config-subst in the current working directory instead of ../Xcursor.
+ Convert local includes to system includes in the GLU library and X server
+ so that the RENDER protocol headers can actually be found.
* Stop removing the debian/local/xlibmesa-drm-source directory in
debian/rules's clean target, as nothing creates it, and nothing has since
xfree86 4.3.0-0pre1v3.
- -- Branden Robinson <[EMAIL PROTECTED]> Thu, 16 Jun 2005 02:06:29 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Thu, 16 Jun 2005 03:48:53 -0500
xfree86 (4.3.0.dfsg.1-14) unstable; urgency=high
Modified:
trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff
===================================================================
--- trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff
2005-06-16 07:25:44 UTC (rev 225)
+++ trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff
2005-06-16 08:58:06 UTC (rev 226)
@@ -10,6 +10,17 @@
definitions for the XCURSORINCLUDES, XFTINCLUDES, and XRENDERINCLUDES
symbols.
+xc/extras/ogl-sample/main/gfx/lib/glu/libtess/render.c:
+xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c:
+xc/programs/Xserver/hw/dmx/dmxpict.c:
+xc/programs/Xserver/hw/dmx/dmxpict.c:
+xc/programs/Xserver/hw/xfree86/xaa/xaaWrapper.c:
+xc/programs/Xserver/randr/randr.c:
+xc/programs/Xserver/render/glyphstr.h:
+xc/programs/Xserver/render/render.c:
+* Convert local includes to system includes so that the RENDER protocol
+ headers can actually be found.
+
xc/includes/extensions/Imakefile:
* Only install renderproto.h as part of the SDK if we're building the
extension.
@@ -287,6 +298,30 @@
#ifdef HasLibpng
/*
+diff -urN xc~/extras/ogl-sample/main/gfx/lib/glu/libtess/render.c
xc/extras/ogl-sample/main/gfx/lib/glu/libtess/render.c
+--- xc~/extras/ogl-sample/main/gfx/lib/glu/libtess/render.c 2005-02-28
12:35:18.000000000 -0500
++++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/render.c 2005-06-16
03:34:23.723478171 -0500
+@@ -44,7 +44,7 @@
+ #include <stddef.h>
+ #include "mesh.h"
+ #include "tess.h"
+-#include "render.h"
++#include <X11/extensions/render.h>
+
+ #define TRUE 1
+ #define FALSE 0
+diff -urN xc~/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c
xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c
+--- xc~/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c 2005-02-28
12:35:18.000000000 -0500
++++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c 2005-06-16
03:34:30.859642071 -0500
+@@ -48,7 +48,7 @@
+ #include "normal.h"
+ #include "sweep.h"
+ #include "tessmono.h"
+-#include "render.h"
++#include <X11/extensions/render.h>
+
+ #define GLU_TESS_DEFAULT_TOLERANCE 0.0
+ #define GLU_TESS_MESH 100112 /* void (*)(GLUmesh *mesh) */
--- xc/include/extensions/Imakefile~ 2005-06-14 17:47:53.185848707 -0500
+++ xc/include/extensions/Imakefile 2005-06-14 17:48:57.272320612 -0500
@@ -118,7 +118,9 @@
@@ -489,6 +524,84 @@
SRCS = Xrandr.c
OBJS = Xrandr.o
LINTLIBS = $(LINTXLIB)
+diff -urN xc~/programs/Xserver/hw/dmx/dmxpict.c
xc/programs/Xserver/hw/dmx/dmxpict.c
+--- xc~/programs/Xserver/hw/dmx/dmxpict.c 2005-02-28 12:35:18.000000000
-0500
++++ xc/programs/Xserver/hw/dmx/dmxpict.c 2005-06-16 03:34:43.956942883
-0500
+@@ -46,8 +46,8 @@
+ #include "pixmapstr.h"
+ #include "dixstruct.h"
+
+-#include "render.h"
+-#include "renderproto.h"
++#include <X11/extensions/render.h>
++#include <X11/extensions/renderproto.h>
+ #include "picture.h"
+ #include "picturestr.h"
+ #include "mipict.h"
+diff -urN xc~/programs/Xserver/hw/dmx/doc/html/dmxpict_8c.html
xc/programs/Xserver/hw/dmx/doc/html/dmxpict_8c.html
+--- xc~/programs/Xserver/hw/dmx/doc/html/dmxpict_8c.html 2005-02-28
12:35:18.000000000 -0500
++++ xc/programs/Xserver/hw/dmx/doc/html/dmxpict_8c.html 2005-06-16
03:35:26.377917187 -0500
+@@ -16,8 +16,8 @@
+ <code>#include "fb.h"</code><br>
+ <code>#include "pixmapstr.h"</code><br>
+ <code>#include "dixstruct.h"</code><br>
+-<code>#include "render.h"</code><br>
+-<code>#include "renderproto.h"</code><br>
++<code>#include <X11/extensions/render.h></code><br>
++<code>#include <X11/extensions/renderproto.h></code><br>
+ <code>#include "picture.h"</code><br>
+ <code>#include "picturestr.h"</code><br>
+ <code>#include "mipict.h"</code><br>
+diff -urN xc~/programs/Xserver/hw/xfree86/xaa/xaaWrapper.c
xc/programs/Xserver/hw/xfree86/xaa/xaaWrapper.c
+--- xc~/programs/Xserver/hw/xfree86/xaa/xaaWrapper.c 2005-02-28
12:35:18.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/xaa/xaaWrapper.c 2005-06-16
03:35:37.818179941 -0500
+@@ -14,7 +14,7 @@
+
+ void XAASync(ScreenPtr pScreen);
+
+-/* #include "render.h" */
++/* #include <X11/extensions/render.h> */
+
+ #if 1
+ #define COND(pDraw) \
+diff -urN xc~/programs/Xserver/randr/randr.c xc/programs/Xserver/randr/randr.c
+--- xc~/programs/Xserver/randr/randr.c 2005-02-28 12:35:18.000000000 -0500
++++ xc/programs/Xserver/randr/randr.c 2005-06-16 03:35:54.427561417 -0500
+@@ -42,7 +42,7 @@
+ #include "randrproto.h"
+ #include "randrstr.h"
+ #ifdef RENDER
+-#include "render.h" /* we share subpixel order information */
++#include <X11/extensions/render.h> /* we share subpixel order information */
+ #include "picturestr.h"
+ #endif
+ #include "Xfuncproto.h"
+diff -urN xc~/programs/Xserver/render/glyphstr.h
xc/programs/Xserver/render/glyphstr.h
+--- xc~/programs/Xserver/render/glyphstr.h 2005-02-28 12:35:18.000000000
-0500
++++ xc/programs/Xserver/render/glyphstr.h 2005-06-16 03:36:12.995987887
-0500
+@@ -26,7 +26,7 @@
+ #ifndef _GLYPHSTR_H_
+ #define _GLYPHSTR_H_
+
+-#include "renderproto.h"
++#include <X11/extensions/renderproto.h>
+ #include "picture.h"
+ #include "screenint.h"
+
+diff -urN xc~/programs/Xserver/render/render.c
xc/programs/Xserver/render/render.c
+--- xc~/programs/Xserver/render/render.c 2005-02-28 12:35:18.000000000
-0500
++++ xc/programs/Xserver/render/render.c 2005-06-16 03:37:06.830224324
-0500
+@@ -38,8 +38,8 @@
+ #include "colormapst.h"
+ #include "extnsionst.h"
+ #include "servermd.h"
+-#include "render.h"
+-#include "renderproto.h"
++#include <X11/extensions/render.h>
++#include <X11/extensions/renderproto.h>
+ #include "picturestr.h"
+ #include "glyphstr.h"
+ #include "Xfuncproto.h"
diff -ruN xc-old/programs/x11perf/Imakefile xc/programs/x11perf/Imakefile
--- xc-old/programs/x11perf/Imakefile 2004-08-11 08:05:31.000000000 +0000
+++ xc/programs/x11perf/Imakefile 2004-10-26 10:30:48.721454576 +0000
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
