Module Name: src
Committed By: mrg
Date: Sun Feb 23 09:10:51 UTC 2020
Modified Files:
src/external/mit/xorg/include/xorgproto/X11/extensions: Makefile
src/external/mit/xorg/lib/libX11: Makefile
src/external/mit/xorg/lib/libXvMC: Makefile
src/external/mit/xorg/lib/libXvMCW: Makefile
Added Files:
src/external/mit/xorg/lib/libX11/extensions: Makefile
Log Message:
updates for xorgproto 2019.2, libX11 1.6.9, and libXvMC 1.0.12.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile
cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/lib/libX11/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libX11/extensions/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libXvMC/Makefile
cvs rdiff -u -r1.3 -r1.4 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/include/xorgproto/X11/extensions/Makefile
diff -u src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile:1.1 src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile:1.2
--- src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile:1.1 Wed Mar 14 08:55:36 2018
+++ src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile Sun Feb 23 09:10:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/03/14 08:55:36 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2020/02/23 09:10:50 mrg Exp $
.include <bsd.own.mk>
@@ -11,7 +11,6 @@ INCS= EVI.h \
XI2proto.h \
XIproto.h \
XKB.h \
- XKBgeom.h \
XKBproto.h \
XKBsrv.h \
XKBstr.h \
@@ -70,7 +69,6 @@ INCS= EVI.h \
syncconst.h \
syncproto.h \
syncstr.h \
- vldXvMC.h \
xcmiscproto.h \
xcmiscstr.h \
xf86bigfont.h \
Index: src/external/mit/xorg/lib/libX11/Makefile
diff -u src/external/mit/xorg/lib/libX11/Makefile:1.13 src/external/mit/xorg/lib/libX11/Makefile:1.14
--- src/external/mit/xorg/lib/libX11/Makefile:1.13 Sun Jul 19 08:18:32 2015
+++ src/external/mit/xorg/lib/libX11/Makefile Sun Feb 23 09:10:50 2020
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2015/07/19 08:18:32 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2020/02/23 09:10:50 mrg Exp $
.include <bsd.own.mk>
SUBDIR= dynamic .WAIT libX11-xcb static \
- ximcp xlcDef xlcUTF8Load xlibi18n xomGeneric
+ ximcp xlcDef xlcUTF8Load xlibi18n xomGeneric \
+ extensions
INCS= ImUtil.h XKBlib.h Xcms.h Xlib-xcb.h Xlib.h XlibConf.h \
Xlibint.h Xlocale.h Xregion.h Xresource.h Xutil.h \
Index: src/external/mit/xorg/lib/libXvMC/Makefile
diff -u src/external/mit/xorg/lib/libXvMC/Makefile:1.4 src/external/mit/xorg/lib/libXvMC/Makefile:1.5
--- src/external/mit/xorg/lib/libXvMC/Makefile:1.4 Sun Mar 16 22:53:17 2014
+++ src/external/mit/xorg/lib/libXvMC/Makefile Sun Feb 23 09:10:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/03/16 22:53:17 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2020/02/23 09:10:50 mrg Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@ LIB= XvMC
SRCS= XvMC.c
-INCS= XvMClib.h
+INCS= XvMClib.h vldXvMC.h
INCSDIR=${X11INCDIR}/X11/extensions
CPPFLAGS+= ${X11FLAGS.THREADLIB}
Index: src/external/mit/xorg/lib/libXvMCW/Makefile
diff -u src/external/mit/xorg/lib/libXvMCW/Makefile:1.3 src/external/mit/xorg/lib/libXvMCW/Makefile:1.4
--- src/external/mit/xorg/lib/libXvMCW/Makefile:1.3 Sun Oct 13 07:28:08 2019
+++ src/external/mit/xorg/lib/libXvMCW/Makefile Sun Feb 23 09:10:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/10/13 07:28:08 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2020/02/23 09:10:51 mrg Exp $
.include <bsd.own.mk>
@@ -19,5 +19,7 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \
COPTS.XvMCWrapper.c= ${GCC_NO_STRINGOP_OVERFLOW}
+PKGDIST= xvmc-wrapper
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Added files:
Index: src/external/mit/xorg/lib/libX11/extensions/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libX11/extensions/Makefile:1.1
--- /dev/null Sun Feb 23 09:10:51 2020
+++ src/external/mit/xorg/lib/libX11/extensions/Makefile Sun Feb 23 09:10:50 2020
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2020/02/23 09:10:50 mrg Exp $
+
+NOPROG= yes
+
+INCS= XKBgeom.h
+INCSDIR=${X11INCDIR}/X11/extensions
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
