Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 10 Jun 2020 20:12:21 +0000 (UTC)
From:      Emmanuel Vadot <manu@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r538438 - head/graphics/mesa-dri
Message-ID:  <202006102012.05AKCLfi038095@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: manu
Date: Wed Jun 10 20:12:21 2020
New Revision: 538438
URL: https://svnweb.freebsd.org/changeset/ports/538438

Log:
  mesa-dri: Fix build when PLATFORM_X11 isn't set
  
  Approved by:	zeising (x11@ implicit)

Modified:
  head/graphics/mesa-dri/Makefile
  head/graphics/mesa-dri/pkg-plist

Modified: head/graphics/mesa-dri/Makefile
==============================================================================
--- head/graphics/mesa-dri/Makefile	Wed Jun 10 20:06:29 2020	(r538437)
+++ head/graphics/mesa-dri/Makefile	Wed Jun 10 20:12:21 2020	(r538438)
@@ -9,7 +9,7 @@ CATEGORIES=	graphics
 COMMENT=	OpenGL hardware acceleration drivers for DRI2+
 
 USES=		xorg
-USE_XORG=	xorgproto x11 xdamage xext xfixes xshmfence xv xvmc
+USE_XORG=	xorgproto x11 xdamage xext xfixes xshmfence
 
 OPTIONS_GROUP=			PLATFORM
 OPTIONS_GROUP_PLATFORM=		PLATFORM_X11 PLATFORM_WAYLAND PLATFORM_DRM PLATFORM_SURFACELESS
@@ -51,7 +51,10 @@ GALLIUM_DRIVERS=	SWRAST	# llvmpipe
 DRI_DRIVERS+=		R100 R200
 GALLIUM_DRIVERS+=	R300 R600 RADEONSI
 VULKAN_DRIVERS+=	AMD
+. if ${PORT_OPTIONS:MPLATFORM_X11}
+USE_XORG+=		xv xvmc
 MESON_ARGS+=		-Dgallium-xvmc=true
+. endif
 .endif
 .if ${ARCH} == amd64 || ${ARCH} == i386
 DRI_DRIVERS+=		I915 I965

Modified: head/graphics/mesa-dri/pkg-plist
==============================================================================
--- head/graphics/mesa-dri/pkg-plist	Wed Jun 10 20:06:29 2020	(r538437)
+++ head/graphics/mesa-dri/pkg-plist	Wed Jun 10 20:12:21 2020	(r538438)
@@ -18,10 +18,10 @@ include/GL/internal/dri_interface.h
 %%VAAPI%%%%RADEONSI_GDRIVER%%lib/dri/radeonsi_drv_video.so
 %%SWRAST_GDRIVER%%lib/dri/swrast_dri.so
 %%SVGA_GDRIVER%%lib/dri/vmwgfx_dri.so
-%%R600_GDRIVER%%lib/libXvMCr600.so
-%%R600_GDRIVER%%lib/libXvMCr600.so.1
-%%R600_GDRIVER%%lib/libXvMCr600.so.1.0
-%%R600_GDRIVER%%lib/libXvMCr600.so.1.0.0
+%%PLATFORM_X11%%%%R600_GDRIVER%%lib/libXvMCr600.so
+%%PLATFORM_X11%%%%R600_GDRIVER%%lib/libXvMCr600.so.1
+%%PLATFORM_X11%%%%R600_GDRIVER%%lib/libXvMCr600.so.1.0
+%%PLATFORM_X11%%%%R600_GDRIVER%%lib/libXvMCr600.so.1.0.0
 @comment lib/libgbm.so
 @comment lib/libgbm.so.1
 @comment lib/libgbm.so.1.0.0



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