I''ve pushed a branch fc-2_4-keithp into the repository which has all of the proposed changes implemented: No more giant global cache file; per-directory caches are updated dynamically as directories changes. The cache filenames now include an architecture suffix which is detected at build time using the existing architecture signature mechanism (fixed to allow for larger page sizes). As a result, all of the multiple architecture support in each cache file has been removed. All other directory normalization has been removed. Yet to be added is a simple recursion counter to detect looping directory structures. Also yet to be fixed is FcMatch -- the faster version doesn''t compute the right value in many cases; I''m not sure how I can fix that easily, it may be necessary to just revert to the old algorithm for 2.4. -- keith.packard@intel.com -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part Url : http://lists.freedesktop.org/archives/fontconfig/attachments/20060827/03f85175/attachment.pgp
>>>>> "Keith" == Keith Packard <keithp@keithp.com> writes:Keith> I''ve pushed a branch fc-2_4-keithp into the repository which has all of Keith> the proposed changes implemented: Make fails for me. It looks like the x86 sig in fc-arch/fcarch.tmpl.h was generated before src/fcint.h was updated to add the .pos and .count members. So, I presume this patch is required for the fc-2_4-keithp branch: :; git diff diff --git a/fc-arch/fcarch.tmpl.h b/fc-arch/fcarch.tmpl.h index fe95e51..d8ecdb1 100644 --- a/fc-arch/fcarch.tmpl.h +++ b/fc-arch/fcarch.tmpl.h @@ -29,4 +29,4 @@ @@@ use something reasonable and don''t include any spaces @@@ @@@ name endian char char* int Pattern EltPtr Elt * Elt ObjPtr VLPtr Value Binding VL * CharSet Leaf** Char16 * Char16 Leaf Char32 Cache PageSize -x86 78563412_00000001_00000004_00000004_00000018_00000008_00000004_0000000c_00000004_00000008_0000000c_00000004_00000004_00000014_00000004_00000004_00000002_00000020_00000004_00000030_00001000 +x86 78563412_00000001_00000004_00000004_00000018_00000008_00000004_0000000c_00000004_00000008_0000000c_00000004_00000004_00000014_00000004_00000004_00000002_00000020_00000004_00000038_00001000 updating the sizeof(FcCache) field for the new, larger, struct size. -JimC -- James Cloos <cloos@jhcloos.com> OpenPGP: 0xED7DAEA6
On Mon, 2006-08-28 at 12:22 -0400, James Cloos wrote:> >>>>> "Keith" == Keith Packard <keithp@keithp.com> writes: > > Keith> I''ve pushed a branch fc-2_4-keithp into the repository which has all of > Keith> the proposed changes implemented: > > Make fails for me. > > It looks like the x86 sig in fc-arch/fcarch.tmpl.h was generated > before src/fcint.h was updated to add the .pos and .count members.ah, good point. I''ll push the obvious patch. -- keith.packard@intel.com -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part Url : http://lists.freedesktop.org/archives/fontconfig/attachments/20060828/49b2dbce/attachment.pgp