[src/trunk]: src updates for fontconfig 2.14.1.

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9cedae37380c
branches:  trunk
changeset: 373137:9cedae37380c
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Jan 21 04:04:30 2023 +0000

description:
updates for fontconfig 2.14.1.

diffstat:

 distrib/sets/lists/xetc/mi                               |  5 ++++-
 external/mit/xorg/lib/fontconfig/etc/Makefile            |  5 +++--
 external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile |  3 ++-
 external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile     |  4 +++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diffs (82 lines):

diff -r 556b51d3d6ad -r 9cedae37380c distrib/sets/lists/xetc/mi
--- a/distrib/sets/lists/xetc/mi        Fri Jan 20 23:06:26 2023 +0000
+++ b/distrib/sets/lists/xetc/mi        Sat Jan 21 04:04:30 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.41 2023/01/19 06:29:10 mrg Exp $
+# $NetBSD: mi,v 1.42 2023/01/21 04:04:30 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -33,6 +33,7 @@
 ./etc/fonts/conf.avail/10-hinting-none.conf            xetc-fontconfig-etc     xorg
 ./etc/fonts/conf.avail/10-hinting-slight.conf          xetc-fontconfig-etc     xorg
 ./etc/fonts/conf.avail/10-no-sub-pixel.conf            xetc-fontconfig-etc     xorg
+./etc/fonts/conf.avail/10-no-antialias.conf            xetc-fontconfig-etc     xorg
 ./etc/fonts/conf.avail/10-scale-bitmap-fonts.conf      xetc-fontconfig-etc     xorg
 ./etc/fonts/conf.avail/10-sub-pixel-bgr.conf           xetc-fontconfig-etc     xorg
 ./etc/fonts/conf.avail/10-sub-pixel-rgb.conf           xetc-fontconfig-etc     xorg
@@ -68,6 +69,8 @@
 ./etc/fonts/conf.avail/90-synthetic.conf               xetc-fontconfig-etc     xorg
 ./etc/fonts/conf.d/10-hinting-slight.conf              xetc-fontconfig-etc     xorg
 ./etc/fonts/conf.d/10-scale-bitmap-fonts.conf          xetc-fontconfig-etc     xorg
+./etc/fonts/conf.d/10-sub-pixel-rgb.conf               xetc-fontconfig-etc     xorg
+./etc/fonts/conf.d/10-yes-antialias.conf               xetc-fontconfig-etc     xorg
 ./etc/fonts/conf.d/11-lcdfilter-default.conf           xetc-fontconfig-etc     xorg
 ./etc/fonts/conf.d/20-fix-globaladvance.conf           xetc-obsolete   obsolete
 ./etc/fonts/conf.d/20-unhint-small-vera.conf           xetc-fontconfig-etc     xorg
diff -r 556b51d3d6ad -r 9cedae37380c external/mit/xorg/lib/fontconfig/etc/Makefile
--- a/external/mit/xorg/lib/fontconfig/etc/Makefile     Fri Jan 20 23:06:26 2023 +0000
+++ b/external/mit/xorg/lib/fontconfig/etc/Makefile     Sat Jan 21 04:04:30 2023 +0000
@@ -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 -r 556b51d3d6ad -r 9cedae37380c external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile
--- a/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile  Fri Jan 20 23:06:26 2023 +0000
+++ b/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile  Sat Jan 21 04:04:30 2023 +0000
@@ -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 @@
        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 -r 556b51d3d6ad -r 9cedae37380c external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
--- a/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile      Fri Jan 20 23:06:26 2023 +0000
+++ b/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile      Sat Jan 21 04:04:30 2023 +0000
@@ -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 \