Module Name: src Committed By: mrg Date: Sun Feb 23 09:24:12 UTC 2020
Modified Files: src/external/mit/xorg/lib/libXfont2: Makefile src/external/mit/xorg/lib/libXvMCW: Makefile Log Message: fix libXfont2 build, and (for now) remove new XvMCW pkg-config file. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libXfont2/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libXvMCW/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/mit/xorg/lib/libXfont2/Makefile diff -u src/external/mit/xorg/lib/libXfont2/Makefile:1.5 src/external/mit/xorg/lib/libXfont2/Makefile:1.6 --- src/external/mit/xorg/lib/libXfont2/Makefile:1.5 Fri Aug 3 02:23:09 2018 +++ src/external/mit/xorg/lib/libXfont2/Makefile Sun Feb 23 09:24:12 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2018/08/03 02:23:09 kamil Exp $ +# $NetBSD: Makefile,v 1.6 2020/02/23 09:24:12 mrg Exp $ .include <bsd.own.mk> @@ -25,7 +25,8 @@ SRCS.util= \ miscutil.c \ patcache.c \ private.c \ - utilbitmap.c + utilbitmap.c \ + reallocarray.c .PATH: ${XFONT2DIR}/src/util SRCS.fontfile= \ @@ -104,6 +105,7 @@ CPPFLAGS+= -DHAS_SNPRINTF -DHAVE_CONFIG_ CPPFLAGS+= -DBDFFORMAT -DSNFFORMAT -DPCFFORMAT -DX_GZIP_FONT_COMPRESSION -DX_BZIP2_FONT_COMPRESSION CPPFLAGS+= -DFONT_ENCODINGS_DIRECTORY=\"${X11LIBDIR}/X11/fonts/encodings/encodings.dir\" CPPFLAGS+= -I${XFONT2DIR}/src/stubs +CPPFLAGS+= -I${XFONT2DIR} CPPFLAGS+= -I${XFONT2DIR}/include CPPFLAGS+= -I${XFONT2DIR}/../include CPPFLAGS+= -I${DESTDIR}${X11INCDIR} Index: src/external/mit/xorg/lib/libXvMCW/Makefile diff -u src/external/mit/xorg/lib/libXvMCW/Makefile:1.4 src/external/mit/xorg/lib/libXvMCW/Makefile:1.5 --- src/external/mit/xorg/lib/libXvMCW/Makefile:1.4 Sun Feb 23 09:10:51 2020 +++ src/external/mit/xorg/lib/libXvMCW/Makefile Sun Feb 23 09:24:12 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2020/02/23 09:10:51 mrg Exp $ +# $NetBSD: Makefile,v 1.5 2020/02/23 09:24:12 mrg Exp $ .include <bsd.own.mk> @@ -19,7 +19,9 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \ COPTS.XvMCWrapper.c= ${GCC_NO_STRINGOP_OVERFLOW} -PKGDIST= xvmc-wrapper +# XXX +#PKGDIST= xvmc-wrapper +#.PATH: ${X11SRCDIR.XvMC} .include <bsd.x11.mk> .include <bsd.lib.mk>