Attachment #176285 for bug #211201

View | Details | Raw Unified | Return to bug 211201 | Differences between

and this patch

Lines 2-8 Link Here

(-)freetype2/Makefile (-5 / +51 lines)
2	# $FreeBSD: head/print/freetype2/Makefile 412348 2016-04-01 14:17:44Z mat $	2	# $FreeBSD: head/print/freetype2/Makefile 412348 2016-04-01 14:17:44Z mat $
3		3
4	PORTNAME= freetype2	4	PORTNAME= freetype2
5	PORTVERSION= 2.6.3	5	PORTVERSION= 2.7
6	CATEGORIES= print	6	CATEGORIES= print
7	MASTER_SITES= http://savannah.nongnu.org/download/freetype/ \	7	MASTER_SITES= http://savannah.nongnu.org/download/freetype/ \
8	SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \	8	SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \
Lines 15-20 Link Here
15	MAINTAINER= gnome@FreeBSD.org	15	MAINTAINER= gnome@FreeBSD.org
16	COMMENT= Free and portable TrueType font rendering engine	16	COMMENT= Free and portable TrueType font rendering engine
17		17
		18	LICENSE= FTL GPLv2+
		19	LICENSE_COMB= dual
		20	LICENSE_NAME_FTL= The FreeType Project license
		21	LICENSE_FILE_FTL= ${WRKSRC}/docs/FTL.TXT
		22	LICENSE_FILE_GPLv2+ = ${WRKSRC}/docs/GPLv2.TXT
		23	LICENSE_PERMS_FTL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
		24
18	USES= cpe gmake libtool tar:bzip2	25	USES= cpe gmake libtool tar:bzip2
19	MAKE_ENV= TOP=""	26	MAKE_ENV= TOP=""
20	USE_LDCONFIG= yes	27	USE_LDCONFIG= yes
Lines 22-44 Link Here
22	CONFIGURE_ARGS= --without-harfbuzz	29	CONFIGURE_ARGS= --without-harfbuzz
23	CONFIGURE_WRKSRC= ${WRKSRC}/builds/unix	30	CONFIGURE_WRKSRC= ${WRKSRC}/builds/unix
24		31
		32	SUB_FILES= pkg-message
		33
		34	PORTDOCS= reference CHANGES formats.txt LICENSE.TXT raster.txt
		35
25	CPE_PRODUCT= freetype	36	CPE_PRODUCT= freetype
26	CPE_VENDOR= freetype	37	CPE_VENDOR= freetype
27		38
28	OPTIONS_DEFINE= LCD_FILTERING PNG	39	OPTIONS_DEFINE= DEBUG DOCS LCD_FILTERING PNG TABLE_VALIDATION
29	OPTIONS_DEFAULT= LCD_FILTERING	40	OPTIONS_GROUP= SUBPIXEL_HINTING
		41	OPTIONS_GROUP_SUBPIXEL_HINTING= V38 V40
		42	OPTIONS_DEFAULT= LCD_FILTERING V40
		43
30	LCD_FILTERING_DESC?= Sub-pixel rendering (patented)	44	LCD_FILTERING_DESC?= Sub-pixel rendering (patented)
31	PNG_DESC= Png compressed OpenType embedded bitmaps support	45	PNG_DESC= Png compressed OpenType embedded bitmaps support
		46	PNG_LIB_DEPENDS= libpng.so:graphics/png
		47	PNG_CONFIGURE_OFF= --without-png
		48	TABLE_VALIDATION_DESC= TrueType GX/AAT and OpenType table validation
32		49
33	LCD_FILTERING_CFLAGS= -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING	50	LCD_FILTERING_CFLAGS= -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
34		51
35	PNG_LIB_DEPENDS= libpng.so:graphics/png	52	SUBPIXEL_HINTING_DESC= Sub-pixel hinting support
36	PNG_CONFIGURE_OFF= --without-png	53	V38_DESC= v38 mode (Infinality code)
		54	V40_DESC= v40 mode (minimal code, a.k.a. ClearType hinting)
		55
		56	.include <bsd.port.options.mk>
		57
		58	.if ${PORT_OPTIONS:MV38} && ${PORT_OPTIONS:MV40}
		59	CFLAGS+= -DTT_CONFIG_OPTION_SUBPIXEL_HINTING=3
		60	.elif ${PORT_OPTIONS:MV40}
		61	CFLAGS+= -DTT_CONFIG_OPTION_SUBPIXEL_HINTING=2
		62	.elif ${PORT_OPTIONS:MV38}
		63	CFLAGS+= -DTT_CONFIG_OPTION_SUBPIXEL_HINTING=1
		64	.endif
37		65
38	pre-patch:	66	pre-patch:
39	@${REINPLACE_CMD} -e 's\|[(]libdir[)]/pkgconfig\|(prefix)/libdata/pkgconfig\|g' \	67	@${REINPLACE_CMD} -e 's\|[(]libdir[)]/pkgconfig\|(prefix)/libdata/pkgconfig\|g' \
40	${WRKSRC}/builds/unix/install.mk	68	${WRKSRC}/builds/unix/install.mk
41		69
		70	post-patch:
		71	# warning: 'TT_CONFIG_OPTION_SUBPIXEL_HINTING' macro redefined [-Wmacro-redefined]
		72	@${REINPLACE_CMD} -e '/^#define TT_CONFIG_OPTION_SUBPIXEL_HINTING/d' \
		73	${WRKSRC}/include/freetype/config/ftoption.h
		74
		75	post-patch-DEBUG-on:
		76	@${SED} -i.debug.bak \
		77	-e 's\|.$#define FT_DEBUG_LEVEL_TRACE$.\|\1\|' \
		78	-e 's\|.$#define FT_DEBUG_MEMORY$.\|\1\|' \
		79	${WRKSRC}/include/freetype/config/ftoption.h
		80
		81	post-patch-TABLE_VALIDATION-on:
		82	@${REINPLACE_CMD} -e '/valid$$/s\|#.*$AUX_MODULES$\|\1\|' \
		83	${WRKSRC}/modules.cfg
		84
42	post-configure:	85	post-configure:
43	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \	86	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
44	${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup)	87	${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup)
Lines 46-49 Link Here
46	post-install:	89	post-install:
47	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfreetype.so.*	90	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfreetype.so.*
48		91
		92	post-install-DOCS-on:
		93	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
		94
49	.include <bsd.port.mk>	95	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)freetype2/distinfo (-2 / +3 lines)
1	SHA256 (freetype-2.6.3.tar.bz2) = 371e707aa522acf5b15ce93f11183c725b8ed1ee8546d7b3af549863045863a2	1	TIMESTAMP = 1473318397
2	SIZE (freetype-2.6.3.tar.bz2) = 1753083	2	SHA256 (freetype-2.7.tar.bz2) = d6a451f5b754857d2aa3964fd4473f8bc5c64e879b24516d780fb26bec7f7d48
		3	SIZE (freetype-2.7.tar.bz2) = 1789896

Lines 1-6 Link Here

(-)freetype2/files/patch-builds_unix_detect.mk (-4 / +4 lines)
1	--- builds/unix/detect.mk.orig 2015-09-25 07:58:57.000000000 +0200	1	--- builds/unix/detect.mk.orig 2016-02-03 18:13:58 UTC
2	+++ builds/unix/detect.mk 2015-10-04 12:35:05.733855000 +0200	2	+++ builds/unix/detect.mk
3	@@ -22,6 +22,9 @@	3	@@ -22,6 +22,9 @@ ifeq ($(PLATFORM),ansi)
4	$(wildcard /usr/sbin/init) \	4	$(wildcard /usr/sbin/init) \
5	$(wildcard /dev/null) \	5	$(wildcard /dev/null) \
6	$(wildcard /hurd/auth))	6	$(wildcard /hurd/auth))
Lines 10-16 Link Here
10	ifneq ($(is_unix),)	10	ifneq ($(is_unix),)
11		11
12	PLATFORM := unix	12	PLATFORM := unix
13	@@ -80,10 +83,10 @@	13	@@ -80,10 +83,10 @@ ifeq ($(PLATFORM),unix)
14	ifdef must_configure	14	ifdef must_configure
15	ifneq ($(have_Makefile),)	15	ifneq ($(have_Makefile),)
16	# we are building FT2 not in the src tree	16	# we are building FT2 not in the src tree




The 2.7.x series now uses the new subpixel hinting mode (V40 port's option) as
the default, emulating a modern version of ClearType. This change inevitably
leads to different rendering results, and you might change port's options to
adapt it to your taste (or use the new "FREETYPE_PROPERTIES" environment
variable).

An environment variable "FREETYPE_PROPERTIES" can be used to control driver
properties. Example:

	FREETYPE_PROPERTIES=truetype:interpreter-version=35 \
		cff:no-stem-darkening=1 \
		autofitter:warping=1

This allows to select, say, the subpixel hinting mode at runtime for a given
application.

The controllable properties are listed in the section "Controlling FreeType
Modules" in the reference's table of contents
(%%DOCSDIR%%/reference/ft2-toc.html, if documentation was installed).

Lines 53-59 Link Here

(-)freetype2/pkg-plist (-1 / +1 lines)
53	lib/libfreetype.a	53	lib/libfreetype.a
54	lib/libfreetype.so	54	lib/libfreetype.so
55	lib/libfreetype.so.6	55	lib/libfreetype.so.6
56	lib/libfreetype.so.6.12.3	56	lib/libfreetype.so.6.12.6
57	libdata/pkgconfig/freetype2.pc	57	libdata/pkgconfig/freetype2.pc
58	man/man1/freetype-config.1.gz	58	man/man1/freetype-config.1.gz
59	share/aclocal/freetype2.m4	59	share/aclocal/freetype2.m4

Return to bug 211201

Line 0 Link Here

(-)freetype2/files/pkg-message.in (+19 lines)
	1	The 2.7.x series now uses the new subpixel hinting mode (V40 port's option) as
	2	the default, emulating a modern version of ClearType. This change inevitably
	3	leads to different rendering results, and you might change port's options to
	4	adapt it to your taste (or use the new "FREETYPE_PROPERTIES" environment
	5	variable).
	6
	7	An environment variable "FREETYPE_PROPERTIES" can be used to control driver
	8	properties. Example:
	9
	10	FREETYPE_PROPERTIES=truetype:interpreter-version=35 \
	11	cff:no-stem-darkening=1 \
	12	autofitter:warping=1
	13
	14	This allows to select, say, the subpixel hinting mode at runtime for a given
	15	application.
	16
	17	The controllable properties are listed in the section "Controlling FreeType
	18	Modules" in the reference's table of contents
	19	(%%DOCSDIR%%/reference/ft2-toc.html, if documentation was installed).