[src/trunk]: src Install compositeext.h and shmint.h from X.org.

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

details:   https://anonhg.NetBSD.org/src/rev/dbf91b5ce304
branches:  trunk
changeset: 328388:dbf91b5ce304
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Apr 02 01:22:11 2014 +0000

description:
Install compositeext.h and shmint.h from X.org.

diffstat:

 distrib/sets/lists/xcomp/mi                           |   4 +++-
 external/mit/xorg/server/xorg-server/include/Makefile |  10 ++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diffs (61 lines):

diff -r 48860b019b8a -r dbf91b5ce304 distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/xcomp/mi       Wed Apr 02 00:46:11 2014 +0000
+++ b/distrib/sets/lists/xcomp/mi       Wed Apr 02 01:22:11 2014 +0000
@@ -1,4 +1,4 @@
-#       $NetBSD: mi,v 1.150 2014/03/22 13:40:55 njoly Exp $
+#       $NetBSD: mi,v 1.151 2014/04/02 01:22:11 riastradh Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -5880,6 +5880,7 @@
 ./usr/X11R7/include/xorg/colormap.h                    -unknown-       xorg
 ./usr/X11R7/include/xorg/colormapst.h                  -unknown-       xorg
 ./usr/X11R7/include/xorg/compiler.h                    -unknown-       xorg
+./usr/X11R7/include/xorg/compositeext.h                        -unknown-       xorg
 ./usr/X11R7/include/xorg/cursor.h                      -unknown-       xorg
 ./usr/X11R7/include/xorg/cursorstr.h                   -unknown-       xorg
 ./usr/X11R7/include/xorg/damage.h                      -unknown-       xorg
@@ -5973,6 +5974,7 @@
 ./usr/X11R7/include/xorg/set.h                         -unknown-       xorg
 ./usr/X11R7/include/xorg/shadow.h                      -unknown-       xorg
 ./usr/X11R7/include/xorg/shadowfb.h                    -unknown-       xorg
+./usr/X11R7/include/xorg/shmint.h                      -unknown-       xorg
 ./usr/X11R7/include/xorg/site.h                                -unknown-       xorg
 ./usr/X11R7/include/xorg/swaprep.h                     -unknown-       xorg
 ./usr/X11R7/include/xorg/swapreq.h                     -unknown-       xorg
diff -r 48860b019b8a -r dbf91b5ce304 external/mit/xorg/server/xorg-server/include/Makefile
--- a/external/mit/xorg/server/xorg-server/include/Makefile     Wed Apr 02 00:46:11 2014 +0000
+++ b/external/mit/xorg/server/xorg-server/include/Makefile     Wed Apr 02 01:22:11 2014 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.10 2011/08/02 07:56:33 mrg Exp $
+#      $NetBSD: Makefile,v 1.11 2014/04/02 01:22:11 riastradh Exp $
 
 .include <bsd.own.mk>
 
 XORGSRC=       ${X11SRCDIR.xorg-server}
 
-XORGINC_SUBDIR=        Xext dbe exa fb include mi \
+XORGINC_SUBDIR=        Xext composite dbe exa fb include mi \
                miext/damage miext/shadow randr render xkb record
 XF86_SUBDIR=   common ddc dixmods/extmod dri fbdevhw i2c int10 modes \
                os-support os-support/bus parser rac ramdac shadowfb \
@@ -24,7 +24,8 @@
 INCS=  BT.h IBM.h TI.h XIstubs.h Xprintf.h \
        bt829.h \
        callback.h closestr.h closure.h colormap.h \
-       colormapst.h compiler.h cursor.h cursorstr.h damage.h damagestr.h \
+       colormapst.h compiler.h compositeext.h cursor.h cursorstr.h \
+       damage.h damagestr.h \
        dbestruct.h dgaproc.h dix.h dixevents.h dixfont.h dixfontstr.h \
        dixgrabs.h dixstruct.h dri.h dristruct.h edid.h exa.h exevents.h \
        eventconvert.h events.h eventstr.h list.h \
@@ -38,7 +39,8 @@
        protocol-versions.h \
        propertyst.h randrstr.h region.h regionstr.h resource.h \
        rgb.h sarea.h screenint.h scrnintstr.h selection.h servermd.h \
-       shadow.h shadowfb.h site.h swaprep.h swapreq.h tda8425.h tda9850.h \
+       shadow.h shadowfb.h shmint.h site.h swaprep.h swapreq.h \
+       tda8425.h tda9850.h \
        tda9885.h uda1380.h validate.h vbe.h vbeModes.h vgaHW.h \
        window.h windowstr.h xaa.h xaalocal.h xaarop.h \
        xkbDflts.h xkb.h set.h \