2 files changed, 21 insertions, 21 deletions

diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile
index c4d66beedca0..e6fec368cead 100644
--- a/graphics/mesa-libs/Makefile
+++ b/graphics/mesa-libs/Makefile
@@ -11,7 +11,7 @@ CONFLICTS_INSTALL=	libglvnd # include/GL/gl.h
 
 USES=		xorg
 USE_XORG=	xorgproto x11 xcb xdamage xext \
-		xfixes xshmfence xxf86vm
+		xfixes xshmfence xxf86vm xrandr
 
 OPTIONS_DEFINE=	WAYLAND
 OPTIONS_DEFAULT=WAYLAND
@@ -24,25 +24,26 @@ WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland
 .include <bsd.port.options.mk>
 .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
 
-CONFIGURE_ARGS+=	--with-dri-drivers="" --with-gallium-drivers=""
+MESON_ARGS+=	-Dgallium-drivers="" \
+		-Dgallium-vdpau=false \
+		-Dgallium-xvmc=false \
+		-Dgallium-omx=disabled \
+		-Dgallium-va=false \
+		-Dgallium-xa=false \
+		-Dgallium-nine=false \
+		-Dgallium-clover=disabled \
+		-Dosmesa=none \
+		-Dtools="" \
+		-Degl=true \
+		-Dgbm=true \
+		-Dvulkan-drivers=""
+# Building EGL and GBM requires a dri driver so add swrast
+MESON_ARGS+=	-Ddri-drivers="swrast"
 
 .if ${PORT_OPTIONS:MWAYLAND}
-CONFIGURE_ARGS+=	--with-platforms=x11,surfaceless,drm,wayland
+MESON_ARGS+=	-Dplatforms=x11,surfaceless,drm,wayland
 .endif
 
-MESA_BUILD_WRKSRC=	src/mapi src/util
-MESA_INSTALL_WRKSRC=	src/mapi
-
-.if ${PORT_OPTIONS:MWAYLAND}
-MESA_BUILD_WRKSRC+=	src/egl/wayland/wayland-drm
-.endif
-
-MESA_BUILD_WRKSRC+=	src/gbm src/glx
-MESA_INSTALL_WRKSRC+=	src/gbm src/glx
-
-MESA_BUILD_WRKSRC+=	src/egl
-MESA_INSTALL_WRKSRC+=	src/egl
-
 .if ${ARCH} == "i386"
 # PR230239 Fix the build for i386 when WITH_LLD_IS_LD is set
 LDFLAGS+=-Wl,-z,notext
@@ -52,8 +53,4 @@ USE_GCC=	yes
 
 .include "${MASTERDIR}/Makefile.targets"
 
-post-install:
-	@cd ${WRKSRC}/src && ${SETENV} DESTDIR=${STAGEDIR} \
-		${MAKE_CMD} install-pkgconfigDATA install-glHEADERS install-glxHEADERS
-
 .include <bsd.port.post.mk>
diff --git a/graphics/mesa-libs/pkg-plist b/graphics/mesa-libs/pkg-plist
index c13d3cb1ba0c..904a118c9391 100644
--- a/graphics/mesa-libs/pkg-plist
+++ b/graphics/mesa-libs/pkg-plist
@@ -1,4 +1,3 @@
-@comment etc/drirc
 include/EGL/egl.h
 include/EGL/eglext.h
 include/EGL/eglextchromium.h
@@ -11,6 +10,7 @@ include/GL/glext.h
 include/GL/glx.h
 include/GL/glx_mangle.h
 include/GL/glxext.h
+@comment include/GL/internal/dri_interface.h
 include/GLES2/gl2.h
 include/GLES2/gl2ext.h
 include/GLES2/gl2platform.h
@@ -21,6 +21,7 @@ include/GLES3/gl3ext.h
 include/GLES3/gl3platform.h
 include/KHR/khrplatform.h
 include/gbm.h
+@comment lib/dri/swrast_dri.so
 lib/libEGL.so
 lib/libEGL.so.1
 lib/libEGL.so.1.0.0
@@ -36,7 +37,9 @@ lib/libgbm.so.1.0.0
 lib/libglapi.so
 lib/libglapi.so.0
 lib/libglapi.so.0.0.0
+@comment libdata/pkgconfig/dri.pc
 libdata/pkgconfig/egl.pc
 libdata/pkgconfig/gbm.pc
 libdata/pkgconfig/gl.pc
 libdata/pkgconfig/glesv2.pc
+@comment share/drirc.d/00-mesa-defaults.conf