Module Name: src
Committed By: martin
Date: Wed Feb 11 09:43:58 UTC 2015
Modified Files:
src/distrib/sets/lists/xcomp [netbsd-7]: mi
src/external/mit/xorg/lib/freetype [netbsd-7]: Makefile freetype2.pc.in
src/external/mit/xorg/lib/freetype/freetype [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by ryoon in ticket #504):
external/mit/xorg/lib/freetype/Makefile: revision 1.14
distrib/sets/lists/xcomp/mi: revision 1.156
external/mit/xorg/lib/freetype/freetype2.pc.in: revision 1.3
external/mit/xorg/lib/freetype/freetype/Makefile: revision 1.18
In recent freetype2 installation, ft2build.h should be located
under include/freetype2.
This change should fix non pkg-config build that uses freetype2,
for example, pkgsrc/lang/openjdk8.
To generate a diff of this commit:
cvs rdiff -u -r1.152.2.2 -r1.152.2.3 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.12.4.1 -r1.12.4.2 \
src/external/mit/xorg/lib/freetype/Makefile
cvs rdiff -u -r1.2 -r1.2.4.1 \
src/external/mit/xorg/lib/freetype/freetype2.pc.in
cvs rdiff -u -r1.17 -r1.17.4.1 \
src/external/mit/xorg/lib/freetype/freetype/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/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.152.2.2 src/distrib/sets/lists/xcomp/mi:1.152.2.3
--- src/distrib/sets/lists/xcomp/mi:1.152.2.2 Mon Jan 5 21:23:51 2015
+++ src/distrib/sets/lists/xcomp/mi Wed Feb 11 09:43:58 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.152.2.2 2015/01/05 21:23:51 martin Exp $
+# $NetBSD: mi,v 1.152.2.3 2015/02/11 09:43:58 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5745,6 +5745,7 @@
./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/ft2build.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
@@ -5788,7 +5789,7 @@
./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/ft2build.h xcomp-obsolete obsolete
./usr/X11R7/include/libdrm/drm.h -unknown- xorg
./usr/X11R7/include/libdrm/drm_fourcc.h -unknown- xorg
./usr/X11R7/include/libdrm/drm_mode.h -unknown- xorg
Index: src/external/mit/xorg/lib/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/Makefile:1.12.4.1 src/external/mit/xorg/lib/freetype/Makefile:1.12.4.2
--- src/external/mit/xorg/lib/freetype/Makefile:1.12.4.1 Mon Jan 26 16:20:48 2015
+++ src/external/mit/xorg/lib/freetype/Makefile Wed Feb 11 09:43:58 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12.4.1 2015/01/26 16:20:48 martin Exp $
+# $NetBSD: Makefile,v 1.12.4.2 2015/02/11 09:43:58 martin Exp $
.include <bsd.own.mk>
@@ -77,10 +77,6 @@ SRCS+= type42.c
.PATH: ${FREETYPE}/src/winfonts
SRCS+= winfnt.c
-.PATH: ${FREETYPE}/include
-INCS= ft2build.h
-INCSDIR=${X11INCDIR}
-
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= -DFT_CONFIG_OPTION_SYSTEM_ZLIB \
-DFT_CONFIG_CONFIG_H="<ftconfig.h>" \
Index: src/external/mit/xorg/lib/freetype/freetype2.pc.in
diff -u src/external/mit/xorg/lib/freetype/freetype2.pc.in:1.2 src/external/mit/xorg/lib/freetype/freetype2.pc.in:1.2.4.1
--- src/external/mit/xorg/lib/freetype/freetype2.pc.in:1.2 Thu Mar 20 08:57:48 2014
+++ src/external/mit/xorg/lib/freetype/freetype2.pc.in Wed Feb 11 09:43:58 2015
@@ -1,11 +1,11 @@
prefix=@prefix@
exec_prefix=${prefix}
libdir=${prefix}/lib
-includedir=${prefix}/include
+includedir=${prefix}/include/freetype2
Name: FreeType 2
Description: A free, high-quality, and portable font engine.
Version: @VERSION@
Requires:
Libs: -L${libdir} -lfreetype -lz -lbz2
-Cflags: -I${includedir}/freetype2 -I${includedir}
+Cflags: -I${includedir}
Index: src/external/mit/xorg/lib/freetype/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/Makefile:1.17 src/external/mit/xorg/lib/freetype/freetype/Makefile:1.17.4.1
--- src/external/mit/xorg/lib/freetype/freetype/Makefile:1.17 Thu Mar 20 22:23:30 2014
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile Wed Feb 11 09:43:58 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/03/20 22:23:30 mrg Exp $
+# $NetBSD: Makefile,v 1.17.4.1 2015/02/11 09:43:58 martin Exp $
.include <bsd.own.mk>
@@ -15,7 +15,7 @@ INCS= freetype.h ftadvanc.h ftbbox.h ftb
ftpfr.h ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h \
ftsystem.h fttrigon.h fttypes.h ftwinfnt.h ftxf86.h \
t1tables.h ttnameid.h tttables.h tttags.h ttunpat.h \
- ftautoh.h ftcffdrv.h
+ ftautoh.h ftcffdrv.h ft2build.h
SCRIPTS= freetype-config
