Module Name: src
Committed By: mrg
Date: Mon Jul 20 04:10:41 UTC 2015
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xcomp: mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg: xorg-pkg-ver.mk
src/external/mit/xorg/lib/freetype: Makefile shlib_version
src/external/mit/xorg/lib/freetype/freetype: Makefile
src/external/mit/xorg/tools/fc-cache: Makefile
src/external/mit/xorg/tools/mkfontscale: Makefile
Log Message:
updates for freetype 2.6.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.171 -r1.172 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/xorg-pkg-ver.mk
cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/lib/freetype/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/freetype/shlib_version
cvs rdiff -u -r1.19 -r1.20 \
src/external/mit/xorg/lib/freetype/freetype/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/tools/fc-cache/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/tools/mkfontscale/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.66 src/distrib/sets/lists/xbase/shl.mi:1.67
--- src/distrib/sets/lists/xbase/shl.mi:1.66 Mon Jul 20 03:14:12 2015
+++ src/distrib/sets/lists/xbase/shl.mi Mon Jul 20 04:10:40 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.66 2015/07/20 03:14:12 mrg Exp $
+# $NetBSD: shl.mi,v 1.67 2015/07/20 04:10:40 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -322,8 +322,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.17 -unknown- xorg,compatx11file
-./usr/X11R7/lib/libfreetype.so.17.4.11 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libfreetype.so.18 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libfreetype.so.18.0.12 -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/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.171 src/distrib/sets/lists/xcomp/mi:1.172
--- src/distrib/sets/lists/xcomp/mi:1.171 Sat Jul 11 22:20:20 2015
+++ src/distrib/sets/lists/xcomp/mi Mon Jul 20 04:10:41 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.171 2015/07/11 22:20:20 christos Exp $
+# $NetBSD: mi,v 1.172 2015/07/20 04:10:41 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5780,10 +5780,11 @@
./usr/X11R7/include/freetype2/ftstroke.h -unknown- xorg
./usr/X11R7/include/freetype2/ftsynth.h -unknown- xorg
./usr/X11R7/include/freetype2/ftsystem.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftfntfmt.h -unknown- xorg
./usr/X11R7/include/freetype2/fttrigon.h -unknown- xorg
./usr/X11R7/include/freetype2/fttypes.h -unknown- xorg
./usr/X11R7/include/freetype2/ftwinfnt.h -unknown- xorg
-./usr/X11R7/include/freetype2/ftxf86.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftxf86.h -unknown- obsolete
./usr/X11R7/include/freetype2/t1tables.h -unknown- xorg
./usr/X11R7/include/freetype2/ttnameid.h -unknown- xorg
./usr/X11R7/include/freetype2/tttables.h -unknown- xorg
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.28 src/distrib/sets/lists/xdebug/shl.mi:1.29
--- src/distrib/sets/lists/xdebug/shl.mi:1.28 Mon Jul 20 03:14:12 2015
+++ src/distrib/sets/lists/xdebug/shl.mi Mon Jul 20 04:10:41 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.28 2015/07/20 03:14:12 mrg Exp $
+# $NetBSD: shl.mi,v 1.29 2015/07/20 04:10:41 mrg Exp $
./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug
@@ -105,7 +105,7 @@
./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/libfontenc.so.2.0.debug -unknown- xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.17.4.11.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.18.0.12.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libglapi.so.0.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/libglut.so.4.0.debug -unknown- xorg,debug,compatx11file
Index: src/external/mit/xorg/xorg-pkg-ver.mk
diff -u src/external/mit/xorg/xorg-pkg-ver.mk:1.2 src/external/mit/xorg/xorg-pkg-ver.mk:1.3
--- src/external/mit/xorg/xorg-pkg-ver.mk:1.2 Mon Jul 20 02:07:36 2015
+++ src/external/mit/xorg/xorg-pkg-ver.mk Mon Jul 20 04:10:40 2015
@@ -1,10 +1,14 @@
-# $NetBSD: xorg-pkg-ver.mk,v 1.2 2015/07/20 02:07:36 mrg Exp $
+# $NetBSD: xorg-pkg-ver.mk,v 1.3 2015/07/20 04:10:40 mrg Exp $
# when including this make sure PROG is set so that $X11SRCDIR.$PROG
# is a valid setting. set XORG_PKG_VER_PROG if PROG is wrong.
+# set XORG_PKG_VER_CONFIG_PATH if "configure" at the top-level is wrong.
XORG_PKG_VER_PROG?= ${PROG}
+XORG_PKG_VER_CONFIG_PATH?= configure
+_XORG_PKG_CONFIGURE_PATH= ${X11SRCDIR.${XORG_PKG_VER_PROG}}/${XORG_PKG_VER_CONFIG_PATH}
+
.if exists(${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure)
XORG_PKG_PACKAGE_VERSION!= \
awk -F= '/^PACKAGE_VERSION=/ { \
Index: src/external/mit/xorg/lib/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/Makefile:1.15 src/external/mit/xorg/lib/freetype/Makefile:1.16
--- src/external/mit/xorg/lib/freetype/Makefile:1.15 Thu Mar 12 07:58:04 2015
+++ src/external/mit/xorg/lib/freetype/Makefile Mon Jul 20 04:10:40 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2015/03/12 07:58:04 snj Exp $
+# $NetBSD: Makefile,v 1.16 2015/07/20 04:10:40 mrg Exp $
.include <bsd.own.mk>
@@ -9,9 +9,9 @@ FREETYPE= ${X11SRCDIR.${LIB}}
SUBDIR= freetype
.PATH: ${FREETYPE}/src/base
-SRCS= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftfstype.c ftglyph.c \
- ftinit.c ftlcdfil.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
- ftsystem.c fttype1.c ftwinfnt.c ftxf86.c ftbitmap.c ftcid.c \
+SRCS= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftfntfmt.c ftfstype.c \
+ ftglyph.c ftinit.c ftlcdfil.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 ftpfr.c
.PATH: ${FREETYPE}/src/autofit
@@ -96,7 +96,7 @@ LIBDPLIBS= \
PKGCONFIG= freetype2
PKGDIST.freetype2= ${.CURDIR}
-PKGCONFIG_VERSION.freetype2= 17.4.11
+PKGCONFIG_VERSION.freetype2= ${SHLIB_MAJOR}.${SHLIB_MINOR}.${SHLIB_TEENY}
.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.8 src/external/mit/xorg/lib/freetype/shlib_version:1.9
--- src/external/mit/xorg/lib/freetype/shlib_version:1.8 Thu Mar 12 07:58:04 2015
+++ src/external/mit/xorg/lib/freetype/shlib_version Mon Jul 20 04:10:40 2015
@@ -1,5 +1,6 @@
-# $NetBSD: shlib_version,v 1.8 2015/03/12 07:58:04 snj Exp $
+# $NetBSD: shlib_version,v 1.9 2015/07/20 04:10:40 mrg Exp $
#
-major=17
-minor=4
-teeny=11
+# try to keep this in sync with builds/unix/configure.ac:version_info=
+major=18
+minor=0
+teeny=12
Index: src/external/mit/xorg/lib/freetype/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/Makefile:1.19 src/external/mit/xorg/lib/freetype/freetype/Makefile:1.20
--- src/external/mit/xorg/lib/freetype/freetype/Makefile:1.19 Thu Mar 12 08:01:45 2015
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile Mon Jul 20 04:10:40 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2015/03/12 08:01:45 snj Exp $
+# $NetBSD: Makefile,v 1.20 2015/07/20 04:10:40 mrg Exp $
.include <bsd.own.mk>
@@ -9,11 +9,11 @@ SUBDIR= config
INCSDIR=${X11INCDIR}/freetype2
INCS= freetype.h ftadvanc.h ftbbox.h ftbdf.h ftbitmap.h ftbzip2.h ftcache.h \
- ftchapters.h ftcid.h fterrdef.h fterrors.h ftgasp.h ftglyph.h \
- ftgxval.h ftgzip.h ftimage.h ftincrem.h ftlcdfil.h ftlist.h \
+ ftchapters.h ftcid.h fterrdef.h fterrors.h ftfntfmt.h ftgasp.h \
+ ftglyph.h ftgxval.h ftgzip.h ftimage.h ftincrem.h ftlcdfil.h ftlist.h \
ftlzw.h ftmac.h ftmm.h ftmodapi.h ftmoderr.h ftotval.h ftoutln.h \
ftpfr.h ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h \
- ftsystem.h fttrigon.h fttypes.h ftwinfnt.h ftxf86.h \
+ ftsystem.h fttrigon.h fttypes.h ftwinfnt.h \
t1tables.h ttnameid.h tttables.h tttags.h ttunpat.h \
ftautoh.h ftcffdrv.h ft2build.h
Index: src/external/mit/xorg/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.9 src/external/mit/xorg/tools/fc-cache/Makefile:1.10
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.9 Thu Mar 20 08:05:30 2014
+++ src/external/mit/xorg/tools/fc-cache/Makefile Mon Jul 20 04:10:40 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/03/20 08:05:30 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2015/07/20 04:10:40 mrg Exp $
NOMAN= 1
@@ -22,9 +22,9 @@ SRCS.fontconfig= fcatomic.c fcblanks.c f
ftglue.c
.PATH: ${FREETYPE}/src/base
-SRCS.freetype= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftglyph.c \
- ftinit.c ftmm.c ftpfr.c ftstroke.c ftsynth.c ftsystem.c \
- fttype1.c ftwinfnt.c ftxf86.c ftbitmap.c
+SRCS.freetype= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftfntfmt.c \
+ ftglyph.c ftinit.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
+ ftsystem.c fttype1.c ftwinfnt.c ftbitmap.c
.PATH: ${FREETYPE}/src/autofit
SRCS.freetype+= autofit.c
Index: src/external/mit/xorg/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.5 src/external/mit/xorg/tools/mkfontscale/Makefile:1.6
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.5 Fri Jul 17 06:40:49 2015
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Mon Jul 20 04:10:40 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/07/17 06:40:49 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2015/07/20 04:10:40 mrg Exp $
NOMAN= 1
@@ -12,9 +12,9 @@ FREETYPE= ${X11SRCDIR.freetype}
SRCS.mkfontscale= mkfontscale.c list.c hash.c ident.c
.PATH: ${FREETYPE}/src/base
-SRCS.freetype+= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftglyph.c \
- ftinit.c ftmm.c ftpfr.c ftstroke.c ftsynth.c ftsystem.c \
- fttype1.c ftwinfnt.c ftxf86.c ftbitmap.c
+SRCS.freetype+= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftfntfmt.c \
+ ftglyph.c ftinit.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
+ ftsystem.c fttype1.c ftwinfnt.c ftbitmap.c
.PATH: ${FREETYPE}/src/autofit
SRCS.freetype+= autofit.c
