[src/trunk]: src updates for freetype 2.10.0

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

details:   https://anonhg.NetBSD.org/src/rev/1757afc8d409
branches:  trunk
changeset: 842660:1757afc8d409
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Jul 20 02:06:12 2019 +0000

description:
updates for freetype 2.10.0

diffstat:

 distrib/sets/lists/xbase/shl.mi              |   6 +++---
 distrib/sets/lists/xdebug/shl.mi             |   4 ++--
 external/mit/xorg/lib/freetype/Makefile      |   6 +++---
 external/mit/xorg/lib/freetype/shlib_version |  12 ++++++++----
 4 files changed, 16 insertions(+), 12 deletions(-)

diffs (88 lines):

diff -r bc4c70a98a58 -r 1757afc8d409 distrib/sets/lists/xbase/shl.mi
--- a/distrib/sets/lists/xbase/shl.mi   Fri Jul 19 12:14:15 2019 +0000
+++ b/distrib/sets/lists/xbase/shl.mi   Sat Jul 20 02:06:12 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.86 2019/07/09 22:17:33 mrg Exp $
+# $NetBSD: shl.mi,v 1.87 2019/07/20 02:06:12 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -183,8 +183,8 @@
 ./usr/X11R7/lib/libfontenc.so.2                        -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libfontenc.so.2.0              -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libfreetype.so                 -unknown-               xorg,compatx11file
-./usr/X11R7/lib/libfreetype.so.18              -unknown-               xorg,compatx11file
-./usr/X11R7/lib/libfreetype.so.18.16.1         -unknown-               xorg,compatx11file
+./usr/X11R7/lib/libfreetype.so.19              -unknown-               xorg,compatx11file
+./usr/X11R7/lib/libfreetype.so.19.0            -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libgbm.so                      -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libgbm.so.1                    -unknown-               xorg,compatx11file
 ./usr/X11R7/lib/libgbm.so.1.0                  -unknown-               xorg,compatx11file
diff -r bc4c70a98a58 -r 1757afc8d409 distrib/sets/lists/xdebug/shl.mi
--- a/distrib/sets/lists/xdebug/shl.mi  Fri Jul 19 12:14:15 2019 +0000
+++ b/distrib/sets/lists/xdebug/shl.mi  Sat Jul 20 02:06:12 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.51 2019/07/09 22:17:34 mrg Exp $
+# $NetBSD: shl.mi,v 1.52 2019/07/20 02:06:12 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  xorg,obsolete           xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug xorg,obsolete           xorg,obsolete
@@ -62,7 +62,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug        xdebug-obsolete         xorg,obsolete,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.16.1.debug -unknown-               xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.19.0.debug    -unknown-               xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libgbm.so.1.0.debug  -unknown-               xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libglapi.so.1.0.debug        -unknown-               xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug -unknown-               xorg,debug,compatx11file
diff -r bc4c70a98a58 -r 1757afc8d409 external/mit/xorg/lib/freetype/Makefile
--- a/external/mit/xorg/lib/freetype/Makefile   Fri Jul 19 12:14:15 2019 +0000
+++ b/external/mit/xorg/lib/freetype/Makefile   Sat Jul 20 02:06:12 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.21 2018/06/06 02:20:07 snj Exp $
+#      $NetBSD: Makefile,v 1.22 2019/07/20 02:06:12 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -15,7 +15,7 @@
 INCS=  ft2build.h
 
 .PATH: ${FREETYPE}/src/base
-SRCS=  ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftfstype.c \
+SRCS=  ftbase.c ftbbox.c ftbdf.c ftdebug.c ftfstype.c \
        ftglyph.c ftinit.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
        ftsystem.c fttype1.c ftwinfnt.c ftbitmap.c ftcid.c \
        ftgasp.c ftgxval.c ftotval.c ftpatent.c
@@ -103,7 +103,7 @@
 
 PKGCONFIG=     freetype2
 PKGDIST.freetype2=     ${.CURDIR}
-PKGCONFIG_VERSION.freetype2=   22.1.16
+PKGCONFIG_VERSION.freetype2=   23:0:17
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff -r bc4c70a98a58 -r 1757afc8d409 external/mit/xorg/lib/freetype/shlib_version
--- a/external/mit/xorg/lib/freetype/shlib_version      Fri Jul 19 12:14:15 2019 +0000
+++ b/external/mit/xorg/lib/freetype/shlib_version      Sat Jul 20 02:06:12 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: shlib_version,v 1.12 2018/06/06 03:09:12 snj Exp $
+#      $NetBSD: shlib_version,v 1.13 2019/07/20 02:06:12 mrg Exp $
 #
 # XXX our freetype shlib versioning is insane. the rest of the world
 # uses a major of 6. we used to, but it was bumped to 7 for 64 bit
@@ -7,6 +7,10 @@
 # until upstream bumps their major, keep major at 18 and adjust
 # minor/teeny as indicated by xsrc/external/mit/freetype/dist/docs/VERSIONS.TXT
 
-major=18
-minor=16
-teeny=1
+# actually, freetype 2.10 removes (changes) symbols so it needs a
+# major shlib bump, but it's now 6.17 ie, they don't bump the major
+# major but probably mark the soname with the major.minor.  we are
+# now at 19.0 for freetype 2.10.
+
+major=19
+minor=0