Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Aug 2024 16:11:02 GMT
From:      Emmanuel Vadot <manu@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: b2ce4d0f8b92 - main - graphics/mesa-gallium-vdpau: Remove X11 option
Message-ID:  <202408231611.47NGB2DX025559@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b2ce4d0f8b92696ce5e2afb48e40d77476629a86

commit b2ce4d0f8b92696ce5e2afb48e40d77476629a86
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2024-08-23 16:10:03 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2024-08-23 16:11:01 +0000

    graphics/mesa-gallium-vdpau: Remove X11 option
    
    VDPAU state tracker cannot be compiled without X11 support
    
    PR:             276467
    Sponsored by:   Beckhoff Automation GmbH & Co. KG
---
 graphics/mesa-gallium-vdpau/Makefile | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/graphics/mesa-gallium-vdpau/Makefile b/graphics/mesa-gallium-vdpau/Makefile
index 8ad6ca75cfb5..eb4b6fd484c8 100644
--- a/graphics/mesa-gallium-vdpau/Makefile
+++ b/graphics/mesa-gallium-vdpau/Makefile
@@ -14,13 +14,9 @@ ONLY_FOR_ARCHS_REASON=	used only by AMD/Radeon hardware
 BUILD_DEPENDS=	libvdpau>=0:multimedia/libvdpau
 LIB_DEPENDS=	libzstd.so:archivers/zstd
 
-USES=		llvm:lib,noexport
+USES=		llvm:lib,noexport xorg
 
-OPTIONS_DEFINE=		X11
-OPTIONS_DEFAULT=	X11
-X11_DESC=		Enable X11 support
-X11_USES=		xorg
-X11_USE=		xorg=xorgproto,x11,xcb,xdamage,xext,xfixes,xshmfence,xxf86vm,xrandr
+USE_XORG=	xorgproto x11 xcb xdamage xext xfixes xshmfence xxf86vm xrandr
 
 .include <bsd.port.options.mk>
 .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
@@ -46,20 +42,11 @@ MESON_ARGS+=	-Dgallium-drivers="r600,radeonsi" \
 
 LDFLAGS_i386=	-Wl,-znotext
 
-MESON_ARGS+=	-Dgallium-vdpau=enabled
+MESON_ARGS+=	-Dplatforms="x11" \
+		-Dgallium-vdpau=enabled
 
 .if ${ARCH} != amd64
 MESON_ARGS+=	-Dintel-rt=disabled # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629
 .endif
 
-.if ${PORT_OPTIONS:MX11}
-MESON_ARGS+=	-Dplatforms="x11"
-.else
-MESON_ARGS+=	-Dglx=disabled \
-		-Degl=disabled \
-		-Dopengl=false \
-		-Dshared-glapi=disabled \
-		-Dplatforms=""
-.endif
-
 .include <bsd.port.post.mk>


help

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