Module Name: src
Committed By: mrg
Date: Tue Aug 29 09:02:10 UTC 2017
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/distrib/sets/lists/xetc: mi
src/external/mit/xorg/lib/fontconfig/etc/conf.avail: Makefile
src/external/mit/xorg/lib/fontconfig/etc/conf.d: Makefile
src/external/mit/xorg/lib/fontconfig/src: Makefile shlib_version
src/external/mit/xorg/tools/fc-cache: Makefile
Log Message:
updates for fontconfig 2.8.
note that we don't (yet?) install the new fc-blank as it
has a python generator.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/xetc/mi
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
cvs rdiff -u -r1.19 -r1.20 src/external/mit/xorg/lib/fontconfig/src/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/lib/fontconfig/src/shlib_version
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/tools/fc-cache/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.76 src/distrib/sets/lists/xbase/shl.mi:1.77
--- src/distrib/sets/lists/xbase/shl.mi:1.76 Sun Mar 5 09:27:52 2017
+++ src/distrib/sets/lists/xbase/shl.mi Tue Aug 29 09:02:10 2017
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.76 2017/03/05 09:27:52 mrg Exp $
+# $NetBSD: shl.mi,v 1.77 2017/08/29 09:02:10 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -175,7 +175,7 @@
./usr/X11R7/lib/libexpat.so.2.0 -obsolete- obsolete
./usr/X11R7/lib/libfontconfig.so -unknown- xorg,compatx11file
./usr/X11R7/lib/libfontconfig.so.2 -unknown- xorg,compatx11file
-./usr/X11R7/lib/libfontconfig.so.2.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libfontconfig.so.2.3 -unknown- xorg,compatx11file
./usr/X11R7/lib/libfontenc.so -unknown- xorg,compatx11file
./usr/X11R7/lib/libfontenc.so.2 -unknown- xorg,compatx11file
./usr/X11R7/lib/libfontenc.so.2.0 -unknown- xorg,compatx11file
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.39 src/distrib/sets/lists/xdebug/shl.mi:1.40
--- src/distrib/sets/lists/xdebug/shl.mi:1.39 Sun Mar 5 22:24:29 2017
+++ src/distrib/sets/lists/xdebug/shl.mi Tue Aug 29 09:02:10 2017
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.39 2017/03/05 22:24:29 htodd Exp $
+# $NetBSD: shl.mi,v 1.40 2017/08/29 09:02:10 mrg Exp $
./usr/libdata/debug/usr/X11R7/lib -unknown- xorg,debug,compatx11dir
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug obsolete xorg,obsolete
@@ -58,7 +58,7 @@
./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libepoxy.so.0.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -obsolete- obsolete,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.2.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.3.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.18.0.13.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libgbm.so.1.0.debug -unknown- xorg,debug,compatx11file
Index: src/distrib/sets/lists/xetc/mi
diff -u src/distrib/sets/lists/xetc/mi:1.27 src/distrib/sets/lists/xetc/mi:1.28
--- src/distrib/sets/lists/xetc/mi:1.27 Thu Dec 15 12:56:52 2016
+++ src/distrib/sets/lists/xetc/mi Tue Aug 29 09:02:10 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.27 2016/12/15 12:56:52 kre Exp $
+# $NetBSD: mi,v 1.28 2017/08/29 09:02:10 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -58,6 +58,10 @@
./etc/X11/xsm/system.xsm -unknown- xorg
./etc/drirc -unknown- xorg
./etc/fonts/conf.avail/10-autohint.conf -unknown- xorg
+./etc/fonts/conf.avail/10-hinting-full.conf -unknown- xorg
+./etc/fonts/conf.avail/10-hinting-medium.conf -unknown- xorg
+./etc/fonts/conf.avail/10-hinting-none.conf -unknown- xorg
+./etc/fonts/conf.avail/10-hinting-slight.conf -unknown- xorg
./etc/fonts/conf.avail/10-no-sub-pixel.conf -unknown- xorg
./etc/fonts/conf.avail/10-scale-bitmap-fonts.conf -unknown- xorg
./etc/fonts/conf.avail/10-sub-pixel-bgr.conf -unknown- xorg
@@ -88,6 +92,7 @@
./etc/fonts/conf.avail/80-delicious.conf -unknown- xorg
./etc/fonts/conf.avail/90-synthetic.conf -unknown- xorg
./etc/fonts/conf.d/10-scale-bitmap-fonts.conf -unknown- xorg
+./etc/fonts/conf.d/10-hinting-slight.conf -unknown- xorg
./etc/fonts/conf.d/20-fix-globaladvance.conf -unknown- obsolete
./etc/fonts/conf.d/20-unhint-small-vera.conf -unknown- xorg
./etc/fonts/conf.d/30-metric-aliases.conf -unknown- xorg
Index: src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.4 src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.5
--- src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.4 Mon Jun 3 20:23:39 2013
+++ src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile Tue Aug 29 09:02:10 2017
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2013/06/03 20:23:39 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2017/08/29 09:02:10 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.fontconfig}/conf.d
CONFIGFILES= \
10-autohint.conf \
+ 10-hinting-full.conf \
+ 10-hinting-medium.conf \
+ 10-hinting-none.conf \
+ 10-hinting-slight.conf \
10-no-sub-pixel.conf \
10-sub-pixel-bgr.conf \
10-sub-pixel-rgb.conf \
Index: src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.3 src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.4
--- src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.3 Mon Jun 3 20:23:39 2013
+++ src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile Tue Aug 29 09:02:10 2017
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2013/06/03 20:23:39 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2017/08/29 09:02:10 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.fontconfig}/conf.d
FONTCONFIG_LINKS= \
+ 10-hinting-slight.conf \
10-scale-bitmap-fonts.conf \
20-unhint-small-vera.conf \
30-urw-aliases.conf \
Index: src/external/mit/xorg/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.19 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.20
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.19 Tue Sep 27 19:18:42 2016
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Tue Aug 29 09:02:10 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2016/09/27 19:18:42 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2017/08/29 09:02:10 mrg Exp $
.include <bsd.own.mk>
@@ -17,7 +17,6 @@ SRCS= fcatomic.c \
fcformat.c \
fcfreetype.c \
fcfs.c \
- fchash.c \
fcinit.c \
fclang.c \
fclist.c \
@@ -26,9 +25,11 @@ SRCS= fcatomic.c \
fcname.c \
fcobjs.c \
fcpat.c \
+ fcrange.c \
fcserialize.c \
fcstat.c \
fcstr.c \
+ fcweight.c \
fcxml.c \
ftglue.c
Index: src/external/mit/xorg/lib/fontconfig/src/shlib_version
diff -u src/external/mit/xorg/lib/fontconfig/src/shlib_version:1.4 src/external/mit/xorg/lib/fontconfig/src/shlib_version:1.5
--- src/external/mit/xorg/lib/fontconfig/src/shlib_version:1.4 Mon Jun 3 20:23:39 2013
+++ src/external/mit/xorg/lib/fontconfig/src/shlib_version Tue Aug 29 09:02:10 2017
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.4 2013/06/03 20:23:39 mrg Exp $
+# $NetBSD: shlib_version,v 1.5 2017/08/29 09:02:10 mrg Exp $
#
major=2
-minor=2
+minor=3
Index: src/external/mit/xorg/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.10 src/external/mit/xorg/tools/fc-cache/Makefile:1.11
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.10 Mon Jul 20 04:10:40 2015
+++ src/external/mit/xorg/tools/fc-cache/Makefile Tue Aug 29 09:02:10 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/07/20 04:10:40 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2017/08/29 09:02:10 mrg Exp $
NOMAN= 1
@@ -16,9 +16,10 @@ SRCS.fc-cache= fc-cache.c
.PATH: ${FONTCONFIG}/src
SRCS.fontconfig= fcatomic.c fcblanks.c fccache.c fccfg.c \
fccharset.c fcdbg.c fccompat.c fcdefault.c fcdir.c \
- fcfreetype.c fcfs.c fchash.c fcinit.c fclang.c \
+ fcfreetype.c fcfs.c fcinit.c fclang.c \
fclist.c fcmatch.c fcmatrix.c fcname.c fcobjs.c \
- fcpat.c fcserialize.c fcstat.c fcstr.c fcxml.c \
+ fcpat.c fcrange.c fcserialize.c fcstat.c fcstr.c \
+ fcweight.c fcxml.c \
ftglue.c
.PATH: ${FREETYPE}/src/base
@@ -89,9 +90,13 @@ SRCS.expat= xmlparse.c xmltok.c xmlrole.
SRCS= ${SRCS.fc-cache} ${SRCS.fontconfig} ${SRCS.freetype} ${SRCS.expat}
# XXX FONTCONFIG_PATH was arbitrarily chosen
+# XXX ALIGNOF_VOID_P=8 not valid for 32 bit, but probably ok?
HOST_CPPFLAGS= -DFONTCONFIG_PATH='"${DESTDIR}/etc/X11/fonts"' \
-DFC_DEFAULT_FONTS='"${X11FONTDIR}/Type1"' \
-DFC_CACHEDIR='"${DESTDIR}/var/cache/fontconfig"' \
+ -DFC_GPERF_SIZE_T=unsigned \
+ -DFC_NO_MT=1 \
+ -DALIGNOF_VOID_P=8 \
-DHAVE_FT_BITMAP_SIZE_Y_PPEM \
-DHAVE_FT_GET_BDF_PROPERTY \
-DHAVE_FT_GET_NEXT_CHAR \
