Bug 174 - RFE: Update Freetype2 version in xorg tree to Freetype V2.1.7
Summary: RFE: Update Freetype2 version in xorg tree to Freetype V2.1.7
Status: RESOLVED FIXED
Alias: None
Product: xorg
Classification: Unclassified
Component: Build/Monolithic (show other bugs)
Version: unspecified
Hardware: All All
: high enhancement
Assignee: Roland Mainz
QA Contact:
URL: ftp://ftp.freetype.org/freetype/freet...
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-02-01 17:00 UTC by Roland Mainz
Modified: 2011-10-15 16:14 UTC (History)
4 users (show)

See Also:
i915 platform:
i915 features:


Attachments
GZip'ed patch for xc/extras/freetype2 (686.59 KB, application/octet-stream)
2004-02-06 21:35 UTC, Roland Mainz
no flags Details
Glue patch to update the rest of the tree (5.89 KB, patch)
2004-02-06 22:35 UTC, Roland Mainz
no flags Details | Splinter Review

Description Roland Mainz 2004-02-01 17:00:32 UTC
RFE: Update Freetype2 version in xorg tree to FreeType V2.1.7 (this code resides
in xc/extras/freetype2/, current version seems to be FreeType V2.1.4). The
current version is a little bit ancient and has some issues with PS Type1 fonts,
rendering the FreeType font code (xc/lib/font/FreeType/) unuseable for MathML
fonts in some cases... ;-(

I've tested Freetype V2.1.7 since a while in the xprint.mozdev.org CVS with the
xc/lib/font/FreeType/ code without having any problems... :)
Comment 1 Kaleb KEITHLEY 2004-02-05 09:43:17 UTC
do the work on the XORG-CURRENT branch -- Kaleb
Comment 2 Roland Mainz 2004-02-06 21:35:55 UTC
Created attachment 84 [details]
GZip'ed patch for xc/extras/freetype2
Comment 3 Roland Mainz 2004-02-06 22:35:40 UTC
Created attachment 85 [details] [review]
Glue patch to update the rest of the tree

Unfortunately the glue patch does not work:
-- snip --
xc/lib/font/FreeType/module> make
rm -f ftfuncs.o
gcc -m32 -O2 -fno-strength-reduce -fno-strict-aliasing -ansi -pedantic -Wall
-Wpointer-arith -Wstrict-prototypes			-Wmissing-prototypes
-Wmissing-declarations			    -Wredundant-decls -Wnested-externs
-Wundef    -fno-merge-constants -I. -I.. -I../../../../include/fonts
-I../../include -I../../../../exports/include/X11	    
-I../../../../programs/Xserver/include	   
-I../../../../extras/freetype2/include		 
-I../../../../extras/freetype2/src/base 	  
-I../../../../extras/freetype2/src/gzip 	  
-I../../../../extras/freetype2/src/raster	    
-I../../../../extras/freetype2/src/sfnt 	  
-I../../../../extras/freetype2/src/truetype	      
-I../../../../extras/freetype2/src/cff		 
-I../../../../extras/freetype2/src/type1	   
-I../../../../extras/freetype2/src/psaux	   
-I../../../../extras/freetype2/src/psnames	     
-I../../../../extras/freetype2/src/pshinter	      
-I../../../../extras/freetype2/src/autohint	      
-I../../../../extras/freetype2/src/bdf		 
-I../../../../extras/freetype2/src/pcf		  -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				-DSHAPE -DXINPUT -DXKB -DLBX
-DXAPPGROUP   -DXCSECURITY -DTOGCUP   -DXF86BIGFONT -DDPMSExtension   
-DPIXPRIV -DXINERAMA	-DRENDER -DRANDR -DGCCUSESGAS -DAVOID_GLYPHBLT
-DPIXPRIV -DSINGLEDEPTH 			    -DXFreeXDGA -DXvExtension  
			    -DXFree86LOADER  -DXFree86Server		       
	-DXF86VIDMODE				-DXvMCExtension 	       
		-DSMART_SCHEDULE			    -DBUILDDEBUG
-DXResExtension 			   -DX_BYTE_ORDER=X_LITTLE_ENDIAN
-DNDEBUG   -DFUNCPROTO=15 -DNARROWPROTO  -DIN_MODULE -DXFree86Module
-DFONTMODULE  -DXFREE86_FT2   -c ftfuncs.c
In file included from
../../../../extras/freetype2/include/freetype/internal/ftobjs.h:31,
		 from
../../../../extras/freetype2/include/freetype/internal/tttypes.h:26,
		 from ftfuncs.c:54:
../../../../extras/freetype2/include/freetype/ftrender.h:24:21:
freetype/ftmodule.h: No such file or directory
In file included from
../../../../extras/freetype2/include/freetype/internal/ftobjs.h:31,
		 from
../../../../extras/freetype2/include/freetype/internal/tttypes.h:26,
		 from ftfuncs.c:54:
../../../../extras/freetype2/include/freetype/ftrender.h:145: error: parse
error before "FT_Module_Class"
-- snip --

Somehow I am doing something wrong (just putting the missing include file into
freetype/ doesn't help) ... I have to look at this issue tomorrow again...
Comment 4 Roland Mainz 2004-02-06 22:39:07 UTC
kaleb:
I guess I am doing only a minor thing wrong... do you see what's wrong with
attachment 85 [details] [review] ?
Comment 5 Roland Mainz 2004-02-07 14:24:07 UTC
otaylor: Do you have any idea what may go wrong here ?
Comment 6 Egbert Eich 2004-03-04 12:04:50 UTC
In the RELEASE-1 branch it is already possible to use 2.1.7 when supplied
externally in a shared library.
Inclusion of 2.1.7 should be possible. The *.h files form freetype in the 
modules directory would have to be diffed against the originals in the
freedtype2 directory, the changes have to be noted and integrated in the
corresponding files form 2.1.7 which then have to be put into the module directory.
Comment 7 Mike A. Harris 2004-03-05 01:11:52 UTC
We should get closure as soon as possible on wether or not Freetype 2.1.7
is going to be included in the tree for the first release.  If it is going
to go in for sure, this bug should be marked as a blocker of bug #213,
and someone step forward to take on integration.  Otherwise we should defer
it with 'LATER'.

Thoughts?
Comment 8 Egbert Eich 2004-03-05 10:50:04 UTC
I've just integrated it into the RELEASE-1 branch.
One may want to merge the relevant pieces (extra/freetype2 lib/font/FreeType)
into his branch.


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.