Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (d7f126138997ec3fd131818a1d0a80e3f5010e0f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (d7f126138997ec3fd131818a1d0a80e3f5010e0f)
  • Date: Thu, 16 Aug 2007 13:13:36 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

x11-libs/xfree86/DETAILS | 16 +-
x11-libs/xfree86/HISTORY | 6
x11-libs/xfree86/PRE_BUILD | 8 -
x11-libs/xfree86/ftfuncs.h.patch | 10 -
x11-libs/xfree86/ftfuncs.patch | 241
---------------------------------------
x11-libs/xfree86/ftsystem.patch | 13 --
x11-libs/xfree86/util.c.patch | 10 -
7 files changed, 16 insertions(+), 288 deletions(-)

New commits:
commit d7f126138997ec3fd131818a1d0a80e3f5010e0f
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

xfree86: Updated to version 4.7.0. PRE_BUILD removed unneeded patches.

diff --git a/x11-libs/xfree86/DETAILS b/x11-libs/xfree86/DETAILS
index b293868..02bf294 100755
--- a/x11-libs/xfree86/DETAILS
+++ b/x11-libs/xfree86/DETAILS
@@ -1,5 +1,5 @@
SPELL=xfree86
- VERSION=4.6.0
+ VERSION=4.7.0
SOURCE=XFree86-$VERSION-src-1.tgz
SOURCE2=XFree86-$VERSION-src-2.tgz
SOURCE3=XFree86-$VERSION-src-3.tgz
@@ -15,13 +15,13 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/xc
SOURCE5_URL[0]=$XFREE86_URL/$VERSION/source/$SOURCE5
SOURCE6_URL[0]=$XFREE86_URL/$VERSION/source/$SOURCE6
SOURCE7_URL[0]=$XFREE86_URL/$VERSION/source/$SOURCE7
-
SOURCE_HASH=sha512:59a41c8bfbb72950c5af42d8f2ac9bfe609d87f94e78b494c14d95fef963550a22fc30bdaff51841a358508f9f745bc75e3b8e9b3ae03c985677914c436ef03d
-
SOURCE2_HASH=sha512:a09eb878b7da2be34d98fc1610e5a9174a02027f4de9471f2e78ac0e6671b98ab583b1fadb70fd919551b331baee75a8467a05214c60bed8bdf6f58f62d5a7c5
-
SOURCE3_HASH=sha512:13010a6eb95b9397d6bc899acb8b077130d30695ef8bc742f8637f50ee2feff3faa88e5c78922de38a8cda571c8fa4bfc64a835c96d09885780c99977ea1398b
-
SOURCE4_HASH=sha512:18a4b999c75945f640110ef66ee27bef46de841a48682c566c6796d0416e7abf0319f2673dabd19ddc7584960e2333a350b3efdcf27b45399b47efccddb048dd
-
SOURCE5_HASH=sha512:64c78eb8866203d6005bf6b91a765b19c8d6087497a41dfcbab514f958b47b0d6b368e8d35a5f031208f9c09d6a597b6ab41d30e70b5217ece0e388db46d9e79
-
SOURCE6_HASH=sha512:496f1fc95c9f24137e2dad6f57b5ced289b90cd58f638d12fa6cb036a6e07d21daee60d71dbc656583e33dadc7da43dba0c70a73d217b9a6cc0bb66e7a6d3b0f
-
SOURCE7_HASH=sha512:8d1f69832c24f602045901ed1f1b55b0df1bb8b9fcd16c41e298f6d9bf6638b659697a6eae6eb58a9db25d2b47daae8f49c15ee5d55fb0093d87f03b453adbe6
+
SOURCE_HASH=sha512:1cfeebf3b952264a6fa7b1acc3c8d286faf6a0d5356b21971525e699af3969ee25fe32b1df37f53c22576739efef3e10bd65f3984332e730cee7b5ccea1ac5b2
+
SOURCE2_HASH=sha512:881338194c0515c8edb90d6462bf12aa61cfa15ea69a42202feeafcd92fc246da8f284498e4257b5ef20c815ccacc080395115db86c91f47296cbc37641ed80f
+
SOURCE3_HASH=sha512:bee265e98271dd621d0134d4b8f9fe976a8b6aabde979d0ea0515cb3a3d69d3fdac8464322838bf506f9404508af72e27e92b4886a5c10978167bbb74434db2a
+
SOURCE4_HASH=sha512:302002f408025160694682770ce18a7f22db62ecc24c02a01c66e36fd19b91443ede18d9c2f3c3d0d6acc4e335738e5441b5ec171356dc57275502b9e4849386
+
SOURCE5_HASH=sha512:f4acbde528f7a60f2392bec2d8b8d4b2c2b6caeb20fccae1177cdd28b5dd3e4b9c3a4bfd13e21b9df85aeb8c168ba61d2df78703ff609cb190aa4c83c01484e5
+
SOURCE6_HASH=sha512:5e3fcf4c76144695a442a2fa58ac2fc4c294d9013c9a800159b90be09b1db86a018e23f0141a4d78fff110a531a49ef030c47733d26d49a0c1068f2707d146a2
+
SOURCE7_HASH=sha512:246d23768422a5270bccff433c4d5613c5fa45a39a31a1f2cb7d7d522a56e6d1645142bb779289d1d163ac479b18f47f70cc6a26d573b4afedda486e1495d6e4
WEB_SITE=http://www.xfree86.org/
ENTERED=20010922
LICENSE[0]=XCL
diff --git a/x11-libs/xfree86/HISTORY b/x11-libs/xfree86/HISTORY
index bb3ea28..ef43a83 100644
--- a/x11-libs/xfree86/HISTORY
+++ b/x11-libs/xfree86/HISTORY
@@ -1,3 +1,9 @@
+2007-08-16 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 4.7.0
+ * PRE_BUILD: Removed patches for freetype2 2.2.1
+ * ftfuncs.patch, ftfuncs.h.patch, ftsystem.patch,
+ util.c.patch: Removed. Incorporated upstream.
+
2006-11-18 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 4.6.0. Removed Updated.
* PRE_BUILD: Added patches for freetype2 2.2.1. Removed not
diff --git a/x11-libs/xfree86/PRE_BUILD b/x11-libs/xfree86/PRE_BUILD
index 3fedc10..2d5b589 100755
--- a/x11-libs/xfree86/PRE_BUILD
+++ b/x11-libs/xfree86/PRE_BUILD
@@ -7,9 +7,5 @@ unpack_file 5 &&
unpack_file 6 &&
unpack_file 7 &&

-mk_source_dir $SOURCE_DIRECTORY.bld &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/ftfuncs.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/ftfuncs.h.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/ftsystem.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/util.c.patch
+mk_source_dir $SOURCE_DIRECTORY.bld
+
diff --git a/x11-libs/xfree86/ftfuncs.h.patch
b/x11-libs/xfree86/ftfuncs.h.patch
deleted file mode 100644
index cd0fa05..0000000
--- a/x11-libs/xfree86/ftfuncs.h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/font/FreeType/ftfuncs.h.orig 2006-11-16 19:24:26.000000000 +0400
-+++ lib/font/FreeType/ftfuncs.h 2006-11-16 19:25:10.000000000 +0400
-@@ -46,6 +46,7 @@
- typedef struct _FTFace {
- char *filename;
- FT_Face face;
-+ FT_UInt num_hmetrics;
- int bitmap;
- struct _FTInstance *instances;
- struct _FTInstance *active_instance;
diff --git a/x11-libs/xfree86/ftfuncs.patch b/x11-libs/xfree86/ftfuncs.patch
deleted file mode 100644
index 0025d1e..0000000
--- a/x11-libs/xfree86/ftfuncs.patch
+++ /dev/null
@@ -1,241 +0,0 @@
---- lib/font/FreeType/ftfuncs.c.orig 2006-11-14 22:06:39.000000000 +0400
-+++ lib/font/FreeType/ftfuncs.c 2006-11-15 06:39:43.000000000 +0400
-@@ -50,10 +50,7 @@
- #include FT_TYPE1_TABLES_H
- #include FT_XFREE86_H
- #include FT_BBOX_H
--#include FT_INTERNAL_TRUETYPE_TYPES_H
- #include FT_TRUETYPE_TAGS_H
--#include FT_INTERNAL_SFNT_H
--#include FT_INTERNAL_STREAM_H
- /*
- * If you want to use FT_Outline_Get_CBox instead of
- * FT_Outline_Get_BBox, define here.
-@@ -118,6 +115,45 @@
- "CHARSET_ENCODING",
- };
-
-+/* read 2-byte value from a SFNT table */
-+static FT_UShort
-+sfnt_get_ushort( FT_Face face,
-+ FT_ULong table_tag,
-+ FT_ULong table_offset )
-+{
-+ FT_Byte buff[2];
-+ FT_ULong len = sizeof(buff);
-+ FT_UShort result = 0;
-+
-+ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ) );
-+ result = (FT_UShort)( (buff[0] << 8) | buff[1] );
-+
-+ return result;
-+}
-+
-+#define sfnt_get_short(f,t,o) ((FT_Short)sfnt_get_ushort((f),(t),(o)))
-+
-+
-+#if 0
-+static FT_ULong
-+sfnt_get_ulong( FT_Face face,
-+ FT_ULong table_tag,
-+ FT_ULong table_offset )
-+{
-+ FT_Byte buff[4];
-+ FT_ULong len = sizeof(buff);
-+ FT_UShort result = 0;
-+
-+ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len );
-+ result = ((FT_ULong)buff[0] << 24) | ((FT_ULong)buff[1] << 16) |
-+ ((FT_ULong)buff[2] << 8) | (FT_ULong)buff[3];
-+
-+ return result;
-+}
-+#endif
-+
-+
-+
-
- static int ftypeInitP = 0; /* is the engine initialised? */
- static FT_Library ftypeLibrary;
-@@ -207,6 +243,10 @@
- if(maxp && maxp->maxContours == 0)
- face->bitmap = 1;
- }
-+
-+ face->num_hmetrics = (FT_UInt) sfnt_get_ushort( face->face,
-+ TTAG_hhea, 34 );
-+
- /* Insert face in hashtable and return it */
- face->next = faceTable[bucket];
- faceTable[bucket] = face;
-@@ -458,6 +498,29 @@
- }
-
- if( FT_IS_SFNT( face->face ) ) {
-+#if 1
-+ FT_F26Dot6 tt_char_width, tt_char_height, tt_dim_x, tt_dim_y;
-+ FT_UInt nn;
-+
-+ instance->strike_index=0xFFFFU;
-+
-+ tt_char_width = (int)(trans->scale*(1<<6) + 0.5);
-+ tt_char_height = (int)(trans->scale*(1<<6) + 0.5);
-+
-+ tt_dim_x = ( ( tt_char_width * trans->xres + (36+32*72) ) / 72 ) &
-64;
-+ tt_dim_y = ( ( tt_char_height * trans->yres + (36+32*72) ) / 72 ) &
-64;
-+
-+ for ( nn = 0; nn < face->face->num_fixed_sizes; nn++ )
-+ {
-+ FT_Bitmap_Size* sz = &face->face->available_sizes[nn];
-+
-+ if ( tt_dim_x == sz->x_ppem && tt_dim_y == sz->y_ppem )
-+ {
-+ instance->strike_index = nn;
-+ break;
-+ }
-+ }
-+#else
- /* See Set_Char_Sizes() in ttdriver.c */
- FT_Error err;
- TT_Face tt_face;
-@@ -482,6 +545,7 @@
- sfnt = (SFNT_Service)tt_face->sfnt;
- err =
sfnt->set_sbit_strike(tt_face,tt_x_ppem,tt_y_ppem,&instance->strike_index);
- if ( err ) instance->strike_index=0xFFFFU;
-+#endif
- }
-
- /* maintain a linked list of instances */
-@@ -799,31 +863,35 @@
- * parse the htmx field in TrueType font.
- */
-
--/* from src/truetype/ttgload.c */
- static void
--tt_get_metrics( TT_HoriHeader* header,
-+tt_get_metrics( FT_Face face,
- FT_UInt idx,
-+ FT_UInt num_hmetrics,
- FT_Short* bearing,
- FT_UShort* advance )
--/* Copyright 1996-2001, 2002 by */
--/* David Turner, Robert Wilhelm, and Werner Lemberg. */
- {
-- TT_LongMetrics longs_m;
-- FT_UShort k = header->number_Of_HMetrics;
-+ /* read the metrics directly from the horizontal header, we
-+ * parse the SFNT table directly through the standard FreeType API.
-+ * this works with any version of the library and doesn't need to
-+ * peek at its internals. Maybe a bit less
-+ */
-+ FT_UInt count = num_hmetrics;
-
-- if ( k == 0 ) {
-- *bearing = *advance = 0;
-- return;
-+ if ( count == 0 )
-+ {
-+ *advance = 0;
-+ *bearing = 0;
- }
--
-- if ( idx < (FT_UInt)k ) {
-- longs_m = (TT_LongMetrics )header->long_metrics + idx;
-- *bearing = longs_m->bearing;
-- *advance = longs_m->advance;
-+ else if ( idx < count )
-+ {
-+ FT_ULong offset = idx*4;
-+ *advance = sfnt_get_ushort( face, TTAG_hmtx, offset );
-+ *bearing = sfnt_get_short ( face, TTAG_hmtx, offset+2 );
- }
-- else {
-- *bearing = ((TT_ShortMetrics*)header->short_metrics)[idx - k];
-- *advance = ((TT_LongMetrics )header->long_metrics)[k - 1].advance;
-+ else
-+ {
-+ *advance = sfnt_get_ushort( face, TTAG_hmtx, (count-1)*4 );
-+ *bearing = sfnt_get_short ( face, TTAG_hmtx, (count+idx)*2 );
- }
- }
-
-@@ -831,6 +899,7 @@
- ft_get_very_lazy_bbox( FT_UInt index,
- FT_Face face,
- FT_Size size,
-+ FT_UInt num_hmetrics,
- double slant,
- FT_Matrix *matrix,
- FT_BBox *bbox,
-@@ -838,14 +907,13 @@
- FT_Long *vertAdvance)
- {
- if ( FT_IS_SFNT( face ) ) {
-- TT_Face ttface = (TT_Face)face;
- FT_Size_Metrics *smetrics = &size->metrics;
- FT_Short leftBearing = 0;
- FT_UShort advance = 0;
- FT_Vector p0, p1, p2, p3;
-
- /* horizontal */
-- tt_get_metrics(&ttface->horizontal, index,
-+ tt_get_metrics( face, num_hmetrics, index,
- &leftBearing, &advance);
-
- #if 0
-@@ -905,6 +973,27 @@
- FT_Do_SBit_Metrics( FT_Face ft_face, FT_Size ft_size, FT_ULong strike_index,
- FT_UShort glyph_index, FT_Glyph_Metrics *metrics_return )
- {
-+#if 1
-+ if ( strike_index != 0xFFFFU && ft_face->available_sizes != 0)
-+ {
-+ FT_Error error;
-+ FT_Bitmap_Size* sz = &ft_face->available_sizes[strike_index];
-+
-+ error = FT_Set_Pixel_Sizes( ft_face, sz->x_ppem/64, sz->y_ppem/64 );
-+ if ( !error )
-+ {
-+ error = FT_Load_Glyph( ft_face, glyph_index, FT_LOAD_SBITS_ONLY );
-+ if ( !error )
-+ {
-+ if ( metrics_return != NULL )
-+ *metrics_return = ft_face->glyph->metrics;
-+
-+ return 0;
-+ }
-+ }
-+ }
-+ return -1;
-+#elif (FREETYPE_VERSION >= 2001008)
- SFNT_Service sfnt;
- TT_Face face;
- FT_Error error;
-@@ -968,6 +1057,7 @@
-
- Exit:
- return error;
-+#endif
- }
-
- int
-@@ -1022,7 +1112,8 @@
- }
- if( bitmap_metrics == NULL ) {
- if ( instance->ttcap.flags & TTCAP_IS_VERY_LAZY ) {
-- if( ft_get_very_lazy_bbox( idx, face->face,
instance->size,
-+ if( ft_get_very_lazy_bbox( idx, face->face,
instance->size,
-+ face->num_hmetrics,
- instance->ttcap.vl_slant,
-
&instance->transformation.matrix,
- &bbox, &outline_hori_advance,
-@@ -1196,7 +1287,8 @@
- if( (instance->ttcap.flags & TTCAP_MONO_CENTER) && hasMetrics ) {
- if( is_outline == 1 ){
- if( correct ){
-- if( ft_get_very_lazy_bbox( idx, face->face, instance->size,
-+ if( ft_get_very_lazy_bbox( idx, face->face, instance->size,
-+ face->num_hmetrics,
- instance->ttcap.vl_slant,
- &instance->transformation.matrix,
- &bbox, &outline_hori_advance,
diff --git a/x11-libs/xfree86/ftsystem.patch b/x11-libs/xfree86/ftsystem.patch
deleted file mode 100644
index f5b625e..0000000
--- a/x11-libs/xfree86/ftsystem.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/font/FreeType/ftsystem.c.orig 2006-11-16 19:17:34.000000000 +0400
-+++ lib/font/FreeType/ftsystem.c 2006-11-16 19:20:53.000000000 +0400
-@@ -32,7 +32,9 @@
-
- #include <ft2build.h>
- #include FT_CONFIG_CONFIG_H
--#include FT_INTERNAL_DEBUG_H
-+#define FT_TRACE( level, varformat ) do ; while ( 0 ) /* nothing */
-+#define FT_TRACE1( varformat ) FT_TRACE( 1, varformat )
-+#define FT_ERROR( varformat ) do ; while ( 0 ) /* nothing */
- #include FT_SYSTEM_H
- #include FT_ERRORS_H
- #include FT_TYPES_H
diff --git a/x11-libs/xfree86/util.c.patch b/x11-libs/xfree86/util.c.patch
deleted file mode 100644
index d33cc97..0000000
--- a/x11-libs/xfree86/util.c.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- programs/fonttosfnt/util.c.orig 2006-11-15 07:23:20.000000000 +0400
-+++ programs/fonttosfnt/util.c 2006-11-15 07:23:37.000000000 +0400
-@@ -34,7 +34,6 @@
-
- #include <ft2build.h>
- #include FT_FREETYPE_H
--#include FT_INTERNAL_OBJECTS_H
- #include FT_BDF_H
- #include "X11/Xos.h"
- #include "fonttosfnt.h"



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (d7f126138997ec3fd131818a1d0a80e3f5010e0f), George Sherwood, 08/16/2007

Archive powered by MHonArc 2.6.24.

Top of Page