Module Name: src
Committed By: martin
Date: Sun Nov 9 13:22:59 UTC 2014
Modified Files:
src/distrib/sets/lists/xcomp [netbsd-7]: mi
src/external/mit/xorg/server/xorg-server/include [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by snj in ticket #184):
distrib/sets/lists/xcomp/mi: revision 1.153
external/mit/xorg/server/xorg-server/include/Makefile: revision 1.12
Install fbpict.h
(e.g., new xf86-video-intel assumes it exists if RENDER is defined)
To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.152.2.1 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.11 -r1.11.4.1 \
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.152 src/distrib/sets/lists/xcomp/mi:1.152.2.1
--- src/distrib/sets/lists/xcomp/mi:1.152 Thu May 15 16:32:28 2014
+++ src/distrib/sets/lists/xcomp/mi Sun Nov 9 13:22:58 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.152 2014/05/15 16:32:28 apb Exp $
+# $NetBSD: mi,v 1.152.2.1 2014/11/09 13:22:58 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5911,6 +5911,7 @@
./usr/X11R7/include/xorg/fbdevhw.h -unknown- xorg
./usr/X11R7/include/xorg/fboverlay.h -unknown- xorg
./usr/X11R7/include/xorg/fbpseudocolor.h -unknown- obsolete
+./usr/X11R7/include/xorg/fbpict.h -unknown- xorg
./usr/X11R7/include/xorg/fbrop.h -unknown- xorg
./usr/X11R7/include/xorg/fi1236.h -unknown- xorg
./usr/X11R7/include/xorg/fourcc.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.11 src/external/mit/xorg/server/xorg-server/include/Makefile:1.11.4.1
--- src/external/mit/xorg/server/xorg-server/include/Makefile:1.11 Wed Apr 2 01:22:11 2014
+++ src/external/mit/xorg/server/xorg-server/include/Makefile Sun Nov 9 13:22:58 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/04/02 01:22:11 riastradh Exp $
+# $NetBSD: Makefile,v 1.11.4.1 2014/11/09 13:22:58 martin Exp $
.include <bsd.own.mk>
@@ -30,7 +30,7 @@ INCS= BT.h IBM.h TI.h XIstubs.h Xprintf.
dixgrabs.h dixstruct.h dri.h dristruct.h edid.h exa.h exevents.h \
eventconvert.h events.h eventstr.h list.h \
extension.h extinit.h extnsionst.h fb.h fbdevhw.h fboverlay.h \
- fbrop.h fi1236.h fourcc.h gc.h gcstruct.h geext.h globals.h \
+ fbpict.h fbrop.h fi1236.h fourcc.h gc.h gcstruct.h geext.h globals.h \
glyphstr.h i2c_def.h input.h inputstr.h inpututils.h \
mi.h mibstore.h micmap.h micoord.h mifillarc.h mifpoly.h \
migc.h miline.h mipict.h mipointer.h mipointrst.h misc.h miscstruct.h \
