pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/freetype2 update to 2.3.2
details: https://anonhg.NetBSD.org/pkgsrc/rev/3623fecdaa45
branches: trunk
changeset: 526864:3623fecdaa45
user: drochner <drochner%pkgsrc.org@localhost>
date: Tue Mar 20 15:20:33 2007 +0000
description:
update to 2.3.2
This switches to the new stable branch. There are too many API additions
and other changes to list here -- see the changelog.
Some notes:
-There is an unpatented hinter built in per default. The "truetype"
pkgsrc option does still enable another one -- the documentation here
is inconsistent, so I've left this alone for now. I couldn't find
a visible effect with my fonts on my display.
-New pkgsrc option "subpixel". Enables subpixel rendering for LCDs.
Not default because there are patent issues.
-There is sone strange effect of the CONFIG_SHELL environment valiable
on the "configure" script. Worked around this by overriding the
env var in the pkg Makefile. Someone understanding shell quoting might
be able to locate the underlying problem.
diffstat:
graphics/freetype2/Makefile | 15 +-
graphics/freetype2/PLIST | 4 +-
graphics/freetype2/distinfo | 10 +-
graphics/freetype2/patches/patch-aa | 457 ------------------------------------
graphics/freetype2/patches/patch-ab | 52 ----
5 files changed, 18 insertions(+), 520 deletions(-)
diffs (truncated from 599 to 300 lines):
diff -r e5cc4df970d3 -r 3623fecdaa45 graphics/freetype2/Makefile
--- a/graphics/freetype2/Makefile Tue Mar 20 15:10:01 2007 +0000
+++ b/graphics/freetype2/Makefile Tue Mar 20 15:20:33 2007 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2006/11/03 22:22:10 joerg Exp $
+# $NetBSD: Makefile,v 1.56 2007/03/20 15:20:33 drochner Exp $
-DISTNAME= freetype-2.2.1
-PKGREVISION= 2
+DISTNAME= freetype-2.3.2
PKGNAME= ${DISTNAME:S/-/2-/}
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freetype/} \
@@ -26,6 +25,9 @@
BUILD_DIRS= ${WRKSRC}
CONFIGURE_ARGS+= --includedir=${PREFIX}/include
CONFIGURE_ENV+= ac_cv_path_GREP=${GREP:Q} ac_cv_path_EGREP=${EGREP:Q}
+# XXX I don't understand what's happening here, but the CONFIG_SHELL
+# in CONFIGURE_ENV breaks the configure script
+CONFIG_SHELL= # null
.if exists(/System/Library/Frameworks/Carbon.framework)
LDFLAGS+= -framework Carbon
@@ -37,7 +39,7 @@
.include "../../mk/compiler.mk"
PKG_OPTIONS_VAR= PKG_OPTIONS.freetype2
-PKG_SUPPORTED_OPTIONS= truetype
+PKG_SUPPORTED_OPTIONS= truetype subpixel
.include "../../mk/bsd.options.mk"
@@ -52,6 +54,11 @@
CFLAGS+= -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
.endif
+# subpixel (lcd) rendering, also patent issues
+.if !empty(PKG_OPTIONS:Msubpixel)
+CFLAGS+= -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
+.endif
+
# source code breaks strict aliasing in gcc>=2.95
.if !empty(CC_VERSION:Mgcc-[3-9]*) || !empty(CC_VERSION:Mgcc-2.95*)
CFLAGS+= -fno-strict-aliasing
diff -r e5cc4df970d3 -r 3623fecdaa45 graphics/freetype2/PLIST
--- a/graphics/freetype2/PLIST Tue Mar 20 15:10:01 2007 +0000
+++ b/graphics/freetype2/PLIST Tue Mar 20 15:20:33 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/05/29 22:05:21 tron Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/03/20 15:20:33 drochner Exp $
bin/freetype-config
include/freetype2/freetype/config/ftconfig.h
include/freetype2/freetype/config/ftheader.h
@@ -13,11 +13,13 @@
include/freetype2/freetype/ftchapters.h
include/freetype2/freetype/fterrdef.h
include/freetype2/freetype/fterrors.h
+include/freetype2/freetype/ftgasp.h
include/freetype2/freetype/ftglyph.h
include/freetype2/freetype/ftgxval.h
include/freetype2/freetype/ftgzip.h
include/freetype2/freetype/ftimage.h
include/freetype2/freetype/ftincrem.h
+include/freetype2/freetype/ftlcdfil.h
include/freetype2/freetype/ftlist.h
include/freetype2/freetype/ftlzw.h
include/freetype2/freetype/ftmac.h
diff -r e5cc4df970d3 -r 3623fecdaa45 graphics/freetype2/distinfo
--- a/graphics/freetype2/distinfo Tue Mar 20 15:10:01 2007 +0000
+++ b/graphics/freetype2/distinfo Tue Mar 20 15:20:33 2007 +0000
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.19 2006/08/22 18:43:50 joerg Exp $
+$NetBSD: distinfo,v 1.20 2007/03/20 15:20:33 drochner Exp $
-SHA1 (freetype-2.2.1.tar.bz2) = 4aa7d5ce2198fad586cf09ef7c9d3a6277320167
-RMD160 (freetype-2.2.1.tar.bz2) = 1c7eb4a43501c8fd5e89d0399e184847351ee160
-Size (freetype-2.2.1.tar.bz2) = 1212258 bytes
-SHA1 (patch-aa) = 58c8295d1b67be20a37b75d4786b25ca38779bf9
-SHA1 (patch-ab) = 4f96f0b6dc90d90e9db38e9eb0e363f183b43e99
+SHA1 (freetype-2.3.2.tar.bz2) = 4188a2ed344ddf89bdb1a054fb441019aa4b143d
+RMD160 (freetype-2.3.2.tar.bz2) = e4da77b6f8956d69e57269c5681560beda0ddb27
+Size (freetype-2.3.2.tar.bz2) = 1252007 bytes
diff -r e5cc4df970d3 -r 3623fecdaa45 graphics/freetype2/patches/patch-aa
--- a/graphics/freetype2/patches/patch-aa Tue Mar 20 15:10:01 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,457 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2006/08/22 18:43:50 joerg Exp $
-
---- src/pcf/pcfread.c.orig 2006-01-23 17:35:18.000000000 +0100
-+++ src/pcf/pcfread.c
-@@ -102,7 +102,8 @@ THE SOFTWARE.
- return PCF_Err_Cannot_Open_Resource;
-
- if ( toc->version != PCF_FILE_VERSION ||
-- toc->count > FT_ARRAY_MAX( face->toc.tables ) )
-+ toc->count > FT_ARRAY_MAX( face->toc.tables ) ||
-+ toc->count == 0 )
- return PCF_Err_Invalid_File_Format;
-
- if ( FT_NEW_ARRAY( face->toc.tables, toc->count ) )
-@@ -116,6 +117,41 @@ THE SOFTWARE.
- tables++;
- }
-
-+ /* Sort tables and check for overlaps. Because they are almost */
-+ /* always ordered already, an in-place bubble sort with simultaneous */
-+ /* boundary checking seems appropriate. */
-+ tables = face->toc.tables;
-+
-+ for ( n = 0; n < toc->count - 1; n++ )
-+ {
-+ FT_UInt i, have_change;
-+
-+
-+ have_change = 0;
-+
-+ for ( i = 0; i < toc->count - 1 - n; i++ )
-+ {
-+ PCF_TableRec tmp;
-+
-+
-+ if ( tables[i].offset > tables[i + 1].offset )
-+ {
-+ tmp = tables[i];
-+ tables[i] = tables[i + 1];
-+ tables[i + 1] = tmp;
-+
-+ have_change = 1;
-+ }
-+
-+ if ( ( tables[i].size > tables[i + 1].offset ) ||
-+ ( tables[i].offset > tables[i + 1].offset - tables[i].size ) )
-+ return PCF_Err_Invalid_Offset;
-+ }
-+
-+ if ( !have_change )
-+ break;
-+ }
-+
- #if defined( FT_DEBUG_LEVEL_TRACE )
-
- {
-@@ -130,7 +166,8 @@ THE SOFTWARE.
- tables = face->toc.tables;
- for ( i = 0; i < toc->count; i++ )
- {
-- for( j = 0; j < sizeof ( tableNames ) / sizeof ( tableNames[0] ); j++ )
-+ for ( j = 0; j < sizeof ( tableNames ) / sizeof ( tableNames[0] );
-+ j++ )
- if ( tables[i].type == (FT_UInt)( 1 << j ) )
- name = tableNames[j];
-
-@@ -153,13 +190,15 @@ THE SOFTWARE.
- }
-
-
-+#define PCF_METRIC_SIZE 12
-+
- static
- const FT_Frame_Field pcf_metric_header[] =
- {
- #undef FT_STRUCTURE
- #define FT_STRUCTURE PCF_MetricRec
-
-- FT_FRAME_START( 12 ),
-+ FT_FRAME_START( PCF_METRIC_SIZE ),
- FT_FRAME_SHORT_LE( leftSideBearing ),
- FT_FRAME_SHORT_LE( rightSideBearing ),
- FT_FRAME_SHORT_LE( characterWidth ),
-@@ -176,7 +215,7 @@ THE SOFTWARE.
- #undef FT_STRUCTURE
- #define FT_STRUCTURE PCF_MetricRec
-
-- FT_FRAME_START( 12 ),
-+ FT_FRAME_START( PCF_METRIC_SIZE ),
- FT_FRAME_SHORT( leftSideBearing ),
- FT_FRAME_SHORT( rightSideBearing ),
- FT_FRAME_SHORT( characterWidth ),
-@@ -187,13 +226,15 @@ THE SOFTWARE.
- };
-
-
-+#define PCF_COMPRESSED_METRIC_SIZE 5
-+
- static
- const FT_Frame_Field pcf_compressed_metric_header[] =
- {
- #undef FT_STRUCTURE
- #define FT_STRUCTURE PCF_Compressed_MetricRec
-
-- FT_FRAME_START( 5 ),
-+ FT_FRAME_START( PCF_COMPRESSED_METRIC_SIZE ),
- FT_FRAME_BYTE( leftSideBearing ),
- FT_FRAME_BYTE( rightSideBearing ),
- FT_FRAME_BYTE( characterWidth ),
-@@ -221,7 +262,7 @@ THE SOFTWARE.
- ? pcf_metric_msb_header
- : pcf_metric_header;
-
-- /* the following sets 'error' but doesn't return in case of failure */
-+ /* the following sets `error' but doesn't return in case of failure */
- (void)FT_STREAM_READ_FIELDS( fields, metric );
- }
- else
-@@ -261,17 +302,19 @@ THE SOFTWARE.
- for ( i = 0; i < ntables; i++ )
- if ( tables[i].type == type )
- {
-- if ( stream->pos > tables[i].offset ) {
-+ if ( stream->pos > tables[i].offset )
-+ {
- error = PCF_Err_Invalid_Stream_Skip;
- goto Fail;
- }
-
-- if ( FT_STREAM_SKIP( tables[i].offset - stream->pos ) ) {
-+ if ( FT_STREAM_SKIP( tables[i].offset - stream->pos ) )
-+ {
- error = PCF_Err_Invalid_Stream_Skip;
- goto Fail;
- }
-
-- *asize = tables[i].size; /* unused - to be removed */
-+ *asize = tables[i].size;
- *aformat = tables[i].format;
-
- return PCF_Err_Ok;
-@@ -298,13 +341,15 @@ THE SOFTWARE.
- }
-
-
-+#define PCF_PROPERTY_SIZE 9
-+
- static
- const FT_Frame_Field pcf_property_header[] =
- {
- #undef FT_STRUCTURE
- #define FT_STRUCTURE PCF_ParsePropertyRec
-
-- FT_FRAME_START( 9 ),
-+ FT_FRAME_START( PCF_PROPERTY_SIZE ),
- FT_FRAME_LONG_LE( name ),
- FT_FRAME_BYTE ( isString ),
- FT_FRAME_LONG_LE( value ),
-@@ -318,7 +363,7 @@ THE SOFTWARE.
- #undef FT_STRUCTURE
- #define FT_STRUCTURE PCF_ParsePropertyRec
-
-- FT_FRAME_START( 9 ),
-+ FT_FRAME_START( PCF_PROPERTY_SIZE ),
- FT_FRAME_LONG( name ),
- FT_FRAME_BYTE( isString ),
- FT_FRAME_LONG( value ),
-@@ -353,8 +398,8 @@ THE SOFTWARE.
- PCF_Face face )
- {
- PCF_ParseProperty props = 0;
-- PCF_Property properties = 0;
-- FT_Int nprops, i;
-+ PCF_Property properties;
-+ FT_UInt nprops, i;
- FT_ULong format, size;
- FT_Error error;
- FT_Memory memory = FT_FACE(face)->memory;
-@@ -390,6 +435,15 @@ THE SOFTWARE.
-
- FT_TRACE4(( " nprop = %d\n", nprops ));
-
-+ /* rough estimate */
-+ if ( nprops > size / PCF_PROPERTY_SIZE )
-+ {
-+ error = PCF_Err_Invalid_Table;
-+ goto Bail;
-+ }
-+
-+ face->nprops = nprops;
-+
- if ( FT_NEW_ARRAY( props, nprops ) )
- goto Bail;
-
-@@ -427,6 +481,13 @@ THE SOFTWARE.
-
- FT_TRACE4(( " string_size = %ld\n", string_size ));
-
-+ /* rough estimate */
-+ if ( string_size > size - nprops * PCF_PROPERTY_SIZE )
-+ {
-+ error = PCF_Err_Invalid_Table;
-+ goto Bail;
-+ }
-+
- if ( FT_NEW_ARRAY( strings, string_size ) )
- goto Bail;
-
-@@ -437,13 +498,24 @@ THE SOFTWARE.
- if ( FT_NEW_ARRAY( properties, nprops ) )
- goto Bail;
-
-+ face->properties = properties;
-+
Home |
Main Index |
Thread Index |
Old Index