From nobody Mon Jul 01 08:18:33 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 4WCJpK21nMz5Pqrm; Mon, 01 Jul 2024 08:18:33 +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 4WCJpK0vQCz4y6n; Mon, 1 Jul 2024 08:18:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719821913; 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=gxY+hB1VNVOb+ERc6V+M6LTsjNPWTyGTX7VlgNI2WFU=; b=N1dku30StCY9WRyjvOnGqRPc1D5YVYAya0jkvDdJtxstEphmlMVPIx+RxrhGMuNeaGns7A jkZcruCcywCx6w9B0K/YhZM0nMGq8fldSqfTSALaWO4+6Ux97uAhhfUJgiJtvBEO8JHfw6 PkdyTSTet4rP8x3NE29RdINioVy3vVLA4bifaVEBS9Onrq4wbX4NAwT6z6RK3tiD23xLZM WU1crX1JFwSo5zQAKH9SWcOMSCIDJfOAN6reSya+3cW83/6Ke6Grr1Mjwm9dnEnYV98GeO hxJhohPHG6H4pVaIqEbXBjJgZJDFPJRz7oMik88ARWSwYt01QmJ754S2rQT5tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719821913; a=rsa-sha256; cv=none; b=DEZD5RCf30PgfFjDwOQN58kqooMRgD/ng3h6L7wGLvcPeoVQynlkZnzBF+CefYaj1QYCp4 l6BCgXN96UaZZCxW8osXZutWfhe9Y64kFDf+TbbqRtQ076hBmviivSJBDG+bSVHr0l9wmB 9YBr1FLd0UsKoHgOxdQQv+DPUCvA/x1li1d0+5Zi+DFfkDtjt89TZ80G1lw5vYNFqv/j3L rMgaHGa1pXqKp9ip+Dy6auGpx31u3A418bJ4w0sPhZPVIcjScTXTBFWPz6WCVZk3gtHwP/ GXlo97TIxAbKjtMzlIpD2Ov5Vxdv+DZXwwmtjrqeBTfHNa5hGXpuMhbCQPyH8A== 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=1719821913; 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=gxY+hB1VNVOb+ERc6V+M6LTsjNPWTyGTX7VlgNI2WFU=; b=NdPDbiFAij0I/2xDS3oMj4SrfJrlMZq7Fb7gM77UVZYZgaqON0kJ234bsdmBuID+URduD1 Hoef8UJ0OHDIPMDqZDdKB3keW6iYhkSWQ0falLUleUhZjstTnF+KGJXAGG0BPwXWgB53Du Igafd4/cQMWqzQRjWP+F2moUd5aFBZJLlwaSw1YYSXck3zWbabmG858FQi0IYnpLa0cDv8 lsYRZGwTQ10FMl2lhX4Tt8P8g8eA7yT8NmqH+uXDfhy+XFYECMIhAq08fsY/fLBsg2aNkj 1hEUOXKmT5dRQmsiafh4s3ggV7z3PehhJvHK2VbKKjFPfa7pl6oKDXdCPXEXEg== 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 4WCJpK0Vlyzxt2; Mon, 1 Jul 2024 08:18:33 +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 4618IXqG069289; Mon, 1 Jul 2024 08:18:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4618IXVX069286; Mon, 1 Jul 2024 08:18:33 GMT (envelope-from git) Date: Mon, 1 Jul 2024 08:18:33 GMT Message-Id: <202407010818.4618IXVX069286@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: a26876a1e5f8 - main - graphics/mesa: Fix X11 options 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: a26876a1e5f8629e203f98d279dad670be735652 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=a26876a1e5f8629e203f98d279dad670be735652 commit a26876a1e5f8629e203f98d279dad670be735652 Author: Emmanuel Vadot AuthorDate: 2024-06-26 14:27:07 +0000 Commit: Emmanuel Vadot CommitDate: 2024-07-01 08:17:57 +0000 graphics/mesa: Fix X11 options We need to disable xlib-lease otherwise meson will fail to configure the port Differential Revision: https://reviews.freebsd.org/D45744 Reviewed by: bapt Sponsored by: Beckhoff Automation GmbH & Co. KG --- graphics/mesa-dri/Makefile | 2 ++ graphics/mesa-libs/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile index b656f81d0a7d..b0f9f3699612 100644 --- a/graphics/mesa-dri/Makefile +++ b/graphics/mesa-dri/Makefile @@ -56,6 +56,8 @@ LDFLAGS_i386= -Wl,-znotext .if ${PORT_OPTIONS:MX11} MESA_PLATFORMS+= x11 USE_XORG+= xcb xorgproto xrandr x11 xdamage xext xfixes xshmfence xv +.else +MESON_ARGS+= -Dxlib-lease=disabled .endif .if ${PORT_OPTIONS:MWAYLAND} diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile index c1e04551a089..e2d8f3f8e860 100644 --- a/graphics/mesa-libs/Makefile +++ b/graphics/mesa-libs/Makefile @@ -57,7 +57,7 @@ USE_XORG+= xorgproto x11 xcb xdamage xext \ xfixes xshmfence xxf86vm xrandr PLIST_SUB+= GLX="" .else -MESON_ARGS+= -Dglx=disabled +MESON_ARGS+= -Dglx=disabled -Dxlib-lease=disabled PLIST_SUB+= GLX="@comment " .endif