[Midnightbsd-cvs] mports [20929] trunk/print/freetype2: freetype 2.6.2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Feb 1 16:14:57 EST 2016
Revision: 20929
http://svnweb.midnightbsd.org/mports/?rev=20929
Author: laffer1
Date: 2016-02-01 16:14:56 -0500 (Mon, 01 Feb 2016)
Log Message:
-----------
freetype 2.6.2
Modified Paths:
--------------
trunk/print/freetype2/Makefile
trunk/print/freetype2/distinfo
trunk/print/freetype2/files/patch-builds_unix_detect.mk
trunk/print/freetype2/pkg-plist
Removed Paths:
-------------
trunk/print/freetype2/files/patch-5cd2155
Modified: trunk/print/freetype2/Makefile
===================================================================
--- trunk/print/freetype2/Makefile 2016-02-01 21:12:57 UTC (rev 20928)
+++ trunk/print/freetype2/Makefile 2016-02-01 21:14:56 UTC (rev 20929)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= freetype2
-PORTVERSION= 2.6
+PORTVERSION= 2.6.2
CATEGORIES= print
MASTER_SITES= http://savannah.nongnu.org/download/freetype/ \
SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \
Modified: trunk/print/freetype2/distinfo
===================================================================
--- trunk/print/freetype2/distinfo 2016-02-01 21:12:57 UTC (rev 20928)
+++ trunk/print/freetype2/distinfo 2016-02-01 21:14:56 UTC (rev 20929)
@@ -1,2 +1,2 @@
-SHA256 (freetype-2.6.tar.bz2) = 8469fb8124764f85029cc8247c31e132a2c5e51084ddce2a44ea32ee4ae8347e
-SIZE (freetype-2.6.tar.bz2) = 1726219
+SHA256 (freetype-2.6.2.tar.bz2) = baf6bdef7cdcc12ac270583f76ef245efe936267dbecef835f02a3409fcbb892
+SIZE (freetype-2.6.2.tar.bz2) = 1767940
Deleted: trunk/print/freetype2/files/patch-5cd2155
===================================================================
--- trunk/print/freetype2/files/patch-5cd2155 2016-02-01 21:12:57 UTC (rev 20928)
+++ trunk/print/freetype2/files/patch-5cd2155 2016-02-01 21:14:56 UTC (rev 20929)
@@ -1,163 +0,0 @@
-Revert commit below to fix cut off text
-
-https://savannah.nongnu.org/bugs/?45520
-
-From 5cd21551131ef3a9690ecbefcc9782286ee5199e Mon Sep 17 00:00:00 2001
-From: Werner Lemberg <wl at gnu.org>
-Date: Fri, 10 Apr 2015 05:01:01 +0000
-Subject: [cff] Update advance width handling to OpenType 1.7.
-
-Problem reported by Behdad.
-
-* src/cff/cffdrivr.c (cff_get_advances): Handle SFNT case
-separately.
-
-* src/cff/cffgload.c (cff_slot_load): Use advance width and side
-bearing values from `hmtx' table if present.
----
-
---- src/cff/cffdrivr.c.orig 2015-04-28 09:15:13.000000000 +0200
-+++ src/cff/cffdrivr.c 2015-07-25 17:42:23.025572000 +0200
-@@ -195,68 +195,6 @@
- FT_GlyphSlot slot = face->glyph;
-
-
-- if ( FT_IS_SFNT( face ) )
-- {
-- /* OpenType 1.7 mandates that the data from `hmtx' table be used; */
-- /* it is no longer necessary that those values are identical to */
-- /* the values in the `CFF' table */
--
-- TT_Face ttface = (TT_Face)face;
-- FT_Short dummy;
--
--
-- if ( flags & FT_LOAD_VERTICAL_LAYOUT )
-- {
-- /* check whether we have data from the `vmtx' table at all; */
-- /* otherwise we extract the info from the CFF glyphstrings */
-- /* (instead of synthesizing a global value using the `OS/2' */
-- /* table) */
-- if ( !ttface->vertical_info )
-- goto Missing_Table;
--
-- for ( nn = 0; nn < count; nn++ )
-- {
-- FT_UShort ah;
--
--
-- ( (SFNT_Service)ttface->sfnt )->get_metrics( ttface,
-- 1,
-- start + nn,
-- &dummy,
-- &ah );
--
-- FT_TRACE5(( " idx %d: advance height %d font units\n",
-- start + nn, ah ));
-- advances[nn] = ah;
-- }
-- }
-- else
-- {
-- /* check whether we have data from the `hmtx' table at all */
-- if ( !ttface->horizontal.number_Of_HMetrics )
-- goto Missing_Table;
--
-- for ( nn = 0; nn < count; nn++ )
-- {
-- FT_UShort aw;
--
--
-- ( (SFNT_Service)ttface->sfnt )->get_metrics( ttface,
-- 0,
-- start + nn,
-- &dummy,
-- &aw );
--
-- FT_TRACE5(( " idx %d: advance width %d font units\n",
-- start + nn, aw ));
-- advances[nn] = aw;
-- }
-- }
--
-- return error;
-- }
--
-- Missing_Table:
- flags |= (FT_UInt32)FT_LOAD_ADVANCE_ONLY;
-
- for ( nn = 0; nn < count; nn++ )
---- src/cff/cffgload.c.orig 2015-04-16 07:02:23.000000000 +0200
-+++ src/cff/cffgload.c 2015-07-25 17:42:23.027008000 +0200
-@@ -2725,7 +2725,7 @@
- face->vertical_info &&
- face->vertical.number_Of_VMetrics > 0 );
-
-- /* get the vertical metrics from the vmtx table if we have one */
-+ /* get the vertical metrics from the vtmx table if we have one */
- if ( has_vertical_info )
- {
- (void)( (SFNT_Service)face->sfnt )->get_metrics( face, 1,
-@@ -2953,43 +2953,25 @@
- FT_Bool has_vertical_info;
-
-
-- if ( face->horizontal.number_Of_HMetrics )
-- {
-- FT_Short horiBearingX = 0;
-- FT_UShort horiAdvance = 0;
--
--
-- ( (SFNT_Service)face->sfnt )->get_metrics( face, 0,
-- glyph_index,
-- &horiBearingX,
-- &horiAdvance );
-- metrics->horiAdvance = horiAdvance;
-- metrics->horiBearingX = horiBearingX;
-- glyph->root.linearHoriAdvance = horiAdvance;
-- }
-- else
-- {
-- /* copy the _unscaled_ advance width */
-- metrics->horiAdvance = decoder.glyph_width;
-- glyph->root.linearHoriAdvance = decoder.glyph_width;
-- }
--
-+ /* copy the _unscaled_ advance width */
-+ metrics->horiAdvance = decoder.glyph_width;
-+ glyph->root.linearHoriAdvance = decoder.glyph_width;
- glyph->root.internal->glyph_transformed = 0;
-
- has_vertical_info = FT_BOOL( face->vertical_info &&
- face->vertical.number_Of_VMetrics > 0 );
-
-- /* get the vertical metrics from the vmtx table if we have one */
-+ /* get the vertical metrics from the vtmx table if we have one */
- if ( has_vertical_info )
- {
- FT_Short vertBearingY = 0;
- FT_UShort vertAdvance = 0;
-
-
-- ( (SFNT_Service)face->sfnt )->get_metrics( face, 1,
-- glyph_index,
-- &vertBearingY,
-- &vertAdvance );
-+ (void)( (SFNT_Service)face->sfnt )->get_metrics( face, 1,
-+ glyph_index,
-+ &vertBearingY,
-+ &vertAdvance );
- metrics->vertBearingY = vertBearingY;
- metrics->vertAdvance = vertAdvance;
- }
-@@ -3064,9 +3046,7 @@
- metrics->width = cbox.xMax - cbox.xMin;
- metrics->height = cbox.yMax - cbox.yMin;
-
-- if ( !face->horizontal.number_Of_HMetrics )
-- metrics->horiBearingX = cbox.xMin;
--
-+ metrics->horiBearingX = cbox.xMin;
- metrics->horiBearingY = cbox.yMax;
-
- if ( has_vertical_info )
Modified: trunk/print/freetype2/files/patch-builds_unix_detect.mk
===================================================================
--- trunk/print/freetype2/files/patch-builds_unix_detect.mk 2016-02-01 21:12:57 UTC (rev 20928)
+++ trunk/print/freetype2/files/patch-builds_unix_detect.mk 2016-02-01 21:14:56 UTC (rev 20929)
@@ -1,5 +1,5 @@
---- builds/unix/detect.mk.orig 2015-03-11 01:47:10.000000000 -0400
-+++ builds/unix/detect.mk 2015-06-16 05:45:17.176216000 -0400
+--- builds/unix/detect.mk.orig 2015-09-25 07:58:57.000000000 +0200
++++ builds/unix/detect.mk 2015-10-04 12:35:05.733855000 +0200
@@ -22,6 +22,9 @@
$(wildcard /usr/sbin/init) \
$(wildcard /dev/null) \
@@ -10,21 +10,17 @@
ifneq ($(is_unix),)
PLATFORM := unix
-@@ -81,12 +84,12 @@
+@@ -80,10 +83,10 @@
ifdef must_configure
ifneq ($(have_Makefile),)
# we are building FT2 not in the src tree
-- CONFIG_SHELL="$(CONFIG_SHELL)" \
-- $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
-+# CONFIG_SHELL="$(CONFIG_SHELL)" \
-+# $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
+- $(TOP_DIR)/builds/unix/configure $(value CFG)
++# $(TOP_DIR)/builds/unix/configure $(value CFG)
else
- cd builds/unix; \
-- CONFIG_SHELL="$(CONFIG_SHELL)" \
-- $(CONFIG_SHELL) ./configure $(value CFG)
+- ./configure $(value CFG)
+# cd builds/unix; \
-+# CONFIG_SHELL="$(CONFIG_SHELL)" \
-+# $(CONFIG_SHELL) ./configure $(value CFG)
++# ./configure $(value CFG)
endif
endif
Modified: trunk/print/freetype2/pkg-plist
===================================================================
--- trunk/print/freetype2/pkg-plist 2016-02-01 21:12:57 UTC (rev 20928)
+++ trunk/print/freetype2/pkg-plist 2016-02-01 21:14:56 UTC (rev 20929)
@@ -1,59 +1,59 @@
bin/freetype-config
-include/freetype2/config/ftconfig.h
-include/freetype2/config/ftheader.h
-include/freetype2/config/ftmodule.h
-include/freetype2/config/ftoption.h
-include/freetype2/config/ftstdlib.h
-include/freetype2/freetype.h
+include/freetype2/freetype/config/ftconfig.h
+include/freetype2/freetype/config/ftheader.h
+include/freetype2/freetype/config/ftmodule.h
+include/freetype2/freetype/config/ftoption.h
+include/freetype2/freetype/config/ftstdlib.h
+include/freetype2/freetype/freetype.h
+include/freetype2/freetype/ftadvanc.h
+include/freetype2/freetype/ftautoh.h
+include/freetype2/freetype/ftbbox.h
+include/freetype2/freetype/ftbdf.h
+include/freetype2/freetype/ftbitmap.h
+include/freetype2/freetype/ftbzip2.h
+include/freetype2/freetype/ftcache.h
+include/freetype2/freetype/ftcffdrv.h
+include/freetype2/freetype/ftchapters.h
+include/freetype2/freetype/ftcid.h
+include/freetype2/freetype/fterrdef.h
+include/freetype2/freetype/fterrors.h
+include/freetype2/freetype/ftfntfmt.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
+include/freetype2/freetype/ftmm.h
+include/freetype2/freetype/ftmodapi.h
+include/freetype2/freetype/ftmoderr.h
+include/freetype2/freetype/ftotval.h
+include/freetype2/freetype/ftoutln.h
+include/freetype2/freetype/ftpfr.h
+include/freetype2/freetype/ftrender.h
+include/freetype2/freetype/ftsizes.h
+include/freetype2/freetype/ftsnames.h
+include/freetype2/freetype/ftstroke.h
+include/freetype2/freetype/ftsynth.h
+include/freetype2/freetype/ftsystem.h
+include/freetype2/freetype/fttrigon.h
+include/freetype2/freetype/ftttdrv.h
+include/freetype2/freetype/fttypes.h
+include/freetype2/freetype/ftwinfnt.h
+include/freetype2/freetype/t1tables.h
+include/freetype2/freetype/ttnameid.h
+include/freetype2/freetype/tttables.h
+include/freetype2/freetype/tttags.h
+include/freetype2/freetype/ttunpat.h
include/freetype2/ft2build.h
-include/freetype2/ftadvanc.h
-include/freetype2/ftautoh.h
-include/freetype2/ftbbox.h
-include/freetype2/ftbdf.h
-include/freetype2/ftbitmap.h
-include/freetype2/ftbzip2.h
-include/freetype2/ftcache.h
-include/freetype2/ftcffdrv.h
-include/freetype2/ftchapters.h
-include/freetype2/ftcid.h
-include/freetype2/fterrdef.h
-include/freetype2/fterrors.h
-include/freetype2/ftfntfmt.h
-include/freetype2/ftgasp.h
-include/freetype2/ftglyph.h
-include/freetype2/ftgxval.h
-include/freetype2/ftgzip.h
-include/freetype2/ftimage.h
-include/freetype2/ftincrem.h
-include/freetype2/ftlcdfil.h
-include/freetype2/ftlist.h
-include/freetype2/ftlzw.h
-include/freetype2/ftmac.h
-include/freetype2/ftmm.h
-include/freetype2/ftmodapi.h
-include/freetype2/ftmoderr.h
-include/freetype2/ftotval.h
-include/freetype2/ftoutln.h
-include/freetype2/ftpfr.h
-include/freetype2/ftrender.h
-include/freetype2/ftsizes.h
-include/freetype2/ftsnames.h
-include/freetype2/ftstroke.h
-include/freetype2/ftsynth.h
-include/freetype2/ftsystem.h
-include/freetype2/fttrigon.h
-include/freetype2/ftttdrv.h
-include/freetype2/fttypes.h
-include/freetype2/ftwinfnt.h
-include/freetype2/t1tables.h
-include/freetype2/ttnameid.h
-include/freetype2/tttables.h
-include/freetype2/tttags.h
-include/freetype2/ttunpat.h
lib/libfreetype.a
lib/libfreetype.so
lib/libfreetype.so.6
-lib/libfreetype.so.6.12.0
+lib/libfreetype.so.6.12.2
libdata/pkgconfig/freetype2.pc
man/man1/freetype-config.1.gz
share/aclocal/freetype2.m4
More information about the Midnightbsd-cvs
mailing list