From nobody Wed Jan 15 16:04:48 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YY9mx17Ykz5kJdc; Wed, 15 Jan 2025 16:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YY9mw5DNMz3rgk; Wed, 15 Jan 2025 16:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736957088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DwlnntviwWd3cSy/KJJJOECvNrHlFWeKJrjkkkU6Dik=; b=LfDZJXyw+HNdBaSYaF40rCLF1HIhARCLU7Y4bOhkYzfQKrW/r0ddql8JkOhQQfMUup+xpN dAcfM6jqkrnsDCGIxjMWpaQv9wH3S03CFmlA0NOejLOd8mxmLoY3taGUtDgTyz3d/fuLjx ZecmGmkR2SQQGunYZpWplVmREjqkGRP8+yed7aVg40I3P7cnAt+/iXOuyNZxXRcUSCezEG 7nyrEjqV34brba+UzHhPmgZZJz74b/SjIb+De7aCcfXyLJ9935Xn1Hs6QxKWGE0Xr72Tbr zz4IV1s6ejrGCPIC+v1dap8CQCur1ZXIhPcxeAstglYmOUBxUrW3OzxWQGB6/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736957088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DwlnntviwWd3cSy/KJJJOECvNrHlFWeKJrjkkkU6Dik=; b=vl42ELtILcR8K6U5XpjucptKnCg/30YbAuB0FM4o7NVw+t/caZ2TUGVHHwHZ+aViFObFi0 R86qxR7m2tuxfZZL+t2FXMH7/d+DEf/db4fz0MGXYk52Jw0DXlySrXcsg8CeDYVfhYadvu 8quAh6Fc8xMKIyG3GQBSrs/QVleAeiYR/rLbtDh2tYppH5igNSVhQ3qFb5kJvrNqczXc18 XFG7qrQjHLC2JBHBDRB2AhHBm3XYU23ssr2nxIXFIbqsK/d62uE3SLiXdVwoVM1LlAD5OS /BERrRnTqbxX7RBZ7LuyqI9mXJtelIptx5syW9t0XroSJ/rxVBcm92a4qhN4pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736957088; a=rsa-sha256; cv=none; b=GUNvxMQG0Nip8SWZYhi99DLu0TFitsbMXTGH7jKH8zaD0NEGXyQTMV5BaPS7OQ64BsHU6x 4FeMPaCmSUQH4CTLGqDleQRqbb6nv30sLCHm61PRHOKmX0rSv2zQNb8bcHhfUg7lVzr4Nj JArbdOSWhC6CzTwmcwpDgEIs3NxLzRVMFCX0ZzzvJqjNAkTGr4lpiCq/5YyzSOaN8sJCgW Rh8PsBje6Q1LySuB8zQlS4Lm37kUTfm61XmAxqyi08LNg27Djh2kvwO/dbDKB7SBT0Y57X R2t63f3fPZ3Ck4DLyBAVmY3scbRGHuhpyY6TMazdzfGRoMbqZNgIxVlz5XPYUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YY9mw4pJvztJg; Wed, 15 Jan 2025 16:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50FG4mSw064752; Wed, 15 Jan 2025 16:04:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50FG4meF064749; Wed, 15 Jan 2025 16:04:48 GMT (envelope-from git) Date: Wed, 15 Jan 2025 16:04:48 GMT Message-Id: <202501151604.50FG4meF064749@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 292212312477 - main - emulators/wine-devel: Use option helpers for WAYLAND List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2922123124772866f25f8e7e2ea884d5624e533f Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=2922123124772866f25f8e7e2ea884d5624e533f commit 2922123124772866f25f8e7e2ea884d5624e533f Author: Gerald Pfeifer AuthorDate: 2025-01-15 16:02:49 +0000 Commit: Gerald Pfeifer 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