Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src merge freetype 2.5.3.
details: https://anonhg.NetBSD.org/src/rev/74bdaa8904fa
branches: trunk
changeset: 327895:74bdaa8904fa
user: mrg <mrg%NetBSD.org@localhost>
date: Thu Mar 20 08:57:48 2014 +0000
description:
merge freetype 2.5.3.
diffstat:
distrib/sets/lists/xbase/mi | 17 +-
distrib/sets/lists/xbase/shl.mi | 6 +-
distrib/sets/lists/xcomp/mi | 149 ++++++++++-----
etc/mtree/NetBSD.dist.Xorg | 12 +-
external/mit/xorg/lib/freetype/Makefile | 4 +-
external/mit/xorg/lib/freetype/freetype/Makefile | 6 +-
external/mit/xorg/lib/freetype/freetype/cache/Makefile | 6 +-
external/mit/xorg/lib/freetype/freetype/config/Makefile | 6 +-
external/mit/xorg/lib/freetype/freetype2.pc.in | 2 +-
external/mit/xorg/lib/freetype/shlib_version | 9 +-
10 files changed, 135 insertions(+), 82 deletions(-)
diffs (truncated from 342 to 300 lines):
diff -r fb55c5acd070 -r 74bdaa8904fa distrib/sets/lists/xbase/mi
--- a/distrib/sets/lists/xbase/mi Thu Mar 20 08:05:30 2014 +0000
+++ b/distrib/sets/lists/xbase/mi Thu Mar 20 08:57:48 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.120 2014/03/16 23:25:15 mrg Exp $
+# $NetBSD: mi,v 1.121 2014/03/20 09:05:28 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1519,11 +1519,16 @@
./usr/X11R7/include/drm base-x11-root obsolete
./usr/X11R7/include/fontconfig base-x11-root xorg
./usr/X11R7/include/freetype2 base-x11-root xorg
-./usr/X11R7/include/freetype2/freetype base-x11-root xorg
-./usr/X11R7/include/freetype2/freetype/cache base-x11-root xorg
-./usr/X11R7/include/freetype2/freetype/config base-x11-root xorg
-./usr/X11R7/include/freetype2/freetype/internal base-x11-root xorg
-./usr/X11R7/include/freetype2/freetype/internal/services base-x11-root xorg
+./usr/X11R7/include/freetype2/freetype base-obsolete obsolete
+./usr/X11R7/include/freetype2/freetype/cache base-obsolete obsolete
+./usr/X11R7/include/freetype2/freetype/config base-obsolete obsolete
+./usr/X11R7/include/freetype2/freetype/internal base-obsolete obsolete
+./usr/X11R7/include/freetype2/freetype/internal/services base-obsolete obsolete
+./usr/X11R7/include/freetype2 base-x11-root xorg
+./usr/X11R7/include/freetype2/cache base-x11-root xorg
+./usr/X11R7/include/freetype2/config base-x11-root xorg
+./usr/X11R7/include/freetype2/internal base-x11-root xorg
+./usr/X11R7/include/freetype2/internal/services base-x11-root xorg
./usr/X11R7/include/libdrm base-x11-root xorg
./usr/X11R7/include/libkms base-x11-root xorg
./usr/X11R7/include/pixman-1 base-x11-root xorg
diff -r fb55c5acd070 -r 74bdaa8904fa distrib/sets/lists/xbase/shl.mi
--- a/distrib/sets/lists/xbase/shl.mi Thu Mar 20 08:05:30 2014 +0000
+++ b/distrib/sets/lists/xbase/shl.mi Thu Mar 20 08:57:48 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.54 2014/03/17 07:25:34 mrg Exp $
+# $NetBSD: shl.mi,v 1.55 2014/03/20 09:05:28 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -319,8 +319,8 @@
./usr/X11R7/lib/libfontenc.so.2 -unknown- xorg
./usr/X11R7/lib/libfontenc.so.2.0 -unknown- xorg
./usr/X11R7/lib/libfreetype.so -unknown- xorg
-./usr/X11R7/lib/libfreetype.so.7 -unknown- xorg
-./usr/X11R7/lib/libfreetype.so.7.4 -unknown- xorg
+./usr/X11R7/lib/libfreetype.so.17 -unknown- xorg
+./usr/X11R7/lib/libfreetype.so.17.2.11 -unknown- xorg
./usr/X11R7/lib/libglut.so -unknown- xorg
./usr/X11R7/lib/libglut.so.4 -unknown- xorg
./usr/X11R7/lib/libglut.so.4.0 -unknown- xorg
diff -r fb55c5acd070 -r 74bdaa8904fa distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/xcomp/mi Thu Mar 20 08:05:30 2014 +0000
+++ b/distrib/sets/lists/xcomp/mi Thu Mar 20 08:57:48 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.148 2014/03/17 08:11:32 mrg Exp $
+# $NetBSD: mi,v 1.149 2014/03/20 09:05:28 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5658,50 +5658,50 @@
./usr/X11R7/include/fontconfig/fcfreetype.h -unknown- xorg
./usr/X11R7/include/fontconfig/fcprivate.h -unknown- xorg
./usr/X11R7/include/fontconfig/fontconfig.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/config/ftconfig.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/config/ftheader.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/config/ftmodule.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/config/ftoption.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/config/ftstdlib.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/freetype.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftadvanc.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftautoh.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftbbox.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftbdf.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftbitmap.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftbzip2.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftcache.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftcffdrv.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftchapters.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftcid.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/fterrdef.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/fterrors.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftgasp.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftglyph.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftgxval.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftgzip.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftimage.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftincrem.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftlcdfil.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftlist.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftlzw.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftmac.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftmm.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftmodapi.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftmoderr.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftotval.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftoutln.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftpfr.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftrender.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftsizes.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftsnames.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftstroke.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftsynth.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftsystem.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/fttrigon.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/fttypes.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftwinfnt.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ftxf86.h -unknown- xorg
+./usr/X11R7/include/freetype2/freetype/config/ftconfig.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/config/ftheader.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/config/ftmodule.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/config/ftoption.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/config/ftstdlib.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/freetype.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftadvanc.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftautoh.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftbbox.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftbdf.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftbitmap.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftbzip2.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftcache.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftcffdrv.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftchapters.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftcid.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/fterrdef.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/fterrors.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftgasp.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftglyph.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftgxval.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftgzip.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftimage.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftincrem.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftlcdfil.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftlist.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftlzw.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftmac.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftmm.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftmodapi.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftmoderr.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftotval.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftoutln.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftpfr.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftrender.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftsizes.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftsnames.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftstroke.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftsynth.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftsystem.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/fttrigon.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/fttypes.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftwinfnt.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ftxf86.h -unknown- obsolete
./usr/X11R7/include/freetype2/freetype/internal/autohint.h -unknown- obsolete
./usr/X11R7/include/freetype2/freetype/internal/ftcalc.h -unknown- obsolete
./usr/X11R7/include/freetype2/freetype/internal/ftdebug.h -unknown- obsolete
@@ -5731,11 +5731,60 @@
./usr/X11R7/include/freetype2/freetype/internal/sfnt.h -unknown- obsolete
./usr/X11R7/include/freetype2/freetype/internal/t1types.h -unknown- obsolete
./usr/X11R7/include/freetype2/freetype/internal/tttypes.h -unknown- obsolete
-./usr/X11R7/include/freetype2/freetype/t1tables.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ttnameid.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/tttables.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/tttags.h -unknown- xorg
-./usr/X11R7/include/freetype2/freetype/ttunpat.h -unknown- xorg
+./usr/X11R7/include/freetype2/freetype/t1tables.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ttnameid.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/tttables.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/tttags.h -unknown- obsolete
+./usr/X11R7/include/freetype2/freetype/ttunpat.h -unknown- obsolete
+./usr/X11R7/include/freetype2/config/ftconfig.h -unknown- xorg
+./usr/X11R7/include/freetype2/config/ftheader.h -unknown- xorg
+./usr/X11R7/include/freetype2/config/ftmodule.h -unknown- xorg
+./usr/X11R7/include/freetype2/config/ftoption.h -unknown- xorg
+./usr/X11R7/include/freetype2/config/ftstdlib.h -unknown- xorg
+./usr/X11R7/include/freetype2/freetype.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftadvanc.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftautoh.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftbbox.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftbdf.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftbitmap.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftbzip2.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftcache.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftcffdrv.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftchapters.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftcid.h -unknown- xorg
+./usr/X11R7/include/freetype2/fterrdef.h -unknown- xorg
+./usr/X11R7/include/freetype2/fterrors.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftgasp.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftglyph.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftgxval.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftgzip.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftimage.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftincrem.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftlcdfil.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftlist.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftlzw.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftmac.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftmm.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftmodapi.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftmoderr.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftotval.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftoutln.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftpfr.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftrender.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftsizes.h -unknown- xorg
+./usr/X11R7/include/freetype2/ftsnames.h -unknown- xorg
+./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/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/t1tables.h -unknown- xorg
+./usr/X11R7/include/freetype2/ttnameid.h -unknown- xorg
+./usr/X11R7/include/freetype2/tttables.h -unknown- xorg
+./usr/X11R7/include/freetype2/tttags.h -unknown- xorg
+./usr/X11R7/include/freetype2/ttunpat.h -unknown- xorg
./usr/X11R7/include/ft2build.h -unknown- xorg
./usr/X11R7/include/libdrm/drm.h -unknown- xorg
./usr/X11R7/include/libdrm/drm_fourcc.h -unknown- xorg
diff -r fb55c5acd070 -r 74bdaa8904fa etc/mtree/NetBSD.dist.Xorg
--- a/etc/mtree/NetBSD.dist.Xorg Thu Mar 20 08:05:30 2014 +0000
+++ b/etc/mtree/NetBSD.dist.Xorg Thu Mar 20 08:57:48 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.Xorg,v 1.13 2014/03/16 23:25:15 mrg Exp $
+# $NetBSD: NetBSD.dist.Xorg,v 1.14 2014/03/20 09:05:28 mrg Exp $
./usr/X11R7
./usr/X11R7/bin
./usr/X11R7/include
@@ -21,11 +21,11 @@
./usr/X11R7/include/X11/pixmaps
./usr/X11R7/include/fontconfig
./usr/X11R7/include/freetype2
-./usr/X11R7/include/freetype2/freetype
-./usr/X11R7/include/freetype2/freetype/cache
-./usr/X11R7/include/freetype2/freetype/config
-./usr/X11R7/include/freetype2/freetype/internal
-./usr/X11R7/include/freetype2/freetype/internal/services
+./usr/X11R7/include/freetype2
+./usr/X11R7/include/freetype2/cache
+./usr/X11R7/include/freetype2/config
+./usr/X11R7/include/freetype2/internal
+./usr/X11R7/include/freetype2/internal/services
./usr/X11R7/include/libdrm
./usr/X11R7/include/libkms
./usr/X11R7/include/pixman-1
diff -r fb55c5acd070 -r 74bdaa8904fa external/mit/xorg/lib/freetype/Makefile
--- a/external/mit/xorg/lib/freetype/Makefile Thu Mar 20 08:05:30 2014 +0000
+++ b/external/mit/xorg/lib/freetype/Makefile Thu Mar 20 08:57:48 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/06/05 08:42:56 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2014/03/20 08:57:48 mrg Exp $
.include <bsd.own.mk>
@@ -87,7 +87,7 @@
-DFT2_BUILD_LIBRARY \
-DFT_CONFIG_MODULES_H="<ftmodule.h>"
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2 \
- -I${DESTDIR}${X11INCDIR}/freetype2/freetype/config \
+ -I${DESTDIR}${X11INCDIR}/freetype2/config \
-I${X11SRCDIR.${LIB}}/include
.if !defined(MKSUBPIXEL) || ${MKSUBPIXEL} != "no"
diff -r fb55c5acd070 -r 74bdaa8904fa external/mit/xorg/lib/freetype/freetype/Makefile
--- a/external/mit/xorg/lib/freetype/freetype/Makefile Thu Mar 20 08:05:30 2014 +0000
+++ b/external/mit/xorg/lib/freetype/freetype/Makefile Thu Mar 20 08:57:48 2014 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.15 2013/06/10 17:37:22 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2014/03/20 08:57:48 mrg Exp $
.include <bsd.own.mk>
SUBDIR= config
-.PATH: ${X11SRCDIR.freetype}/include/freetype
+.PATH: ${X11SRCDIR.freetype}/include
-INCSDIR=${X11INCDIR}/freetype2/freetype
+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 \
diff -r fb55c5acd070 -r 74bdaa8904fa external/mit/xorg/lib/freetype/freetype/cache/Makefile
--- a/external/mit/xorg/lib/freetype/freetype/cache/Makefile Thu Mar 20 08:05:30 2014 +0000
+++ b/external/mit/xorg/lib/freetype/freetype/cache/Makefile Thu Mar 20 08:57:48 2014 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/20 08:57:48 mrg Exp $
.include <bsd.own.mk>
-.PATH: ${X11SRCDIR.freetype}/include/freetype/cache
+.PATH: ${X11SRCDIR.freetype}/include/cache
-INCSDIR=${X11INCDIR}/freetype2/freetype/cache
+INCSDIR=${X11INCDIR}/freetype2/cache
INCS= ftcimage.h ftcmanag.h \
Home |
Main Index |
Thread Index |
Old Index