summaryrefslogtreecommitdiff
path: root/external/mit/xorg
diff options
context:
space:
mode:
authormrg <mrg@NetBSD.org>2023-01-21 04:04:30 +0000
committermrg <mrg@NetBSD.org>2023-01-21 04:04:30 +0000
commit99962bf9089a51569f8e514bc7f8ca9fcfecd31c (patch)
treea2ef62e9c0e2be9dfb7769ec89bc76be319227e6 /external/mit/xorg
parent68b24ef17194471602ead5b441b3429993f26c9d (diff)
updates for fontconfig 2.14.1.
Diffstat (limited to 'external/mit/xorg')
-rw-r--r--external/mit/xorg/lib/fontconfig/etc/Makefile5
-rw-r--r--external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile3
-rw-r--r--external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile4
3 files changed, 8 insertions, 4 deletions
diff --git a/external/mit/xorg/lib/fontconfig/etc/Makefile b/external/mit/xorg/lib/fontconfig/etc/Makefile
index ace197d3244..34636c041b8 100644
--- a/external/mit/xorg/lib/fontconfig/etc/Makefile
+++ b/external/mit/xorg/lib/fontconfig/etc/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2017/08/29 20:53:56 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2023/01/21 04:04:30 mrg Exp $
# When updating fontconfig, be sure to update the fonts.conf. This
# requires running ./configure like this:
#
# env PKG_CONFIG_PATH=/usr/X11R7/share/pkgconfig \
# ./configure \
-# --localstatedir=/var \
+# --prefix=/usr/X11R7 --localstatedir=/var \
# --with-default-fonts=/usr/X11R7/lib/X11/fonts \
# --with-add-fonts=/usr/pkg/lib/X11/fonts,/usr/pkg/share/fonts \
# --with-configdir=conf.d
+# cd src && gmake fcalias.h fcaliastail.h fcftalias.h fcftaliastail.h fcobjshash.h
#
# and then running gmake fonts.conf and copying the new file here.
# (gmake is required here as the FC_CONFIGDIR pattern uses $(subst).)
diff --git a/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile b/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile
index 445dbf8bc82..708b1d7983c 100644
--- a/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile
+++ b/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2023/01/19 06:29:10 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2023/01/21 04:04:30 mrg Exp $
.include <bsd.own.mk>
@@ -11,6 +11,7 @@ CONFIGFILES= \
10-hinting-medium.conf \
10-hinting-none.conf \
10-hinting-slight.conf \
+ 10-no-antialias.conf \
10-no-sub-pixel.conf \
10-sub-pixel-bgr.conf \
10-sub-pixel-rgb.conf \
diff --git a/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile b/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
index 24b8c63b212..3c241b61958 100644
--- a/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
+++ b/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2023/01/19 06:29:10 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2023/01/21 04:04:30 mrg Exp $
.include <bsd.own.mk>
@@ -6,6 +6,8 @@
FONTCONFIG_LINKS= \
10-hinting-slight.conf \
10-scale-bitmap-fonts.conf \
+ 10-yes-antialias.conf \
+ 10-sub-pixel-rgb.conf \
11-lcdfilter-default.conf \
20-unhint-small-vera.conf \
30-metric-aliases.conf \