Module Name: src
Committed By: bouyer
Date: Mon May 11 19:40:22 UTC 2009
Modified Files:
src [netbsd-5]: BUILDING
src/doc [netbsd-5]: BUILDING.mdoc
src/external/mit/xorg/lib/freetype [netbsd-5]: Makefile
Log Message:
Pull up following revision(s) (requested by snj in ticket #742):
doc/BUILDING.mdoc: revision 1.72
external/mit/xorg/lib/freetype/Makefile: revision 1.5
BUILDING: revision 1.83
Introduce MKSUBPIXEL, which allows enabling subpixel rendering code
in FreeType.
To generate a diff of this commit:
cvs rdiff -u -r1.78.2.2 -r1.78.2.3 src/BUILDING
cvs rdiff -u -r1.67.2.2 -r1.67.2.3 src/doc/BUILDING.mdoc
cvs rdiff -u -r1.3 -r1.3.2.1 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.78.2.2 src/BUILDING:1.78.2.3
--- src/BUILDING:1.78.2.2 Sat Nov 15 22:10:33 2008
+++ src/BUILDING Mon May 11 19:40:22 2009
@@ -281,6 +281,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.
@@ -886,4 +892,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.67.2.2 src/doc/BUILDING.mdoc:1.67.2.3
--- src/doc/BUILDING.mdoc:1.67.2.2 Sat Nov 15 22:10:33 2008
+++ src/doc/BUILDING.mdoc Mon May 11 19:40:22 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: BUILDING.mdoc,v 1.67.2.2 2008/11/15 22:10:33 snj Exp $
+.\" $NetBSD: BUILDING.mdoc,v 1.67.2.3 2009/05/11 19:40:22 bouyer 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
.
@@ -514,6 +514,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.3 src/external/mit/xorg/lib/freetype/Makefile:1.3.2.1
--- src/external/mit/xorg/lib/freetype/Makefile:1.3 Sat Oct 25 13:14:49 2008
+++ src/external/mit/xorg/lib/freetype/Makefile Mon May 11 19:40:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/10/25 13:14:49 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2009/05/11 19:40:22 bouyer 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
