CVS commit: pkgsrc/graphics/MesaLib

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Aug 23 11:37:48 UTC 2019

Modified Files:
        pkgsrc/graphics/MesaLib: Makefile options.mk

Log Message:
MesaLib: resolving some build failures when built without LLVM


To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 pkgsrc/graphics/MesaLib/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/graphics/MesaLib/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/MesaLib/Makefile
diff -u pkgsrc/graphics/MesaLib/Makefile:1.152 pkgsrc/graphics/MesaLib/Makefile:1.153
--- pkgsrc/graphics/MesaLib/Makefile:1.152      Thu Aug 22 17:24:01 2019
+++ pkgsrc/graphics/MesaLib/Makefile    Fri Aug 23 11:37:48 2019
@@ -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 @@ CONF_FILES+=          ${EGDIR}/00-mesa-defaults.
 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 @@ post-install:
 .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"

Index: pkgsrc/graphics/MesaLib/options.mk
diff -u pkgsrc/graphics/MesaLib/options.mk:1.67 pkgsrc/graphics/MesaLib/options.mk:1.68
--- pkgsrc/graphics/MesaLib/options.mk:1.67     Fri Aug 23 11:07:37 2019
+++ pkgsrc/graphics/MesaLib/options.mk  Fri Aug 23 11:37:48 2019
@@ -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 @@ BUILDLINK_API_DEPENDS.libLLVM+= libLLVM>
 .    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"