[Xorg] CVS HEAD -- ftfuncs.c:931: error: structure has no membernamed `find_sbit_image'

[Eric Anholt]

On Thu, 2004-07-29 at 18:20, Roland Mainz wrote:
> Alex Deucher wrote:
> > 
> > On Thu, 29 Jul 2004 16:39:28 -0400, Miles Lane <miles.lane at comcast.net> wrote:
> > > gcc -m32 -c -O2 -fno-strength-reduce -fno-strict-aliasing  -ansi
> > > -pedantic -Wall -Wpointer-arith -Wundef  -I/usr/include/freetype2
> > > -I/usr/include/freetype2/config -I. -I../../../include/fonts
> > > -I../include -I../../../exports/include/X11
> > > -I../../../programs/Xserver/include -I../../../exports/include
> > > -I../../.. -I../../../exports/include -Dlinux -D__i386__
> > > -D_POSIX_C_SOURCE=199309L  -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE
> > > -D_SVID_SOURCE                             -D_GNU_SOURCE
> > >   -DFUNCPROTO=15 -DNARROWPROTO -DGCCUSESGAS -DAVOID_GLYPHBLT -DPIXPRIV
> > > -DSINGLEDEPTH             -DXFreeXDGA -DXvExtension   -DXFree86LOADER
> > > -DXFree86Server         -DXF86VIDMODE     -DXvMCExtension
> > > -DSMART_SCHEDULE                       -DBUILDDEBUG -DXResExtension
> > >      -DX_BYTE_ORDER=X_LITTLE_ENDIAN -DXORG_VERSION_CURRENT="(((6) *
> > > 10000000) + ((7) * 100000) + ((0) * 1000) + 0)"            -DXFREE86_FT2
> > >     ftfuncs.c
> > > ftfuncs.c: In function `FT_Do_SBit_Metrics':
> > > ftfuncs.c:931: error: structure has no member named `find_sbit_image'
> > > ftfuncs.c:955: error: structure has no member named `load_sbit_metrics'
> > > make[4]: *** [ftfuncs.o] Error 1
> > > make[4]: Leaving directory `/usr/src/xc/lib/font/FreeType'
> > 
> > either upgrade to freetype 2.1.8 or add:
> > #define HasFreetype2 NO
> > to your host.def
> 
> Or build the freetype2 version in the xc/-tree statically into the
> applications...

Or go and wrap the commit in tests for 2.1.8 being available, which
seems to be the clear solution:

revision 1.3
date: 2004/05/04 18:47:31;  author: gisburn;  state: Exp;  lines: +161
-57
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=307
- Restore optimization heuristics on CJK fonts in the FreeType font
module which were broken in X11R6.7. Patch by Chisato Yamauchi
<cyamauch at a.phys.nagoya-u.ac.jp>.

At least, as far as I can tell.  I'm trying to fix other issues at the
moment.

-- 
Eric Anholt                                eta at lclark.edu          
http://people.freebsd.org/~anholt/         anholt at FreeBSD.org