[pkgsrc/trunk]: pkgsrc/graphics/MesaLib18 mesalib18: the previous commit was ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c95dd3442e9d
branches:  trunk
changeset: 394418:c95dd3442e9d
user:      maya <maya%pkgsrc.org@localhost>
date:      Thu Apr 11 16:27:03 2019 +0000

description:
mesalib18: the previous commit was actually about the combination of
-dri +osmesa. the dri case wasn't broken and already had expat.
expat is an easy dependency, and the default case will need it (and will
have it for various xorg things), so let's just keep it unconditional
and remove the conditional expat.

diffstat:

 graphics/MesaLib18/dri.mk     |  3 +--
 graphics/MesaLib18/options.mk |  4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r 5591daf0954c -r c95dd3442e9d graphics/MesaLib18/dri.mk
--- a/graphics/MesaLib18/dri.mk Thu Apr 11 16:05:24 2019 +0000
+++ b/graphics/MesaLib18/dri.mk Thu Apr 11 16:27:03 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dri.mk,v 1.1 2018/10/07 23:49:31 ryoon Exp $
+# $NetBSD: dri.mk,v 1.2 2019/04/11 16:27:03 maya Exp $
 #
 # Currently, this is for convenience only.
 #
@@ -19,7 +19,6 @@
 BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.9.3
 .    endif
 .  endif
-.  include "../../textproc/expat/buildlink3.mk"
 .  include "../../x11/xorgproto/buildlink3.mk"
 # XXX these do not have builtin.mk
 .  if ${X11_TYPE} == "modular"
diff -r 5591daf0954c -r c95dd3442e9d graphics/MesaLib18/options.mk
--- a/graphics/MesaLib18/options.mk     Thu Apr 11 16:05:24 2019 +0000
+++ b/graphics/MesaLib18/options.mk     Thu Apr 11 16:27:03 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2019/01/26 21:28:29 tnn Exp $
+# $NetBSD: options.mk,v 1.12 2019/04/11 16:27:03 maya Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS=         llvm dri
@@ -273,8 +273,6 @@
 CONFIGURE_ARGS+=       --disable-gles2
 CONFIGURE_ARGS+=       --enable-xlib-glx
 CONFIGURE_ARGS+=       --with-platforms=x11
-# XXX configure looks for expat but doesn't actually need it in non-dri case
-CONFIGURE_ENV+=                EXPAT_CFLAGS=" " EXPAT_LIBS=" "
 .if !empty(PKG_OPTIONS:Mllvm)
 PKG_FAIL_REASON+=      "The llvm PKG_OPTION must also be disabled when dri is disabled"
 .endif