Date: Wed, 15 Jan 2025 16:04:48 GMT From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 292212312477 - main - emulators/wine-devel: Use option helpers for WAYLAND Message-ID: <202501151604.50FG4meF064749@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=2922123124772866f25f8e7e2ea884d5624e533f commit 2922123124772866f25f8e7e2ea884d5624e533f Author: Gerald Pfeifer <gerald@FreeBSD.org> AuthorDate: 2025-01-15 16:02:49 +0000 Commit: Gerald Pfeifer <gerald@FreeBSD.org> CommitDate: 2025-01-15 16:02:49 +0000 emulators/wine-devel: Use option helpers for WAYLAND PLIST_SUB was already active, so nothing to explicitly do regarding pkg-plist. PR: 282825 Suggested by: vvd --- emulators/wine-devel/Makefile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 02d04a6bdbd6..38718b79b3a0 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -113,6 +113,8 @@ V4L_CONFIGURE_WITH= v4l2 V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l +WAYLAND_CONFIGURE_WITH= wayland + WINEMAKER_RUN_DEPENDS= p5-XML-LibXML>0:textproc/p5-XML-LibXML X11_CONFIGURE_WITH= x fontconfig freetype opengl xinerama xinput2 xrandr xrender @@ -132,14 +134,6 @@ CONFIGURE_ARGS+= --without-gstreamer PLIST_SUB+= GSTREAMER="@comment " .endif -.if ${PORT_OPTIONS:MWAYLAND} -CONFIGURE_ARGS+= --with-wayland -PLIST_SUB+= WAYLAND="" -.else -CONFIGURE_ARGS+= --without-wayland -PLIST_SUB+= WAYLAND="@comment " -.endif - .if ${ARCH} == amd64 # Wine is composed of three parts: # - wine (aka this port on FreeBSD/i386) is the 32-bit component
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501151604.50FG4meF064749>