Module Name: src
Committed By: mrg
Date: Tue Apr 16 21:20:52 UTC 2019
Modified Files:
src/distrib/sets: mkvars.mk sets.subr
src/distrib/sets/lists/xbase: mi shl.mi
src/distrib/sets/lists/xcomp: md.evbarm md.i386 mi shl.mi
src/distrib/sets/lists/xdebug: md.amd64 mi shl.mi
src/distrib/sets/lists/xserver: mi
src/etc/mtree: NetBSD.dist.Xorg
src/external/mit/xorg/lib: Makefile
src/external/mit/xorg/lib/libepoxy: Makefile
src/external/mit/xorg/lib/libgbm: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting:
Makefile
src/share/mk: bsd.own.mk
Log Message:
enable EGL and glamor. partly from maya@.
for x86 and evbarm:
- install headers and libEGL
- install xorg-server glamoregl component
- link xorg drivers against gbm/egl
bonus fix:
- fix some wrongly marked compatx11file files
build tested on shark, sgimips, evbarm64-el, amd64 and i386.
run tested on radeon, intel and nvidia on amd64, including
'modesetting' driver on amd64. however, my systems disable
it due to llvmpipe so i'm not sure what is happening.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.185 -r1.186 src/distrib/sets/sets.subr
cvs rdiff -u -r1.150 -r1.151 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.82 -r1.83 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/xcomp/md.evbarm
cvs rdiff -u -r1.60 -r1.61 src/distrib/sets/lists/xcomp/md.i386
cvs rdiff -u -r1.207 -r1.208 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.50 -r1.51 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.40 -r1.41 src/distrib/sets/lists/xserver/mi
cvs rdiff -u -r1.24 -r1.25 src/etc/mtree/NetBSD.dist.Xorg
cvs rdiff -u -r1.48 -r1.49 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libepoxy/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libgbm/Makefile
cvs rdiff -u -r1.37 -r1.38 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile
cvs rdiff -u -r1.1129 -r1.1130 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/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.36 src/distrib/sets/mkvars.mk:1.37
--- src/distrib/sets/mkvars.mk:1.36 Sun Mar 10 11:04:08 2019
+++ src/distrib/sets/mkvars.mk Tue Apr 16 21:20:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.36 2019/03/10 11:04:08 mrg Exp $
+# $NetBSD: mkvars.mk,v 1.37 2019/04/16 21:20:51 mrg Exp $
MKEXTRAVARS= \
MACHINE \
@@ -7,6 +7,7 @@ MKEXTRAVARS= \
HAVE_GCC \
HAVE_GDB \
HAVE_XORG_SERVER_VER \
+ HAVE_XORG_GLAMOR \
HAVE_MESA_VER \
HAVE_BINUTILS \
HAVE_LIBGCC_EH \
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.185 src/distrib/sets/sets.subr:1.186
--- src/distrib/sets/sets.subr:1.185 Sun Mar 10 11:04:08 2019
+++ src/distrib/sets/sets.subr Tue Apr 16 21:20:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.185 2019/03/10 11:04:08 mrg Exp $
+# $NetBSD: sets.subr,v 1.186 2019/04/16 21:20:51 mrg Exp $
#
#
@@ -180,7 +180,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.185 2019/03/10 11:04:08 mrg Exp $
+# # $NetBSD: sets.subr,v 1.186 2019/04/16 21:20:51 mrg Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -215,6 +215,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# gdb=<n> <n> = value of ${HAVE_GDB}
# openssl=<n> <n> = value of ${HAVE_OPENSSL}
# xorg_server_ver=<n> <n> = value of ${HAVE_XORG_SERVER_VER}
+# xorg_glamor ${HAVE_XORG_GLAMOR} != no
# mesa_ver=<n> <n> = value of ${HAVE_MESA_VER}
#
# 2. The USE_<name>:
Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.150 src/distrib/sets/lists/xbase/mi:1.151
--- src/distrib/sets/lists/xbase/mi:1.150 Mon Mar 11 09:20:13 2019
+++ src/distrib/sets/lists/xbase/mi Tue Apr 16 21:20:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.150 2019/03/11 09:20:13 mrg Exp $
+# $NetBSD: mi,v 1.151 2019/04/16 21:20:51 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -146,6 +146,7 @@
./usr/X11R7/bin/xwud -unknown- xorg
./usr/X11R7/include base-x11-root xorg
./usr/X11R7/include/DPS base-x11-root xorg
+./usr/X11R7/include/EGL base-x11-root xorg
./usr/X11R7/include/GL base-x11-root xorg
./usr/X11R7/include/GL/internal base-x11-root xorg
./usr/X11R7/include/KHR base-x11-root xorg
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.82 src/distrib/sets/lists/xbase/shl.mi:1.83
--- src/distrib/sets/lists/xbase/shl.mi:1.82 Wed Jun 6 03:09:12 2018
+++ src/distrib/sets/lists/xbase/shl.mi Tue Apr 16 21:20:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.82 2018/06/06 03:09:12 snj Exp $
+# $NetBSD: shl.mi,v 1.83 2019/04/16 21:20:51 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -20,6 +20,9 @@
./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so -unknown- xorg
./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2 -unknown- xorg
./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2.0 -unknown- xorg
+./usr/X11R7/lib/libEGL.so -unknown- xorg,compatx11file,xorg_glamor
+./usr/X11R7/lib/libEGL.so.0 -unknown- xorg,compatx11file,xorg_glamor
+./usr/X11R7/lib/libEGL.so.0.0 -unknown- xorg,compatx11file,xorg_glamor
./usr/X11R7/lib/libFS.so -unknown- xorg,compatx11file
./usr/X11R7/lib/libFS.so.7 -unknown- xorg,compatx11file
./usr/X11R7/lib/libFS.so.7.0 -unknown- xorg,compatx11file
@@ -311,3 +314,4 @@
./usr/X11R7/lib/libxshmfence.so -unknown- xorg,compatx11file
./usr/X11R7/lib/libxshmfence.so.1 -unknown- xorg,compatx11file
./usr/X11R7/lib/libxshmfence.so.1.0 -unknown- xorg,compatx11file
+./usr/X11R7/lib/pkgconfig/egl.pc -unknown- xorg,xorg_glamor
Index: src/distrib/sets/lists/xcomp/md.evbarm
diff -u src/distrib/sets/lists/xcomp/md.evbarm:1.13 src/distrib/sets/lists/xcomp/md.evbarm:1.14
--- src/distrib/sets/lists/xcomp/md.evbarm:1.13 Tue Mar 12 23:50:56 2019
+++ src/distrib/sets/lists/xcomp/md.evbarm Tue Apr 16 21:20:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm,v 1.13 2019/03/12 23:50:56 christos Exp $
+# $NetBSD: md.evbarm,v 1.14 2019/04/16 21:20:51 mrg Exp $
./usr/X11R7/include/libdrm/nouveau/nvif/cl0080.h -unknown- xorg
./usr/X11R7/include/libdrm/nouveau/nvif/cl9097.h -unknown- xorg
./usr/X11R7/include/libdrm/nouveau/nvif/class.h -unknown- xorg
@@ -8,9 +8,9 @@
./usr/X11R7/include/libdrm/nouveau/nvif/unpack.h -unknown- xorg
./usr/X11R7/include/vdpau/vdpau.h -unknown- xorg
./usr/X11R7/include/vdpau/vdpau_x11.h -unknown- xorg
-./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/libdrm_nouveau.a -unknown- xorg,compatx11file
+./usr/X11R7/lib/libdrm_nouveau_p.a -unknown- profile,xorg,compatx11file
+./usr/X11R7/lib/libdrm_nouveau_pic.a -unknown- xorg,picinstall,compatx11file
./usr/X11R7/lib/libvdpau.a -unknown- xorg,compatx11file
./usr/X11R7/lib/libvdpau_p.a -unknown- profile,xorg,compatx11file
./usr/X11R7/lib/libvdpau_pic.a -unknown- xorg,picinstall,compatx11file
Index: src/distrib/sets/lists/xcomp/md.i386
diff -u src/distrib/sets/lists/xcomp/md.i386:1.60 src/distrib/sets/lists/xcomp/md.i386:1.61
--- src/distrib/sets/lists/xcomp/md.i386:1.60 Tue Mar 12 23:50:56 2019
+++ src/distrib/sets/lists/xcomp/md.i386 Tue Apr 16 21:20:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.60 2019/03/12 23:50:56 christos Exp $
+# $NetBSD: md.i386,v 1.61 2019/04/16 21:20:51 mrg Exp $
#./usr/libdata/lint/llib-lIntelXvMC.ln -unknown- lint,xorg
./usr/X11R7/include/intel_bufmgr.h -unknown- obsolete
./usr/X11R7/include/libdrm/nouveau/nvif/cl0080.h -unknown- xorg
@@ -22,18 +22,19 @@
./usr/X11R7/lib/libchromeXvMCPro_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libchromeXvMC_p.a -unknown- profile,xorg
./usr/X11R7/lib/libchromeXvMC_pic.a -unknown- xorg,picinstall
-./usr/X11R7/lib/libdrm_amdgpu.a -unknown- xorg,compatx11file
-./usr/X11R7/lib/libdrm_amdgpu_p.a -unknown- profile,xorg,compatx11file
-./usr/X11R7/lib/libdrm_amdgpu_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libdrm_amdgpu.a -unknown- xorg
+./usr/X11R7/lib/libdrm_amdgpu_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libdrm_amdgpu_pic.a -unknown- xorg,picinstall
./usr/X11R7/lib/libdrm_intel.a -unknown- xorg
./usr/X11R7/lib/libdrm_intel_p.a -unknown- profile,xorg
./usr/X11R7/lib/libdrm_intel_pic.a -unknown- xorg,picinstall
./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/libvdpau.a -unknown- xorg,compatx11file
-./usr/X11R7/lib/libvdpau_p.a -unknown- profile,xorg,compatx11file
-./usr/X11R7/lib/libvdpau_pic.a -unknown- xorg,picinstall,compatx11file
+./usr/X11R7/lib/libvdpau.a -unknown- xorg
+./usr/X11R7/lib/libvdpau_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libvdpau_pic.a -unknown- xorg,picinstall
+./usr/X11R7/lib/pkgconfig/egl.pc -unknown- xorg,xorg_glamor
./usr/X11R7/lib/pkgconfig/libdrm_amdgpu.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/libdrm_intel.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/libdrm_nouveau.pc -unknown- xorg
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.207 src/distrib/sets/lists/xcomp/mi:1.208
--- src/distrib/sets/lists/xcomp/mi:1.207 Tue Mar 12 03:37:23 2019
+++ src/distrib/sets/lists/xcomp/mi Tue Apr 16 21:20:51 2019
@@ -1,10 +1,15 @@
-# $NetBSD: mi,v 1.207 2019/03/12 03:37:23 mrg Exp $
+# $NetBSD: mi,v 1.208 2019/04/16 21:20:51 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
./etc/mtree/set.xcomp xcomp-sys-root
./usr/X11R7/bin/freetype-config -unknown- xorg
./usr/X11R7/bin/xft-config -unknown- obsolete
+./usr/X11R7/include/EGL/egl.h -unknown- xorg,xorg_glamor
+./usr/X11R7/include/EGL/eglext.h -unknown- xorg,xorg_glamor
+./usr/X11R7/include/EGL/eglextchromium.h -unknown- xorg,xorg_glamor
+./usr/X11R7/include/EGL/eglmesaext.h -unknown- xorg,xorg_glamor
+./usr/X11R7/include/EGL/eglplatform.h -unknown- xorg,xorg_glamor
./usr/X11R7/include/GL/GLwDrawA.h -unknown- xorg
./usr/X11R7/include/GL/GLwDrawAP.h -unknown- xorg
./usr/X11R7/include/GL/GLwMDrawA.h -unknown- xorg
@@ -1103,6 +1108,8 @@
./usr/X11R7/lib/X11/config/xorg.cf -unknown- xorg
./usr/X11R7/lib/X11/config/xorgsite.def -unknown- xorg
./usr/X11R7/lib/X11/config/xorgversion.def -unknown- xorg
+./usr/X11R7/lib/libEGL.a -unknown- xorg,compatx11file,xorg_glamor
+./usr/X11R7/lib/libEGL_p.a -unknown- profile,xorg,compatx11file,xorg_glamor
./usr/X11R7/lib/libFS.a -unknown- xorg,compatx11file
./usr/X11R7/lib/libFS_p.a -unknown- profile,xorg,compatx11file
./usr/X11R7/lib/libGL.a -unknown- xorg,compatx11file
Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.50 src/distrib/sets/lists/xcomp/shl.mi:1.51
--- src/distrib/sets/lists/xcomp/shl.mi:1.50 Sun Mar 11 09:43:39 2018
+++ src/distrib/sets/lists/xcomp/shl.mi Tue Apr 16 21:20:51 2019
@@ -1,7 +1,10 @@
-# $NetBSD: shl.mi,v 1.50 2018/03/11 09:43:39 mrg Exp $
+# $NetBSD: shl.mi,v 1.51 2019/04/16 21:20:51 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
+./usr/X11R7/lib/libEGL.a -unknown- xorg,xorg_glamor
+./usr/X11R7/lib/libEGL_p.a -unknown- profile,xorg,xorg_glamor
+./usr/X11R7/lib/libEGL_pic.a -unknown- xorg,picinstall,compatx11file,xorg_glamor
./usr/X11R7/lib/libFS_pic.a -unknown- xorg,picinstall,compatx11file
./usr/X11R7/lib/libGLU_pic.a -unknown- xorg,picinstall,compatx11file
./usr/X11R7/lib/libGL_pic.a -unknown- xorg,picinstall,compatx11file
Index: src/distrib/sets/lists/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.45 src/distrib/sets/lists/xdebug/md.amd64:1.46
--- src/distrib/sets/lists/xdebug/md.amd64:1.45 Mon Mar 11 17:50:19 2019
+++ src/distrib/sets/lists/xdebug/md.amd64 Tue Apr 16 21:20:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.45 2019/03/11 17:50:19 kamil Exp $
+# $NetBSD: md.amd64,v 1.46 2019/04/16 21:20:51 mrg Exp $
./usr/X11R7/lib/libI810XvMC_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg,compatx11file
@@ -41,7 +41,7 @@
./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.so.0.2.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.2.0.debug -unknown- xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.3.0.debug -unknown- xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libvdpau.so.1.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libvdpau.so.1.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/modules/dri/i810_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/i915_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/i965_dri.so.0.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.30 src/distrib/sets/lists/xdebug/mi:1.31
--- src/distrib/sets/lists/xdebug/mi:1.30 Mon Mar 11 09:20:13 2019
+++ src/distrib/sets/lists/xdebug/mi Tue Apr 16 21:20:51 2019
@@ -1,6 +1,7 @@
-# $NetBSD: mi,v 1.30 2019/03/11 09:20:13 mrg Exp $
+# $NetBSD: mi,v 1.31 2019/04/16 21:20:51 mrg Exp $
./etc/mtree/set.xdebug comp-sys-root
./usr/X11R7/lib -unknown- debuglib,xorg,compatx11dir
+./usr/X11R7/lib/libEGL_g.a -unknown- debuglib,xorg,compatx11file,xorg_glamor
./usr/X11R7/lib/libFS_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libGLU_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libGL_g.a -unknown- debuglib,xorg,compatx11file
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.46 src/distrib/sets/lists/xdebug/shl.mi:1.47
--- src/distrib/sets/lists/xdebug/shl.mi:1.46 Fri Mar 15 07:03:36 2019
+++ src/distrib/sets/lists/xdebug/shl.mi Tue Apr 16 21:20:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.46 2019/03/15 07:03:36 mrg Exp $
+# $NetBSD: shl.mi,v 1.47 2019/04/16 21:20:51 mrg Exp $
./usr/libdata/debug/usr/X11R7/lib -unknown- xorg,debug,compatx11dir
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug obsolete xorg,obsolete
@@ -12,6 +12,7 @@
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2.0.debug -unknown- xorg,debug,obsolete
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libEGL.so.0.0.debug -unknown- xorg,debug,compatx11file,xorg_glamor
./usr/libdata/debug/usr/X11R7/lib/libFS.so.7.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libGL.so.3.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libGLU.so.3.0.debug -unknown- xorg,debug,compatx11file
@@ -104,6 +105,7 @@
./usr/libdata/debug/usr/X11R7/lib/libxkbfile.so.2.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libxkbui.so.2.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libxshmfence.so.1.0.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/modules/libglamoregl.so.0.debug -unknown- xorg,debug,xorg_glamor
./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug -unknown- obsolete,machine=amd64,mesa_ver=18
Index: src/distrib/sets/lists/xserver/mi
diff -u src/distrib/sets/lists/xserver/mi:1.40 src/distrib/sets/lists/xserver/mi:1.41
--- src/distrib/sets/lists/xserver/mi:1.40 Fri Mar 15 07:03:36 2019
+++ src/distrib/sets/lists/xserver/mi Tue Apr 16 21:20:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.40 2019/03/15 07:03:36 mrg Exp $
+# $NetBSD: mi,v 1.41 2019/04/16 21:20:51 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -21,6 +21,8 @@
./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 -unknown- xorg,machine=i386,mesa_ver=10
./usr/X11R7/lib/modules/dri/swrast_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/swrast_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libglamoregl.so -unknown- xorg,xorg_glamor
+./usr/X11R7/lib/modules/libglamoregl.so.0 -unknown- xorg,xorg_glamor
./usr/X11R7/man/cat1/Xmark.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/Xnest.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/Xserver.0 -unknown- .cat,xorg
Index: src/etc/mtree/NetBSD.dist.Xorg
diff -u src/etc/mtree/NetBSD.dist.Xorg:1.24 src/etc/mtree/NetBSD.dist.Xorg:1.25
--- src/etc/mtree/NetBSD.dist.Xorg:1.24 Sun Mar 10 11:18:02 2019
+++ src/etc/mtree/NetBSD.dist.Xorg Tue Apr 16 21:20:50 2019
@@ -1,8 +1,9 @@
-# $NetBSD: NetBSD.dist.Xorg,v 1.24 2019/03/10 11:18:02 mrg Exp $
+# $NetBSD: NetBSD.dist.Xorg,v 1.25 2019/04/16 21:20:50 mrg Exp $
./usr/X11R7
./usr/X11R7/bin
./usr/X11R7/include
./usr/X11R7/include/DPS
+./usr/X11R7/include/EGL
./usr/X11R7/include/GL
./usr/X11R7/include/GL/internal
./usr/X11R7/include/KHR
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.48 src/external/mit/xorg/lib/Makefile:1.49
--- src/external/mit/xorg/lib/Makefile:1.48 Tue Mar 19 06:19:44 2019
+++ src/external/mit/xorg/lib/Makefile Tue Apr 16 21:20:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2019/03/19 06:19:44 mrg Exp $
+# $NetBSD: Makefile,v 1.49 2019/04/16 21:20:51 mrg Exp $
# build libraries for xorg
@@ -53,6 +53,10 @@ SUBDIR+=libGLU libGLw libXaw6 libXaw lib
libXdmGreet \
xcb-util
SUBDIR+=libgbm${OLD_PREFIX}
+.if ${HAVE_XORG_GLAMOR} != "no"
+# libEGL depends upon libgbm
+SUBDIR+=.WAIT libEGL
+.endif
.include <bsd.buildinstall.mk>
.include <bsd.subdir.mk>
Index: src/external/mit/xorg/lib/libepoxy/Makefile
diff -u src/external/mit/xorg/lib/libepoxy/Makefile:1.2 src/external/mit/xorg/lib/libepoxy/Makefile:1.3
--- src/external/mit/xorg/lib/libepoxy/Makefile:1.2 Sun Mar 5 11:52:38 2017
+++ src/external/mit/xorg/lib/libepoxy/Makefile Tue Apr 16 21:20:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/03/05 11:52:38 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2019/04/16 21:20:51 mrg Exp $
.include <bsd.own.mk>
@@ -12,9 +12,12 @@ SRCS= \
dispatch_glx.c \
gl_generated_dispatch.c \
glx_generated_dispatch.c
-SRCS.EGL= \
+
+.if ${HAVE_XORG_GLAMOR} != "no"
+SRCS+= \
dispatch_egl.c \
egl_generated_dispatch.c
+.endif
INCSDIR=${X11INCDIR}/epoxy
INCS= \
Index: src/external/mit/xorg/lib/libgbm/Makefile
diff -u src/external/mit/xorg/lib/libgbm/Makefile:1.3 src/external/mit/xorg/lib/libgbm/Makefile:1.4
--- src/external/mit/xorg/lib/libgbm/Makefile:1.3 Sun Mar 10 10:51:58 2019
+++ src/external/mit/xorg/lib/libgbm/Makefile Tue Apr 16 21:20:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/03/10 10:51:58 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2019/04/16 21:20:51 mrg Exp $
.include <bsd.own.mk>
@@ -40,6 +40,7 @@ COPTS.gbm_dri.c+= -Wno-error
.include "../libloader.mk"
.PATH: ${X11SRCDIR.Mesa}/src/gbm/main
+.PATH: ${X11SRCDIR.Mesa}/src/gbm/backends/dri
INCS= gbm.h
INCSDIR= ${X11INCDIR}
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.37 src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.38
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.37 Mon Dec 31 11:14:04 2018
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Tue Apr 16 21:20:51 2019
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2018/12/31 11:14:04 mrg Exp $
+# $NetBSD: Makefile,v 1.38 2019/04/16 21:20:51 mrg Exp $
+
+.include <bsd.own.mk>
SUBDIR= common ddc dixmods doc dri dri2 i2c loader \
xf86modes exa \
@@ -10,6 +12,10 @@ SUBDIR= common ddc dixmods doc dri dri2
SUBDIR+= int10
.endif
+.if ${HAVE_XORG_GLAMOR} != "no"
+SUBDIR+= glamor_egl
+.endif
+
SUBDIR+= .WAIT utils
SUBDIR+= .WAIT Xorg
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.16 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.17
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.16 Mon Dec 31 11:14:04 2018
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Tue Apr 16 21:20:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2018/12/31 11:14:04 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2019/04/16 21:20:52 mrg Exp $
.include <bsd.own.mk>
@@ -34,7 +34,7 @@ LDADD+= ${LDADD.dix}
LDADD+= ${LDADD.config}
LDADD+= ${LDADD.dbe}
.if ${HAVE_XORG_GLAMOR} != "no"
-LDADD+= ${LDADD.glamor}
+LDADD+= ${LDADD.glamor} ${LDADD.gbm}
.endif
LDADD+= ${LDADD.record}
LDADD+= ${LDADD.hw/xfree86/loader}
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile:1.2 src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile:1.2 Mon Dec 31 11:14:04 2018
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile Tue Apr 16 21:20:52 2019
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/12/31 11:14:04 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2019/04/16 21:20:52 mrg Exp $
+
+.include <bsd.own.mk>
DRIVER= xf86-video-modesetting
DRIVER_NAME= modesetting_drv
@@ -22,6 +24,11 @@ CPPFLAGS+= ${X11FLAGS.DIX} \
-I${X11SRCDIR.xorg-server}/parser \
-I${X11SRCDIR.xorg-server}/ramdac \
+.if ${HAVE_XORG_GLAMOR} != "no"
+CPPFLAGS+= -DGLAMOR_HAS_GBM \
+ -DGLAMOR_HAS_GBM_LINEAR
+.endif
+
# Set some overrides so Makefile.xf86-driver works for this
# built-in driver.
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1129 src/share/mk/bsd.own.mk:1.1130
--- src/share/mk/bsd.own.mk:1.1129 Mon Apr 15 15:56:40 2019
+++ src/share/mk/bsd.own.mk Tue Apr 16 21:20:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1129 2019/04/15 15:56:40 maya Exp $
+# $NetBSD: bsd.own.mk,v 1.1130 2019/04/16 21:20:51 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1472,7 +1472,7 @@ HAVE_XORG_SERVER_VER?=120
.if ${HAVE_XORG_SERVER_VER} == "120"
XORG_SERVER_SUBDIR?=xorg-server
-. if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+. if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || ${MACHINE} == "evbarm"
HAVE_XORG_GLAMOR?= yes
. endif
.else
