Module Name: src Committed By: snj Date: Fri May 1 19:42:18 UTC 2009
Modified Files: src: BUILDING src/doc: BUILDING.mdoc src/external/mit/xorg/lib/freetype: Makefile Log Message: Introduce MKSUBPIXEL, which allows enabling subpixel rendering code in FreeType. To generate a diff of this commit: cvs rdiff -u -r1.82 -r1.83 src/BUILDING cvs rdiff -u -r1.71 -r1.72 src/doc/BUILDING.mdoc cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/freetype/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/BUILDING diff -u src/BUILDING:1.82 src/BUILDING:1.83 --- src/BUILDING:1.82 Tue Dec 2 22:28:21 2008 +++ src/BUILDING Fri May 1 19:42:18 2009 @@ -295,6 +295,12 @@ Default: ``no'' + MKSUBPIXEL Can be set to ``yes'' or ``no''. For X builds, decides if + subpixel rendering code in FreeType is turned on. Turned off + by default because of patent issues. + + Default: ``no'' + MKTTINTERP Can be set to ``yes'' or ``no''. For X builds, decides if the TrueType bytecode interpreter is turned on. See http://www.freetype.org/patents.html for details. @@ -900,4 +906,4 @@ The build.sh based build scheme was introduced for NetBSD 1.6 as USE_NEW_TOOLCHAIN, and re-worked to TOOLCHAIN_MISSING after that. -NetBSD September 10, 2008 NetBSD +NetBSD May 1, 2009 NetBSD Index: src/doc/BUILDING.mdoc diff -u src/doc/BUILDING.mdoc:1.71 src/doc/BUILDING.mdoc:1.72 --- src/doc/BUILDING.mdoc:1.71 Tue Dec 2 22:28:21 2008 +++ src/doc/BUILDING.mdoc Fri May 1 19:42:18 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: BUILDING.mdoc,v 1.71 2008/12/02 22:28:21 mrg Exp $ +.\" $NetBSD: BUILDING.mdoc,v 1.72 2009/05/01 19:42:18 snj Exp $ .\" .\" Copyright (c) 2001-2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -33,7 +33,7 @@ .\" Toolchain prefix for commands .ds toolprefix nb . -.Dd September 10, 2008 +.Dd May 1, 2009 .Dt BUILDING 8 .Os NetBSD . @@ -541,6 +541,13 @@ .Xr ident 1 . .DFLTn . +.It Sy MKSUBPIXEL +.YorN +For X builds, decides if subpixel rendering code in FreeType +is turned on. +Turned off by default because of patent issues. +.DFLTn +. .It Sy MKTTINTERP .YorN For X builds, decides if the TrueType bytecode interpreter Index: src/external/mit/xorg/lib/freetype/Makefile diff -u src/external/mit/xorg/lib/freetype/Makefile:1.4 src/external/mit/xorg/lib/freetype/Makefile:1.5 --- src/external/mit/xorg/lib/freetype/Makefile:1.4 Mon Apr 13 18:58:08 2009 +++ src/external/mit/xorg/lib/freetype/Makefile Fri May 1 19:42:18 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2009/04/13 18:58:08 snj Exp $ +# $NetBSD: Makefile,v 1.5 2009/05/01 19:42:18 snj Exp $ .include <bsd.own.mk> @@ -83,6 +83,10 @@ -I${DESTDIR}${X11INCDIR}/freetype2/freetype/config \ -I${X11SRCDIR.${LIB}}/include +.if defined(MKSUBPIXEL) && ${MKSUBPIXEL} != "no" +CPPFLAGS+= -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING +.endif + .if defined(MKTTINTERP) && ${MKTTINTERP} != "no" CPPFLAGS+= -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER .endif