CVS commit: pkgsrc/graphics/MesaLib18

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Thu Apr 11 16:27:03 UTC 2019

Modified Files:
        pkgsrc/graphics/MesaLib18: dri.mk options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/MesaLib18/dri.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/MesaLib18/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/MesaLib18/dri.mk
diff -u pkgsrc/graphics/MesaLib18/dri.mk:1.1 pkgsrc/graphics/MesaLib18/dri.mk:1.2
--- pkgsrc/graphics/MesaLib18/dri.mk:1.1        Sun Oct  7 23:49:31 2018
+++ pkgsrc/graphics/MesaLib18/dri.mk    Thu Apr 11 16:27:03 2019
@@ -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.libdrm+=                libdrm>=
 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"

Index: pkgsrc/graphics/MesaLib18/options.mk
diff -u pkgsrc/graphics/MesaLib18/options.mk:1.11 pkgsrc/graphics/MesaLib18/options.mk:1.12
--- pkgsrc/graphics/MesaLib18/options.mk:1.11   Sat Jan 26 21:28:29 2019
+++ pkgsrc/graphics/MesaLib18/options.mk        Thu Apr 11 16:27:03 2019
@@ -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-gles1
 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