From owner-svn-ports-all@freebsd.org Wed Jun 10 20:12:21 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D524833E796; Wed, 10 Jun 2020 20:12:21 +0000 (UTC) (envelope-from manu@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49hynx58c0z4WR2; Wed, 10 Jun 2020 20:12:21 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ABCD2C357; Wed, 10 Jun 2020 20:12:21 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05AKCL5Y038096; Wed, 10 Jun 2020 20:12:21 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05AKCLfi038095; Wed, 10 Jun 2020 20:12:21 GMT (envelope-from manu@FreeBSD.org) Message-Id: <202006102012.05AKCLfi038095@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Wed, 10 Jun 2020 20:12:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538438 - head/graphics/mesa-dri X-SVN-Group: ports-head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/graphics/mesa-dri X-SVN-Commit-Revision: 538438 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jun 2020 20:12:21 -0000 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