Module Name: src
Committed By: mrg
Date: Sat Jul 20 02:06:12 UTC 2019
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/freetype: Makefile shlib_version
Log Message:
updates for freetype 2.10.0
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.51 -r1.52 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.21 -r1.22 src/external/mit/xorg/lib/freetype/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/freetype/shlib_version
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.86 src/distrib/sets/lists/xbase/shl.mi:1.87
--- src/distrib/sets/lists/xbase/shl.mi:1.86 Tue Jul 9 22:17:33 2019
+++ src/distrib/sets/lists/xbase/shl.mi Sat Jul 20 02:06:12 2019
@@ -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
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.51 src/distrib/sets/lists/xdebug/shl.mi:1.52
--- src/distrib/sets/lists/xdebug/shl.mi:1.51 Tue Jul 9 22:17:34 2019
+++ src/distrib/sets/lists/xdebug/shl.mi Sat Jul 20 02:06:12 2019
@@ -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
Index: src/external/mit/xorg/lib/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/Makefile:1.21 src/external/mit/xorg/lib/freetype/Makefile:1.22
--- src/external/mit/xorg/lib/freetype/Makefile:1.21 Wed Jun 6 02:20:07 2018
+++ src/external/mit/xorg/lib/freetype/Makefile Sat Jul 20 02:06:12 2019
@@ -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 @@ INCSDIR=${X11INCDIR}/freetype2
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 @@ LIBDPLIBS= \
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>
Index: src/external/mit/xorg/lib/freetype/shlib_version
diff -u src/external/mit/xorg/lib/freetype/shlib_version:1.12 src/external/mit/xorg/lib/freetype/shlib_version:1.13
--- src/external/mit/xorg/lib/freetype/shlib_version:1.12 Wed Jun 6 03:09:12 2018
+++ src/external/mit/xorg/lib/freetype/shlib_version Sat Jul 20 02:06:12 2019
@@ -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
