Author: branden Date: 2005-06-17 19:09:38 -0500 (Fri, 17 Jun 2005) New Revision: 229
Modified: trunk/debian/changelog trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff Log: Update patch #058 to define RenderDefines if either BuildRender or HaveRenderLibrary is true, not just BuildRender. Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2005-06-17 23:05:37 UTC (rev 228) +++ trunk/debian/changelog 2005-06-18 00:09:38 UTC (rev 229) @@ -184,7 +184,9 @@ 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. + so that the RENDER protocol headers can actually be found. Define + RenderDefines if either BuildRender or HaveRenderLibrary is true, not just + BuildRender. * Stop removing the debian/local/xlibmesa-drm-source directory in debian/rules's clean target, as nothing creates it, and nothing has since @@ -194,8 +196,9 @@ directly #include render.h and renderproto.h. Version dependency since symbols new to renderext 0.9 are used. Document dependency in detail in debian/control comments. + * - -- Branden Robinson <[EMAIL PROTECTED]> Fri, 17 Jun 2005 17:50:16 -0500 + -- Branden Robinson <[EMAIL PROTECTED]> Fri, 17 Jun 2005 19:08:26 -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-17 23:05:37 UTC (rev 228) +++ trunk/debian/patches/058_support_external_Xcursor_Xft_Xrender_libs.diff 2005-06-18 00:09:38 UTC (rev 229) @@ -9,6 +9,8 @@ FreeType2, Expat, and Zlib compression libraries. This adds/updates definitions for the XCURSORINCLUDES, XFTINCLUDES, and XRENDERINCLUDES symbols. +* Define RenderDefines if either BuildRender or HaveRenderLibrary is true, + not just BuildRender. xc/extras/ogl-sample/main/gfx/lib/glu/libtess/render.c: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c: @@ -68,8 +70,9 @@ Not submitted upstream. ---- xc.orig/config/cf/X11.tmpl 2004-12-16 11:43:47.693789216 +0100 -+++ xc/config/cf/X11.tmpl 2004-12-16 11:44:21.190696912 +0100 +diff -urN xc~/config/cf/X11.tmpl xc/config/cf/X11.tmpl +--- xc~/config/cf/X11.tmpl 2005-06-17 19:01:49.848921146 -0500 ++++ xc/config/cf/X11.tmpl 2005-06-17 19:04:04.778020128 -0500 @@ -609,23 +609,29 @@ #ifndef BuildRender #define BuildRender YES @@ -118,6 +121,15 @@ #endif #ifndef BuildXcursorgen +@@ -1189,7 +1199,7 @@ + #endif + + #ifndef RenderDefines +-#if BuildRender ++#if BuildRender || HasRenderLibrary + #define RenderDefines -DRENDER + #else + #define RenderDefines /**/ @@ -2676,6 +2686,7 @@ ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir) #endif -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]