Module Name: src
Committed By: jmcneill
Date: Fri Nov 6 01:17:08 UTC 2015
Modified Files:
src/distrib/sets/lists/xdebug: md.evbarm
src/distrib/sets/lists/xserver: md.evbarm
src/external/mit/xorg/server/drivers: Makefile
src/share/mk: bsd.own.mk
Added Files:
src/external/mit/xorg/server/drivers/xf86-video-modesetting: Makefile
Log Message:
Build xf86-video-modesetting on evbarm
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/xdebug/md.evbarm
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/xserver/md.evbarm
cvs rdiff -u -r1.73 -r1.74 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/xf86-video-modesetting/Makefile
cvs rdiff -u -r1.878 -r1.879 src/share/mk/bsd.own.mk
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/xdebug/md.evbarm
diff -u src/distrib/sets/lists/xdebug/md.evbarm:1.11 src/distrib/sets/lists/xdebug/md.evbarm:1.12
--- src/distrib/sets/lists/xdebug/md.evbarm:1.11 Fri Oct 30 22:29:23 2015
+++ src/distrib/sets/lists/xdebug/md.evbarm Fri Nov 6 01:17:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm,v 1.11 2015/10/30 22:29:23 skrll Exp $
+# $NetBSD: md.evbarm,v 1.12 2015/11/06 01:17:08 jmcneill Exp $
./usr/X11R7/lib/libdrm_nouveau_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg,obsolete
./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg,obsolete
@@ -25,6 +25,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libws_drv.so.1.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug obsolete xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/modesetting_drv.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xserver/md.evbarm
diff -u src/distrib/sets/lists/xserver/md.evbarm:1.10 src/distrib/sets/lists/xserver/md.evbarm:1.11
--- src/distrib/sets/lists/xserver/md.evbarm:1.10 Thu Oct 29 10:12:28 2015
+++ src/distrib/sets/lists/xserver/md.evbarm Fri Nov 6 01:17:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm,v 1.10 2015/10/29 10:12:28 jmcneill Exp $
+# $NetBSD: md.evbarm,v 1.11 2015/11/06 01:17:08 jmcneill Exp $
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
@@ -10,6 +10,8 @@
./usr/X11R7/lib/modules/dri/nouveau_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/modesetting_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/modesetting_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/mouse_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- obsolete
@@ -83,6 +85,7 @@
./usr/X11R7/man/cat1/gtf.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/exa.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/kbd.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/modesetting.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/void.0 -unknown- obsolete
./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg
@@ -93,6 +96,7 @@
./usr/X11R7/man/html1/gtf.html -unknown- html,xorg
./usr/X11R7/man/html4/exa.html -unknown- html,xorg
./usr/X11R7/man/html4/kbd.html -unknown- html,xorg
+./usr/X11R7/man/html4/modesetting.html -unknown- html,xorg
./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg
./usr/X11R7/man/html4/void.html -unknown- obsolete
./usr/X11R7/man/html4/ws.html -unknown- html,xorg
@@ -103,6 +107,7 @@
./usr/X11R7/man/man1/gtf.1 -unknown- .man,xorg
./usr/X11R7/man/man4/exa.4 -unknown- .man,xorg
./usr/X11R7/man/man4/kbd.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/modesetting.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mousedrv.4 -unknown- .man,xorg
./usr/X11R7/man/man4/void.4 -unknown- obsolete
./usr/X11R7/man/man4/ws.4 -unknown- .man,xorg
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.73 src/external/mit/xorg/server/drivers/Makefile:1.74
--- src/external/mit/xorg/server/drivers/Makefile:1.73 Wed Nov 4 17:06:23 2015
+++ src/external/mit/xorg/server/drivers/Makefile Fri Nov 6 01:17:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2015/11/04 17:06:23 phx Exp $
+# $NetBSD: Makefile,v 1.74 2015/11/06 01:17:08 jmcneill Exp $
# xf86-input drivers
@@ -156,6 +156,7 @@ SUBDIR+= \
.if ${MACHINE} == "evbarm"
SUBDIR+= \
+ xf86-video-modesetting \
xf86-video-wsfb
.endif # ${MACHINE} == "evbarm"
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.878 src/share/mk/bsd.own.mk:1.879
--- src/share/mk/bsd.own.mk:1.878 Wed Nov 4 17:06:23 2015
+++ src/share/mk/bsd.own.mk Fri Nov 6 01:17:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.878 2015/11/04 17:06:23 phx Exp $
+# $NetBSD: bsd.own.mk,v 1.879 2015/11/06 01:17:08 jmcneill Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1299,7 +1299,8 @@ X11SRCDIR.xf86-input-${_i}?= ${X11SRCDIR
.for _v in \
ag10e apm ark ast ati ati-kms chips cirrus crime \
- geode glint i128 i740 igs imstt intel intel-old mach64 mga \
+ geode glint i128 i740 igs imstt intel intel-old \
+ modesetting mach64 mga \
neomagic newport nouveau nsc nv nvxbox openchrome pnozz \
r128 radeonhd rendition \
s3 s3virge savage siliconmotion sis suncg14 \
Added files:
Index: src/external/mit/xorg/server/drivers/xf86-video-modesetting/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-modesetting/Makefile:1.1
--- /dev/null Fri Nov 6 01:17:08 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-modesetting/Makefile Fri Nov 6 01:17:08 2015
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2015/11/06 01:17:08 jmcneill Exp $
+
+DRIVER= xf86-video-modesetting
+DRIVER_NAME= modesetting_drv
+
+SRCS= driver.c drmmode_display.c
+MAN= modesetting.4
+
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
+CPPFLAGS+= -DRANDR_12_INTERFACE
+
+.include "../Makefile.xf86-driver"
