Module Name: src
Committed By: jmcneill
Date: Sat Oct 24 14:30:28 UTC 2015
Modified Files:
src/distrib/sets/lists/xcomp: md.evbarm
src/distrib/sets/lists/xdebug: md.evbarm
src/external/mit/xorg/lib: Makefile
Added Files:
src/distrib/sets/lists/xbase: md.evbarm
Log Message:
Build libdrm_nouveau on evbarm
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/xbase/md.evbarm
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/xcomp/md.evbarm
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/xdebug/md.evbarm
cvs rdiff -u -r1.36 -r1.37 src/external/mit/xorg/lib/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/md.evbarm
diff -u src/distrib/sets/lists/xcomp/md.evbarm:1.3 src/distrib/sets/lists/xcomp/md.evbarm:1.4
--- src/distrib/sets/lists/xcomp/md.evbarm:1.3 Sat Oct 17 19:20:51 2015
+++ src/distrib/sets/lists/xcomp/md.evbarm Sat Oct 24 14:30:28 2015
@@ -1 +1,5 @@
-# $NetBSD: md.evbarm,v 1.3 2015/10/17 19:20:51 christos Exp $
+# $NetBSD: md.evbarm,v 1.4 2015/10/24 14:30:28 jmcneill Exp $
+./usr/X11R7/lib/libdrm_nouveau.a -unknown- xorg
+./usr/X11R7/lib/libdrm_nouveau_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libdrm_nouveau_pic.a -unknown- xorg,picinstall
+./usr/X11R7/lib/pkgconfig/libdrm_nouveau.pc -unknown- xorg
Index: src/distrib/sets/lists/xdebug/md.evbarm
diff -u src/distrib/sets/lists/xdebug/md.evbarm:1.9 src/distrib/sets/lists/xdebug/md.evbarm:1.10
--- src/distrib/sets/lists/xdebug/md.evbarm:1.9 Mon Aug 24 09:49:08 2015
+++ src/distrib/sets/lists/xdebug/md.evbarm Sat Oct 24 14:30:28 2015
@@ -1,4 +1,5 @@
-# $NetBSD: md.evbarm,v 1.9 2015/08/24 09:49:08 martin Exp $
+# $NetBSD: md.evbarm,v 1.10 2015/10/24 14:30:28 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
./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- debuglib,xorg,obsolete
@@ -17,6 +18,7 @@
./usr/libdata/debug/usr/X11R7/bin/Xorg.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/bin/cvt.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/bin/gtf.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug obsolete xorg,obsolete
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.36 src/external/mit/xorg/lib/Makefile:1.37
--- src/external/mit/xorg/lib/Makefile:1.36 Tue Oct 13 04:33:21 2015
+++ src/external/mit/xorg/lib/Makefile Sat Oct 24 14:30:28 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2015/10/13 04:33:21 mrg Exp $
+# $NetBSD: Makefile,v 1.37 2015/10/24 14:30:28 jmcneill Exp $
# build libraries for xorg
@@ -7,7 +7,10 @@
SUBDIR= libfontenc freetype libFS libICE libglapi \
libXau libXdmcp libdrm libpciaccess libpthread-stubs .WAIT
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-SUBDIR+=libdrm_intel libdrm_nouveau
+SUBDIR+=libdrm_intel
+.endif
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
+SUBDIR+=libdrm_nouveau
.endif
SUBDIR+=libdrm_radeon pixman
.if !defined(MLIBDIR)
Added files:
Index: src/distrib/sets/lists/xbase/md.evbarm
diff -u /dev/null src/distrib/sets/lists/xbase/md.evbarm:1.1
--- /dev/null Sat Oct 24 14:30:28 2015
+++ src/distrib/sets/lists/xbase/md.evbarm Sat Oct 24 14:30:28 2015
@@ -0,0 +1,4 @@
+# $NetBSD: md.evbarm,v 1.1 2015/10/24 14:30:28 jmcneill Exp $
+./usr/X11R7/lib/libdrm_nouveau.so -unknown- xorg
+./usr/X11R7/lib/libdrm_nouveau.so.2 -unknown- xorg
+./usr/X11R7/lib/libdrm_nouveau.so.2.0 -unknown- xorg
