From owner-svn-ports-all@freebsd.org Fri Feb 26 15:45:00 2021 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 E7191564BAE; Fri, 26 Feb 2021 15:45:00 +0000 (UTC) (envelope-from jbeich@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DnDW067Ryz4RTP; Fri, 26 Feb 2021 15:45:00 +0000 (UTC) (envelope-from jbeich@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 C556351BB; Fri, 26 Feb 2021 15:45:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11QFj0xJ062404; Fri, 26 Feb 2021 15:45:00 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11QFj0d4062401; Fri, 26 Feb 2021 15:45:00 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202102261545.11QFj0d4062401@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 26 Feb 2021 15:45:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566610 - in head/graphics/mesa-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/graphics/mesa-devel: . files X-SVN-Commit-Revision: 566610 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.34 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: Fri, 26 Feb 2021 15:45:01 -0000 Author: jbeich Date: Fri Feb 26 15:44:59 2021 New Revision: 566610 URL: https://svnweb.freebsd.org/changeset/ports/566610 Log: graphics/mesa-devel: split VKLAYERS from VULKAN after r566607 VULKAN was overloaded to include Vulkan drivers and layers. However, building layers requires at least one Vulkan driver. $ make showconfig [...] VULKAN=on: Vulkan layers: device-select,overlay [...] ====> Vulkan layers: device-select,overlay anv=on: Haswell and newer radv=on: Southern Islands and newer (implies LLVM) $ make clean all WIHOUT="anv radv" [...] ===> Checking for items in pkg-plist which are not in STAGEDIR Error: Missing: bin/mesa-overlay-control.py Error: Missing: lib/libVkLayer_MESA_device_select.so Error: Missing: lib/libVkLayer_MESA_overlay.so Error: Missing: share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json Error: Missing: share/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json ===> Error: Plist issues found. *** Error code 1 PR: 253741 Modified: head/graphics/mesa-devel/Makefile (contents, props changed) head/graphics/mesa-devel/files/libmap.conf.in (contents, props changed) head/graphics/mesa-devel/pkg-plist (contents, props changed) Modified: head/graphics/mesa-devel/Makefile ============================================================================== --- head/graphics/mesa-devel/Makefile Fri Feb 26 15:40:37 2021 (r566609) +++ head/graphics/mesa-devel/Makefile Fri Feb 26 15:44:59 2021 (r566610) @@ -56,8 +56,8 @@ PLIST_SUB= ARCH=${ARCH:S/amd/x86_/} LDFLAGS+= -fuse-ld=lld .endif -OPTIONS_DEFINE= LIBUNWIND LLVM LTO VAAPI VDPAU VULKAN WAYLAND X11 ZSTD -OPTIONS_DEFAULT= LIBUNWIND LLVM LTO VAAPI VDPAU VULKAN WAYLAND X11 ZSTD +OPTIONS_DEFINE= LIBUNWIND LLVM LTO VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD +OPTIONS_DEFAULT= LIBUNWIND LLVM LTO VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD OPTIONS_GROUP= DRI GALLIUM VULKAN OPTIONS_GROUP_DRI= i965 OPTIONS_GROUP_GALLIUM= iris r600 radeonsi @@ -90,6 +90,10 @@ iris_DESC= Broadwell and newer r600_DESC= R600, R700, Evergreen, Northern Islands (implies LLVM) radeonsi_DESC= Southern Islands and newer (implies LLVM) +VULKAN_DESC= Vulkan drivers +anv_DESC= Haswell and newer +radv_DESC= Southern Islands and newer (implies LLVM) + COINST_DESC= Allow co-installation with another Mesa port COINST_VARS= LLVM_DEFAULT=10 # chase mesa-dri COINST_MESON_ON= -Degl-lib-suffix=${PKGNAMESUFFIX} @@ -125,11 +129,10 @@ VDPAU_BUILD_DEPENDS= libvdpau>0:multimedia/libvdpau VDPAU_MESON_ENABLED= gallium-vdpau VDPAU_IMPLIES= X11 -VULKAN_DESC= Vulkan layers: ${VULKAN_MESON_TRUE:S/vulkan-//:S/-layer//:ts,} -VULKAN_BUILD_DEPENDS= glslangValidator:graphics/glslang -VULKAN_MESON_TRUE= vulkan-device-select-layer vulkan-overlay-layer -anv_DESC= Haswell and newer -radv_DESC= Southern Islands and newer (implies LLVM) +VKLAYERS_DESC= Vulkan layers: ${VKLAYERS_MESON_TRUE:S/vulkan-//:S/-layer//:ts,} (implies ${VKLAYERS_IMPLIES}) +VKLAYERS_BUILD_DEPENDS= glslangValidator:graphics/glslang +VKLAYERS_MESON_TRUE= vulkan-device-select-layer vulkan-overlay-layer +VKLAYERS_IMPLIES= ${"${PORT_OPTIONS:Mradv}":?radv:anv} # any from OPTIONS_GROUP_VULKAN WAYLAND_BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-server.so:graphics/wayland Modified: head/graphics/mesa-devel/files/libmap.conf.in ============================================================================== --- head/graphics/mesa-devel/files/libmap.conf.in Fri Feb 26 15:40:37 2021 (r566609) +++ head/graphics/mesa-devel/files/libmap.conf.in Fri Feb 26 15:44:59 2021 (r566610) @@ -15,7 +15,6 @@ # GBM clients like eglkms and wlroots fail otherwise libgbm.so.1 libgbm%%SUFFIX%%.so.1 -%%VULKAN%%# Avoid different versions of the same driver showing up as multiple GPUs %%anv%%%%PREFIX%%/lib/libvulkan_intel.so libvulkan_intel%%SUFFIX%%.so %%radv%%%%PREFIX%%/lib/libvulkan_radeon.so libvulkan_radeon%%SUFFIX%%.so Modified: head/graphics/mesa-devel/pkg-plist ============================================================================== --- head/graphics/mesa-devel/pkg-plist Fri Feb 26 15:40:37 2021 (r566609) +++ head/graphics/mesa-devel/pkg-plist Fri Feb 26 15:44:59 2021 (r566610) @@ -1,4 +1,4 @@ -%%VULKAN%%bin/mesa-overlay-control.py +%%VKLAYERS%%bin/mesa-overlay-control.py %%COINST%%@sample etc/libmap.d/mesa%%SUFFIX%%.conf.sample %%NO_GLVND%%%%NO_COINST%%include/EGL/egl.h %%NO_GLVND%%%%NO_COINST%%include/EGL/eglext.h @@ -50,8 +50,8 @@ %%GLVND%%%%X11%%%%NO_COINST%%lib/libGLX_mesa%%SUFFIX%%.so %%GLVND%%%%X11%%lib/libGLX_mesa%%SUFFIX%%.so.0 %%GLVND%%%%X11%%lib/libGLX_mesa%%SUFFIX%%.so.0.0.0 -%%VULKAN%%lib/libVkLayer_MESA_device_select.so -%%VULKAN%%lib/libVkLayer_MESA_overlay.so +%%VKLAYERS%%lib/libVkLayer_MESA_device_select.so +%%VKLAYERS%%lib/libVkLayer_MESA_overlay.so %%NO_COINST%%lib/libgbm%%SUFFIX%%.so lib/libgbm%%SUFFIX%%.so.1 lib/libgbm%%SUFFIX%%.so.1.0.0 @@ -76,7 +76,7 @@ lib/libglapi%%SUFFIX%%.so.0.0.0 %%NO_GLVND%%%%NO_COINST%%libdata/pkgconfig/glesv2.pc share/drirc.d/00-mesa%%SUFFIX%%-defaults.conf %%GLVND%%%%NO_COINST%%share/glvnd/egl_vendor.d/50_mesa.json -%%VULKAN%%share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json +%%VKLAYERS%%share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json %%anv%%%%NO_COINST%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json %%radv%%%%NO_COINST%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json -%%VULKAN%%share/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json +%%VKLAYERS%%share/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json