From owner-svn-ports-head@freebsd.org Fri Feb 26 14:48:31 2021 Return-Path: Delivered-To: svn-ports-head@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 9EF23562F65; Fri, 26 Feb 2021 14:48:31 +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 4DnCFl6F9gz3snV; Fri, 26 Feb 2021 14:48:27 +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 D4648454F; Fri, 26 Feb 2021 14:48:26 +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 11QEmQGL025610; Fri, 26 Feb 2021 14:48:26 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11QEmQBc025609; Fri, 26 Feb 2021 14:48:26 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202102261448.11QEmQBc025609@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 14:48:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566607 - head/graphics/mesa-devel X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/graphics/mesa-devel X-SVN-Commit-Revision: 566607 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Feb 2021 14:48:31 -0000 Author: jbeich Date: Fri Feb 26 14:48:26 2021 New Revision: 566607 URL: https://svnweb.freebsd.org/changeset/ports/566607 Log: graphics/mesa-devel: stop nesting options after r537515 Adding _SINGLE/_MULTI in _DEFINE allows to disable all child options if the parent option is disabled. However, if only parent is disabled then the behavior is undefined. $ __MAKE_CONF= PORT_DBDIR=/var/empty make WITHOUT=DRI -V MESON_ARGS:M\*dri-driver\* -Ddri-drivers=i965 PR: 253741 Reported by: Evgeniy Khramtsov Modified: head/graphics/mesa-devel/Makefile (contents, props changed) Modified: head/graphics/mesa-devel/Makefile ============================================================================== --- head/graphics/mesa-devel/Makefile Fri Feb 26 14:48:20 2021 (r566606) +++ head/graphics/mesa-devel/Makefile Fri Feb 26 14:48:26 2021 (r566607) @@ -56,12 +56,12 @@ PLIST_SUB= ARCH=${ARCH:S/amd/x86_/} LDFLAGS+= -fuse-ld=lld .endif -OPTIONS_DEFINE= ${OPTIONS_MULTI} LIBUNWIND LLVM LTO VAAPI VDPAU WAYLAND X11 ZSTD -OPTIONS_DEFAULT= ${OPTIONS_MULTI} LIBUNWIND LLVM LTO VAAPI VDPAU WAYLAND X11 ZSTD -OPTIONS_MULTI= DRI GALLIUM VULKAN -OPTIONS_MULTI_DRI= i965 -OPTIONS_MULTI_GALLIUM= iris r600 radeonsi -OPTIONS_MULTI_VULKAN= anv radv +OPTIONS_DEFINE= LIBUNWIND LLVM LTO VAAPI VDPAU VULKAN WAYLAND X11 ZSTD +OPTIONS_DEFAULT= LIBUNWIND LLVM LTO VAAPI VDPAU VULKAN WAYLAND X11 ZSTD +OPTIONS_GROUP= DRI GALLIUM VULKAN +OPTIONS_GROUP_DRI= i965 +OPTIONS_GROUP_GALLIUM= iris r600 radeonsi +OPTIONS_GROUP_VULKAN= anv radv OPTIONS_EXCLUDE_DragonFly= LIBUNWIND anv OPTIONS_EXCLUDE_i386= LTO # anv: vkcube fails on vkCreateSwapchainKHR OPTIONS_EXCLUDE_powerpc64= ${"${/usr/bin/ld:L:tA}"==/usr/bin/ld.lld:?LTO:} # LLVM bug 47353 @@ -74,9 +74,9 @@ OPTIONS_SLAVE+= ${"${GL_DEFAULT:S/,/ /g:[1]}"==libglv OPTIONS_SUB= yes # Convert options to -D-drivers= -.for i in ${OPTIONS_MULTI} +.for i in ${OPTIONS_GROUP} MESON_ARGS+= -D${i:tl}-drivers=${${i}_DRIVERS:ts,} -. for j in ${OPTIONS_MULTI_${i}} +. for j in ${OPTIONS_GROUP_${i}} OPTIONS_DEFAULT+= ${j} ${j}_VARS+= ${i}_DRIVERS+=${j:S/anv/intel/:S/radv/amd/} . endfor @@ -122,7 +122,7 @@ VAAPI_MESON_ENABLED= gallium-va VDPAU_BUILD_DEPENDS= libvdpau>0:multimedia/libvdpau VDPAU_MESON_ENABLED= gallium-vdpau -VULKAN_DESC= Vulkan drivers and layers +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