From nobody Mon Jul 01 08:18:31 2024 X-Original-To: dev-commits-ports-main@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 4WCJpJ2PWcz5Pqps; Mon, 01 Jul 2024 08:18:32 +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 4WCJpJ0CT4z4yCh; Mon, 1 Jul 2024 08:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719821912; 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=w3yeoih2IW7XhjpEZa+GEbIL1mHGKDnOAPH7j3wyEkE=; b=aYAYH9CuFzJPE63Tj81Qu2jDXYmJgB8vglFNyKAHTQST42JxeUg0c99XfgkMiQSrnDrESD wW0inzw81cWUMAsx2Kypg1A1m2LXeFpWBNX4Ygtbioni7GGgftNDhOiAtHLHLQmmIgunyP 6hqioOSGcOL/bP5iGd90OFBlUApJi/xW91r9DMI/k5RCMbIyGY8XuweMwnv36lx/11FZQJ NbZ93w7G0GnMBdEAaLn4it1rz0+GigDcvuO52I7q+dTjKVIBTBnlqyhaMdjKtBWnx1o+C2 BfSLZaSxwWVlmjg3Roug7lenQnpgymDhkRQcRCezzIH2NWdLttBfSbrbkLgH9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719821912; a=rsa-sha256; cv=none; b=Zjq8y83KhUpuU5RlMEWtnTyx090t3/dHDsKMDEZ7skXJldyFE8tVmxGe4efhB/P0pIBxoa 9Wg6h+kOudbvPWa/K/wMm6DeQg0E4zV3JJIxzHhS7cBAL0rsmE+ytBrt65E1XBkuJ+b8nn EK4ZCjWksIchXw4GAVEphJSDNRtUHtcNGhlNOx4ez+Iei93zioOICc5Fy+QvL//xT6neL0 amyVSIXmURWlrhneK91suERsSGdN9zD0djCtFosEqVJSeiWpLUEUJCkkbpoABvZi8ahQMy oa4BgRJKwOaaLBqwJXbntm6n13ArE2GxfOEUfXsJkyii0LJMgDgFtYpn7XUacQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719821912; 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=w3yeoih2IW7XhjpEZa+GEbIL1mHGKDnOAPH7j3wyEkE=; b=Sswmyq7KKUSmsy2/u6Wcy7Fm6Q2gCWXxYgepNBeNAFasJ+jl9sSmSLUOtnevkHvTx4CXVu 8JKJNx1n8hvVGFUKPaagMb25WAL61nAHVNlpJl8lojKjtr85D2WjN3YUCZAYjOBYb9kvR4 6jgRPL3qtUPGhyWSCfwXAQEr+zgyn8u82Qlg0yizhuG1+YoiXHmLZH8XRYcsKZ053JT0Px Pu6YLkLJlmVMZw7ueUclgnqk9FcE2E7Ywsf34GLFB8QOVGxeAaT1fOwWhXKtPswVSd5k39 9qo07efdYXvHJ4FB8K3Xzx2xa0jq1oQAuA/0jnpHLZGNnL5eHH6gJi31TbmRmw== 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 4WCJpH6wDKzxPY; Mon, 1 Jul 2024 08:18:31 +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 4618IVsS069250; Mon, 1 Jul 2024 08:18:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4618IVAk069247; Mon, 1 Jul 2024 08:18:31 GMT (envelope-from git) Date: Mon, 1 Jul 2024 08:18:31 GMT Message-Id: <202407010818.4618IVAk069247@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: aa6c9614c0f6 - main - graphics/mesa: Simplify x11/wayland option List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa6c9614c0f637cf82b56467e5d918c1e0988369 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=aa6c9614c0f637cf82b56467e5d918c1e0988369 commit aa6c9614c0f637cf82b56467e5d918c1e0988369 Author: Emmanuel Vadot AuthorDate: 2024-06-26 13:18:23 +0000 Commit: Emmanuel Vadot CommitDate: 2024-07-01 08:17:57 +0000 graphics/mesa: Simplify x11/wayland option Simply use X11 for x11 support as it's done for all other ports. Same for Wayland, just use WAYLAND. While here always use xcb and xrandr for X11 support in mesa-dri as we always build a vulkan driver (swrast). Differential Revision: https://reviews.freebsd.org/D45743 Reviewed by: bapt Sponsored by: Beckhoff Automation GmbH & Co. KG --- graphics/mesa-dri/Makefile | 30 ++++++++++++------------------ graphics/mesa-dri/Makefile.common | 2 +- graphics/mesa-libs/Makefile | 25 +++++++++++-------------- 3 files changed, 24 insertions(+), 33 deletions(-) diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile index f9ba777266c4..b656f81d0a7d 100644 --- a/graphics/mesa-dri/Makefile +++ b/graphics/mesa-dri/Makefile @@ -1,5 +1,6 @@ PORTNAME= mesa-dri PORTVERSION= ${MESAVERSION} +PORTREVISION= 1 CATEGORIES= graphics COMMENT= OpenGL hardware acceleration drivers for DRI2+ @@ -10,20 +11,16 @@ LIB_DEPENDS+= libglapi.so:graphics/mesa-libs USES+= llvm:lib,noexport OPTIONS_GROUP= PLATFORM -OPTIONS_GROUP_PLATFORM= PLATFORM_X11 PLATFORM_WAYLAND -PLATFORM_X11_DESC= Enable X11 support for GBM/EGL -PLATFORM_WAYLAND_DESC= Enable Wayland support for GBM/EGL -PLATFORM_WAYLAND_IMPLIES= WAYLAND - -OPTIONS_DEFINE= WAYLAND ZSTD -OPTIONS_DEFAULT= WAYLAND PLATFORM_X11 PLATFORM_WAYLAND ZSTD +OPTIONS_GROUP_PLATFORM= X11 WAYLAND +X11_DESC= Enable X11 support for GBM/EGL +WAYLAND_DESC= Enable Wayland support for GBM/EGL and Vulkan +WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.8:graphics/wayland-protocols +WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland + +OPTIONS_DEFINE= ZSTD +OPTIONS_DEFAULT= WAYLAND X11 ZSTD OPTIONS_SUB= yes -WAYLAND_DESC= Enable support for the Wayland platform in Vulkan drivers -WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.8:graphics/wayland-protocols -WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland -WAYLAND_IMPLIES= PLATFORM_WAYLAND - ZSTD_DESC= Use ZSTD for shader cache ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd ZSTD_MESON_ENABLED= zstd @@ -56,15 +53,12 @@ VULKAN_DRIVERS+= INTEL LDFLAGS_i386= -Wl,-znotext -.if ${PORT_OPTIONS:MPLATFORM_X11} +.if ${PORT_OPTIONS:MX11} MESA_PLATFORMS+= x11 -USE_XORG+= xorgproto x11 xdamage xext xfixes xshmfence xv -.if defined(VULKAN_DRIVERS) -USE_XORG+= xcb xrandr -.endif +USE_XORG+= xcb xorgproto xrandr x11 xdamage xext xfixes xshmfence xv .endif -.if ${PORT_OPTIONS:MPLATFORM_WAYLAND} +.if ${PORT_OPTIONS:MWAYLAND} MESA_PLATFORMS+= wayland .endif diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common index 6e9bb1fcf85f..66dde6177702 100644 --- a/graphics/mesa-dri/Makefile.common +++ b/graphics/mesa-dri/Makefile.common @@ -28,7 +28,7 @@ COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//} BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} .if ${COMPONENT} != clover -.if ${PORT_OPTIONS:MPLATFORM_X11} +.if ${PORT_OPTIONS:MX11} USES+= xorg .endif .endif diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile index f0bb8f7ec8e7..c1e04551a089 100644 --- a/graphics/mesa-libs/Makefile +++ b/graphics/mesa-libs/Makefile @@ -1,5 +1,6 @@ PORTNAME= mesa-libs PORTVERSION= ${MESAVERSION} +PORTREVISION= 1 CATEGORIES= graphics COMMENT= OpenGL libraries that support GLX and EGL clients @@ -12,20 +13,16 @@ USES= llvm:noexport BUILD_DEPENDS= libglvnd>=0:graphics/libglvnd -OPTIONS_GROUP= PLATFORM -OPTIONS_GROUP_PLATFORM= PLATFORM_X11 PLATFORM_WAYLAND -PLATFORM_X11_DESC= Enable X11 support for GBM/EGL -PLATFORM_WAYLAND_DESC= Enable Wayland support for GBM/EGL -PLATFORM_WAYLAND_IMPLIES= WAYLAND - -OPTIONS_DEFINE= WAYLAND ZSTD -OPTIONS_DEFAULT=WAYLAND PLATFORM_X11 PLATFORM_WAYLAND ZSTD -OPTIONS_SUB= yes - -WAYLAND_DESC= Enable support for the Wayland platform in EGL +OPTIONS_GROUP= PLATFORM +OPTIONS_GROUP_PLATFORM= X11 WAYLAND +X11_DESC= Enable X11 support for GBM/EGL +WAYLAND_DESC= Enable Wayland support for GBM/EGL WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.8:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-server.so:graphics/wayland -WAYLAND_IMPLIES= PLATFORM_WAYLAND + +OPTIONS_DEFINE= ZSTD +OPTIONS_DEFAULT= WAYLAND X11 ZSTD +OPTIONS_SUB= yes ZSTD_DESC= Use ZSTD for shader cache ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd @@ -54,7 +51,7 @@ MESON_ARGS+= -Dandroid-libbacktrace=disabled \ # Building EGL and GBM requires a driver so add r300 MESON_ARGS+= -Dgallium-drivers="r300" -.if ${PORT_OPTIONS:MPLATFORM_X11} +.if ${PORT_OPTIONS:MX11} MESA_PLATFORMS+= x11 USE_XORG+= xorgproto x11 xcb xdamage xext \ xfixes xshmfence xxf86vm xrandr @@ -64,7 +61,7 @@ MESON_ARGS+= -Dglx=disabled PLIST_SUB+= GLX="@comment " .endif -.if ${PORT_OPTIONS:MPLATFORM_WAYLAND} && ${PORT_OPTIONS:MWAYLAND} +.if ${PORT_OPTIONS:MWAYLAND} MESA_PLATFORMS+= wayland .endif