[src/trunk]: src/external/mit/xorg updates for xorgproto 2019.2, libX11 1.6.9...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a6e7d20db8eb
branches:  trunk
changeset: 745144:a6e7d20db8eb
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Feb 23 09:10:50 2020 +0000

description:
updates for xorgproto 2019.2, libX11 1.6.9, and libXvMC 1.0.12.

diffstat:

 external/mit/xorg/include/xorgproto/X11/extensions/Makefile |  4 +---
 external/mit/xorg/lib/libX11/Makefile                       |  5 +++--
 external/mit/xorg/lib/libX11/extensions/Makefile            |  9 +++++++++
 external/mit/xorg/lib/libXvMC/Makefile                      |  4 ++--
 external/mit/xorg/lib/libXvMCW/Makefile                     |  4 +++-
 5 files changed, 18 insertions(+), 8 deletions(-)

diffs (89 lines):

diff -r ede7b3ca114f -r a6e7d20db8eb external/mit/xorg/include/xorgproto/X11/extensions/Makefile
--- a/external/mit/xorg/include/xorgproto/X11/extensions/Makefile       Sun Feb 23 08:57:44 2020 +0000
+++ b/external/mit/xorg/include/xorgproto/X11/extensions/Makefile       Sun Feb 23 09:10:50 2020 +0000
@@ -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 @@
        XI2proto.h \
        XIproto.h \
        XKB.h \
-       XKBgeom.h \
        XKBproto.h \
        XKBsrv.h \
        XKBstr.h \
@@ -70,7 +69,6 @@
        syncconst.h \
        syncproto.h \
        syncstr.h \
-       vldXvMC.h \
        xcmiscproto.h \
        xcmiscstr.h \
        xf86bigfont.h \
diff -r ede7b3ca114f -r a6e7d20db8eb external/mit/xorg/lib/libX11/Makefile
--- a/external/mit/xorg/lib/libX11/Makefile     Sun Feb 23 08:57:44 2020 +0000
+++ b/external/mit/xorg/lib/libX11/Makefile     Sun Feb 23 09:10:50 2020 +0000
@@ -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 \
diff -r ede7b3ca114f -r a6e7d20db8eb external/mit/xorg/lib/libX11/extensions/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libX11/extensions/Makefile  Sun Feb 23 09:10:50 2020 +0000
@@ -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>
diff -r ede7b3ca114f -r a6e7d20db8eb external/mit/xorg/lib/libXvMC/Makefile
--- a/external/mit/xorg/lib/libXvMC/Makefile    Sun Feb 23 08:57:44 2020 +0000
+++ b/external/mit/xorg/lib/libXvMC/Makefile    Sun Feb 23 09:10:50 2020 +0000
@@ -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 @@
 
 SRCS=  XvMC.c
 
-INCS=  XvMClib.h
+INCS=  XvMClib.h vldXvMC.h
 INCSDIR=${X11INCDIR}/X11/extensions
 
 CPPFLAGS+=     ${X11FLAGS.THREADLIB}
diff -r ede7b3ca114f -r a6e7d20db8eb external/mit/xorg/lib/libXvMCW/Makefile
--- a/external/mit/xorg/lib/libXvMCW/Makefile   Sun Feb 23 08:57:44 2020 +0000
+++ b/external/mit/xorg/lib/libXvMCW/Makefile   Sun Feb 23 09:10:50 2020 +0000
@@ -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 @@
 
 COPTS.XvMCWrapper.c=   ${GCC_NO_STRINGOP_OVERFLOW}
 
+PKGDIST=       xvmc-wrapper
+
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>