Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src enable EGL and glamor. partly from maya@.
details: https://anonhg.NetBSD.org/src/rev/57ccac712dbc
branches: trunk
changeset: 455890:57ccac712dbc
user: mrg <mrg%NetBSD.org@localhost>
date: Tue Apr 16 21:20:50 2019 +0000
description:
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.
diffstat:
distrib/sets/lists/xbase/mi | 3 +-
distrib/sets/lists/xbase/shl.mi | 6 +++-
distrib/sets/lists/xcomp/md.evbarm | 8 ++--
distrib/sets/lists/xcomp/md.i386 | 15 +++++----
distrib/sets/lists/xcomp/mi | 9 +++++-
distrib/sets/lists/xcomp/shl.mi | 5 ++-
distrib/sets/lists/xdebug/md.amd64 | 4 +-
distrib/sets/lists/xdebug/mi | 3 +-
distrib/sets/lists/xdebug/shl.mi | 4 ++-
distrib/sets/lists/xserver/mi | 4 ++-
distrib/sets/mkvars.mk | 3 +-
distrib/sets/sets.subr | 5 ++-
etc/mtree/NetBSD.dist.Xorg | 3 +-
external/mit/xorg/lib/Makefile | 6 +++-
external/mit/xorg/lib/libepoxy/Makefile | 7 +++-
external/mit/xorg/lib/libgbm/Makefile | 3 +-
external/mit/xorg/server/xorg-server/hw/xfree86/Makefile | 8 ++++-
external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile | 4 +-
external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile | 9 +++++-
share/mk/bsd.own.mk | 4 +-
20 files changed, 79 insertions(+), 34 deletions(-)
diffs (truncated from 413 to 300 lines):
diff -r 943abeddb1dc -r 57ccac712dbc distrib/sets/lists/xbase/mi
--- a/distrib/sets/lists/xbase/mi Tue Apr 16 20:33:36 2019 +0000
+++ b/distrib/sets/lists/xbase/mi Tue Apr 16 21:20:50 2019 +0000
@@ -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
diff -r 943abeddb1dc -r 57ccac712dbc distrib/sets/lists/xbase/shl.mi
--- a/distrib/sets/lists/xbase/shl.mi Tue Apr 16 20:33:36 2019 +0000
+++ b/distrib/sets/lists/xbase/shl.mi Tue Apr 16 21:20:50 2019 +0000
@@ -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
diff -r 943abeddb1dc -r 57ccac712dbc distrib/sets/lists/xcomp/md.evbarm
--- a/distrib/sets/lists/xcomp/md.evbarm Tue Apr 16 20:33:36 2019 +0000
+++ b/distrib/sets/lists/xcomp/md.evbarm Tue Apr 16 21:20:50 2019 +0000
@@ -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
diff -r 943abeddb1dc -r 57ccac712dbc distrib/sets/lists/xcomp/md.i386
--- a/distrib/sets/lists/xcomp/md.i386 Tue Apr 16 20:33:36 2019 +0000
+++ b/distrib/sets/lists/xcomp/md.i386 Tue Apr 16 21:20:50 2019 +0000
@@ -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
diff -r 943abeddb1dc -r 57ccac712dbc distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/xcomp/mi Tue Apr 16 20:33:36 2019 +0000
+++ b/distrib/sets/lists/xcomp/mi Tue Apr 16 21:20:50 2019 +0000
@@ -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
diff -r 943abeddb1dc -r 57ccac712dbc distrib/sets/lists/xcomp/shl.mi
--- a/distrib/sets/lists/xcomp/shl.mi Tue Apr 16 20:33:36 2019 +0000
+++ b/distrib/sets/lists/xcomp/shl.mi Tue Apr 16 21:20:50 2019 +0000
@@ -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
diff -r 943abeddb1dc -r 57ccac712dbc distrib/sets/lists/xdebug/md.amd64
--- a/distrib/sets/lists/xdebug/md.amd64 Tue Apr 16 20:33:36 2019 +0000
+++ b/distrib/sets/lists/xdebug/md.amd64 Tue Apr 16 21:20:50 2019 +0000
@@ -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
diff -r 943abeddb1dc -r 57ccac712dbc distrib/sets/lists/xdebug/mi
--- a/distrib/sets/lists/xdebug/mi Tue Apr 16 20:33:36 2019 +0000
+++ b/distrib/sets/lists/xdebug/mi Tue Apr 16 21:20:50 2019 +0000
@@ -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
diff -r 943abeddb1dc -r 57ccac712dbc distrib/sets/lists/xdebug/shl.mi
--- a/distrib/sets/lists/xdebug/shl.mi Tue Apr 16 20:33:36 2019 +0000
+++ b/distrib/sets/lists/xdebug/shl.mi Tue Apr 16 21:20:50 2019 +0000
@@ -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
diff -r 943abeddb1dc -r 57ccac712dbc distrib/sets/lists/xserver/mi
--- a/distrib/sets/lists/xserver/mi Tue Apr 16 20:33:36 2019 +0000
+++ b/distrib/sets/lists/xserver/mi Tue Apr 16 21:20:50 2019 +0000
@@ -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
diff -r 943abeddb1dc -r 57ccac712dbc distrib/sets/mkvars.mk
--- a/distrib/sets/mkvars.mk Tue Apr 16 20:33:36 2019 +0000
+++ b/distrib/sets/mkvars.mk Tue Apr 16 21:20:50 2019 +0000
@@ -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 @@
HAVE_GCC \
HAVE_GDB \
HAVE_XORG_SERVER_VER \
+ HAVE_XORG_GLAMOR \
HAVE_MESA_VER \
HAVE_BINUTILS \
HAVE_LIBGCC_EH \
diff -r 943abeddb1dc -r 57ccac712dbc distrib/sets/sets.subr
--- a/distrib/sets/sets.subr Tue Apr 16 20:33:36 2019 +0000
+++ b/distrib/sets/sets.subr Tue Apr 16 21:20:50 2019 +0000
@@ -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 @@
# 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 @@
# 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>:
diff -r 943abeddb1dc -r 57ccac712dbc etc/mtree/NetBSD.dist.Xorg
--- a/etc/mtree/NetBSD.dist.Xorg Tue Apr 16 20:33:36 2019 +0000
+++ b/etc/mtree/NetBSD.dist.Xorg Tue Apr 16 21:20:50 2019 +0000
@@ -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
diff -r 943abeddb1dc -r 57ccac712dbc external/mit/xorg/lib/Makefile
--- a/external/mit/xorg/lib/Makefile Tue Apr 16 20:33:36 2019 +0000
+++ b/external/mit/xorg/lib/Makefile Tue Apr 16 21:20:50 2019 +0000
@@ -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 @@
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>
diff -r 943abeddb1dc -r 57ccac712dbc external/mit/xorg/lib/libepoxy/Makefile
--- a/external/mit/xorg/lib/libepoxy/Makefile Tue Apr 16 20:33:36 2019 +0000
+++ b/external/mit/xorg/lib/libepoxy/Makefile Tue Apr 16 21:20:50 2019 +0000
@@ -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>
Home |
Main Index |
Thread Index |
Old Index