Module Name: src
Committed By: riastradh
Date: Wed Apr 2 01:22:11 UTC 2014
Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/server/xorg-server/include: Makefile
Log Message:
Install compositeext.h and shmint.h from X.org.
To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/include/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.150 src/distrib/sets/lists/xcomp/mi:1.151
--- src/distrib/sets/lists/xcomp/mi:1.150 Sat Mar 22 13:40:55 2014
+++ src/distrib/sets/lists/xcomp/mi Wed Apr 2 01:22:11 2014
@@ -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
Index: src/external/mit/xorg/server/xorg-server/include/Makefile
diff -u src/external/mit/xorg/server/xorg-server/include/Makefile:1.10 src/external/mit/xorg/server/xorg-server/include/Makefile:1.11
--- src/external/mit/xorg/server/xorg-server/include/Makefile:1.10 Tue Aug 2 07:56:33 2011
+++ src/external/mit/xorg/server/xorg-server/include/Makefile Wed Apr 2 01:22:11 2014
@@ -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 @@ INCSDIR=${X11INCDIR}/xorg
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 @@ INCS= BT.h IBM.h TI.h XIstubs.h Xprintf.
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 \
