[pkgsrc/trunk]: pkgsrc/graphics/MesaLib MesaLib: resolving some build failure...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8989a23c4dec
branches:  trunk
changeset: 400167:8989a23c4dec
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Aug 23 11:37:48 2019 +0000

description:
MesaLib: resolving some build failures when built without LLVM

diffstat:

 graphics/MesaLib/Makefile   |  6 ++++--
 graphics/MesaLib/options.mk |  3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r 373e81422ab1 -r 8989a23c4dec graphics/MesaLib/Makefile
--- a/graphics/MesaLib/Makefile Fri Aug 23 11:27:39 2019 +0000
+++ b/graphics/MesaLib/Makefile Fri Aug 23 11:37:48 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.152 2019/08/22 17:24:01 nia Exp $
+# $NetBSD: Makefile,v 1.153 2019/08/23 11:37:48 nia Exp $
 
 DISTNAME=      mesa-19.1.4
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
@@ -78,6 +78,9 @@
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/src/util/00-mesa-defaults.conf ${DESTDIR}${EGDIR}
 
+# LLVM detection
+TOOL_DEPENDS+= ${PYPKGPREFIX}-meson>=0.51.1nb3:../../devel/py-meson
+
 .include "../../devel/py-meson/build.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
@@ -85,5 +88,4 @@
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libxcb/buildlink3.mk"
-.include "../../x11/libxshmfence/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 373e81422ab1 -r 8989a23c4dec graphics/MesaLib/options.mk
--- a/graphics/MesaLib/options.mk       Fri Aug 23 11:27:39 2019 +0000
+++ b/graphics/MesaLib/options.mk       Fri Aug 23 11:37:48 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.67 2019/08/23 11:07:37 nia Exp $
+# $NetBSD: options.mk,v 1.68 2019/08/23 11:37:48 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS=         llvm dri wayland
@@ -228,6 +228,7 @@
 .    include "../../lang/libLLVM/buildlink3.mk"
 .  else # !llvm
 MESON_ARGS+=           -Dgallium-xa=false
+MESON_ARGS+=           -Dgallium-vdpau=false
 MESON_ARGS+=           -Dllvm=false
 .  endif # llvm
 PLIST_SUBST+=          GLVER="1.2.0"