Module Name: src
Committed By: mrg
Date: Thu Aug 18 08:11:22 UTC 2016
Modified Files:
src/distrib/sets/lists/xbase: mi shl.mi
src/distrib/sets/lists/xcomp: mi shl.mi
src/distrib/sets/lists/xdebug: mi shl.mi
src/etc/mtree: NetBSD.dist.Xorg
src/external/mit/xorg/lib: Makefile
Log Message:
build and install libepoxy
To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.180 -r1.181 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.17 -r1.18 src/etc/mtree/NetBSD.dist.Xorg
cvs rdiff -u -r1.39 -r1.40 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/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.132 src/distrib/sets/lists/xbase/mi:1.133
--- src/distrib/sets/lists/xbase/mi:1.132 Tue May 31 02:37:15 2016
+++ src/distrib/sets/lists/xbase/mi Thu Aug 18 08:11:22 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.132 2016/05/31 02:37:15 pgoyette Exp $
+# $NetBSD: mi,v 1.133 2016/08/18 08:11:22 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1600,6 +1600,7 @@
./usr/X11R7/include/X11/pixmaps/ctwm/xrn.xpm -unknown- xorg
./usr/X11R7/include/X11/pixmaps/ctwm/xterm.xpm -unknown- xorg
./usr/X11R7/include/drm base-x11-root obsolete
+./usr/X11R7/include/epoxy base-x11-root xorg
./usr/X11R7/include/fontconfig base-x11-root xorg
./usr/X11R7/include/freetype2 base-x11-root xorg
./usr/X11R7/include/freetype2/cache base-obsolete obsolete
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.71 src/distrib/sets/lists/xbase/shl.mi:1.72
--- src/distrib/sets/lists/xbase/shl.mi:1.71 Wed Aug 17 03:10:22 2016
+++ src/distrib/sets/lists/xbase/shl.mi Thu Aug 18 08:11:22 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.71 2016/08/17 03:10:22 mrg Exp $
+# $NetBSD: shl.mi,v 1.72 2016/08/18 08:11:22 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -315,6 +315,9 @@
./usr/X11R7/lib/libdrm_radeon.so -unknown- xorg,compatx11file
./usr/X11R7/lib/libdrm_radeon.so.0 -unknown- xorg,compatx11file
./usr/X11R7/lib/libdrm_radeon.so.0.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libepoxy.so -unknown- xorg,compatx11file
+./usr/X11R7/lib/libepoxy.so.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libepoxy.so.0.0 -unknown- xorg,compatx11file
./usr/X11R7/lib/libexpat.so -obsolete- obsolete
./usr/X11R7/lib/libexpat.so.2 -obsolete- obsolete
./usr/X11R7/lib/libexpat.so.2.0 -obsolete- obsolete
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.180 src/distrib/sets/lists/xcomp/mi:1.181
--- src/distrib/sets/lists/xcomp/mi:1.180 Wed Aug 17 03:10:22 2016
+++ src/distrib/sets/lists/xcomp/mi Thu Aug 18 08:11:22 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.180 2016/08/17 03:10:22 mrg Exp $
+# $NetBSD: mi,v 1.181 2016/08/18 08:11:22 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5659,6 +5659,12 @@
./usr/X11R7/include/drm/xgi_drm.h -unknown- obsolete
./usr/X11R7/include/expat.h -unknown- obsolete
./usr/X11R7/include/expat_external.h -unknown- obsolete
+./usr/X11R7/include/epoxy/egl.h -unknown- xorg
+./usr/X11R7/include/epoxy/gl_generated.h -unknown- xorg
+./usr/X11R7/include/epoxy/gl.h -unknown- xorg
+./usr/X11R7/include/epoxy/glx_generated.h -unknown- xorg
+./usr/X11R7/include/epoxy/glx.h -unknown- xorg
+./usr/X11R7/include/epoxy/egl_generated.h -unknown- xorg
./usr/X11R7/include/fontconfig/fcfreetype.h -unknown- xorg
./usr/X11R7/include/fontconfig/fcprivate.h -unknown- xorg
./usr/X11R7/include/fontconfig/fontconfig.h -unknown- xorg
@@ -6283,6 +6289,8 @@
./usr/X11R7/lib/libdrm_radeon_p.a -unknown- profile,xorg,compatx11file
./usr/X11R7/lib/libexpat.a -unknown- obsolete,compatx11file
./usr/X11R7/lib/libexpat_p.a -unknown- obsolete,compatx11file
+./usr/X11R7/lib/libepoxy.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libepoxy_p.a -unknown- profile,xorg,compatx11file
./usr/X11R7/lib/libfontconfig.a -unknown- xorg,compatx11file
./usr/X11R7/lib/libfontconfig_p.a -unknown- profile,xorg,compatx11file
./usr/X11R7/lib/libfontenc.a -unknown- xorg,compatx11file
@@ -6387,6 +6395,7 @@
./usr/X11R7/lib/pkgconfig/dri.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/dri2proto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/dri3proto.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/epoxy.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/evieproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/fixesproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/fontcacheproto.pc -unknown- xorg
Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.44 src/distrib/sets/lists/xcomp/shl.mi:1.45
--- src/distrib/sets/lists/xcomp/shl.mi:1.44 Tue Aug 16 00:55:09 2016
+++ src/distrib/sets/lists/xcomp/shl.mi Thu Aug 18 08:11:22 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.44 2016/08/16 00:55:09 mrg Exp $
+# $NetBSD: shl.mi,v 1.45 2016/08/18 08:11:22 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -96,6 +96,7 @@
./usr/X11R7/lib/libXxf86vm_pic.a -unknown- xorg,picinstall,compatx11file
./usr/X11R7/lib/libdrm_pic.a -unknown- xorg,picinstall,compatx11file
./usr/X11R7/lib/libdrm_radeon_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libepoxy_pic.a -unknown- xorg,picinstall,compatx11file
./usr/X11R7/lib/libexpat_pic.a -obsolete- obsolete
./usr/X11R7/lib/libfontconfig_pic.a -unknown- xorg,picinstall,compatx11file
./usr/X11R7/lib/libfontenc_pic.a -unknown- xorg,picinstall,compatx11file
Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.22 src/distrib/sets/lists/xdebug/mi:1.23
--- src/distrib/sets/lists/xdebug/mi:1.22 Tue Aug 16 00:55:09 2016
+++ src/distrib/sets/lists/xdebug/mi Thu Aug 18 08:11:22 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.22 2016/08/16 00:55:09 mrg Exp $
+# $NetBSD: mi,v 1.23 2016/08/18 08:11:22 mrg Exp $
./etc/mtree/set.xdebug comp-sys-root
./usr/X11R6/lib/libFS_g.a -unknown- debuglib,x11
./usr/X11R6/lib/libGLU_g.a -unknown- debuglib,x11
@@ -98,6 +98,7 @@
./usr/X11R7/lib/libXxf86vm_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libdrm_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libdrm_radeon_g.a -unknown- debuglib,xorg,compatx11file
+./usr/X11R7/lib/libepoxy_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libexpat_g.a -unknown- obsolete
./usr/X11R7/lib/libfontconfig_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libfontenc_g.a -unknown- debuglib,xorg,compatx11file
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.34 src/distrib/sets/lists/xdebug/shl.mi:1.35
--- src/distrib/sets/lists/xdebug/shl.mi:1.34 Wed Aug 17 03:10:23 2016
+++ src/distrib/sets/lists/xdebug/shl.mi Thu Aug 18 08:11:22 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.34 2016/08/17 03:10:23 mrg Exp $
+# $NetBSD: shl.mi,v 1.35 2016/08/18 08:11:22 mrg Exp $
./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug
@@ -103,6 +103,7 @@
./usr/libdata/debug/usr/X11R7/lib/libXxf86vm.so.2.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.4.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libepoxy.so.0.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -obsolete- obsolete,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.2.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug,compatx11file
Index: src/etc/mtree/NetBSD.dist.Xorg
diff -u src/etc/mtree/NetBSD.dist.Xorg:1.17 src/etc/mtree/NetBSD.dist.Xorg:1.18
--- src/etc/mtree/NetBSD.dist.Xorg:1.17 Mon May 16 22:19:41 2016
+++ src/etc/mtree/NetBSD.dist.Xorg Thu Aug 18 08:11:22 2016
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.Xorg,v 1.17 2016/05/16 22:19:41 christos Exp $
+# $NetBSD: NetBSD.dist.Xorg,v 1.18 2016/08/18 08:11:22 mrg Exp $
./usr/X11R7
./usr/X11R7/bin
./usr/X11R7/include
@@ -20,6 +20,7 @@
./usr/X11R7/include/X11/fonts
./usr/X11R7/include/X11/pixmaps
./usr/X11R7/include/X11/pixmaps/ctwm
+./usr/X11R7/include/epoxy
./usr/X11R7/include/fontconfig
./usr/X11R7/include/freetype2
./usr/X11R7/include/freetype2/freetype
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.39 src/external/mit/xorg/lib/Makefile:1.40
--- src/external/mit/xorg/lib/Makefile:1.39 Wed Aug 17 03:10:23 2016
+++ src/external/mit/xorg/lib/Makefile Thu Aug 18 08:11:22 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2016/08/17 03:10:23 mrg Exp $
+# $NetBSD: Makefile,v 1.40 2016/08/18 08:11:22 mrg Exp $
# build libraries for xorg
@@ -24,7 +24,7 @@ SUBDIR+=dri7 dri gallium
SUBDIR+=fontconfig libSM libX11 \
.WAIT \
libXcomposite libXdamage libXext libXfixes libXt \
- libxkbfile \
+ libxkbfile libepoxy \
.WAIT \
libXi libXxf86vm \
.WAIT \
