Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 Nov 2020 22:16:47 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r556460 - head/x11-servers/xwayland-devel
Message-ID:  <202011272216.0ARMGlkt085279@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Nov 27 22:16:46 2020
New Revision: 556460
URL: https://svnweb.freebsd.org/changeset/ports/556460

Log:
  x11-servers/xwayland-devel: bring minor improvements from xarcan
  
  - Use -D${PORTNAME}=true to denote the only X server enabled
  - Annotate do-install target is a workaround

Modified:
  head/x11-servers/xwayland-devel/Makefile   (contents, props changed)

Modified: head/x11-servers/xwayland-devel/Makefile
==============================================================================
--- head/x11-servers/xwayland-devel/Makefile	Fri Nov 27 22:16:39 2020	(r556459)
+++ head/x11-servers/xwayland-devel/Makefile	Fri Nov 27 22:16:46 2020	(r556460)
@@ -34,7 +34,7 @@ USE_GL=		gbm gl
 USE_XORG=	pixman xau xdmcp xfont2 xkbfile xshmfence xtrans
 GH_ACCOUNT=	freedesktop
 GH_PROJECT=	xorg-xserver
-MESON_ARGS=	-Dxwayland=true \
+MESON_ARGS=	-D${PORTNAME}=true \
 		-Dxorg=false \
 		-Dxnest=false \
 		-Dxvfb=false \
@@ -64,7 +64,7 @@ NVIDIA_BUILD_DEPENDS=	egl-wayland>0:graphics/egl-wayla
 NVIDIA_MESON_TRUE=	xwayland_eglstream
 
 do-install:
-# Wayland compositors only use the binary
+# XXX Prevent Meson from installing unrelated files
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/hw/xwayland/Xwayland \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${BUILD_WRKSRC}/hw/xwayland/xwayland.pc \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011272216.0ARMGlkt085279>