diff --git a/lib/mesa/mk/Makefile b/lib/mesa/mk/Makefile index f1ae2664..19809936 100644 --- a/lib/mesa/mk/Makefile +++ b/lib/mesa/mk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2024/04/02 10:42:12 jsg Exp $ +# $OpenBSD: Makefile,v 1.8 2024/06/18 02:44:13 jsg Exp $ .include "config.mk" @@ -12,7 +12,7 @@ SUBDIR= include pkgconfig \ libnir libpipe_loader_static libsoftpipe \ libmesa_util_sse41 \ libswdri libswkmsdri \ - libws_null libwsw libxmlconfig + libws_null libwsw libvtn libxmlconfig .if ${XENOCARA_BUILD_DRI3:L} == "yes" || make(obj) SUBDIR+= libloader_dri3_helper @@ -43,8 +43,7 @@ SUBDIR+= libradeonwinsys .endif .if ${WITH_AMD_VK} == "yes" || ${WITH_INTEL_VK} == "yes" || make(obj) -SUBDIR+= libvulkan_runtime libvulkan_util libvulkan_wsi \ - libvtn +SUBDIR+= libvulkan_runtime libvulkan_util libvulkan_wsi .endif .if ${WITH_LLVM} == "yes" || make(obj) diff --git a/lib/mesa/mk/libOSMesa/Makefile b/lib/mesa/mk/libOSMesa/Makefile index f118bfe6..56e57b8f 100644 --- a/lib/mesa/mk/libOSMesa/Makefile +++ b/lib/mesa/mk/libOSMesa/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2023/03/03 06:32:18 jsg Exp $ +# $OpenBSD: Makefile,v 1.9 2024/06/17 01:29:12 jsg Exp $ LIB= OSMesa @@ -34,7 +34,8 @@ SLIBS= libmesa \ libcompiler \ libgallium \ libws_null \ - libsoftpipe + libsoftpipe \ + libvtn .if ${WITH_SSE41} == "yes" SLIBS+= libmesa_sse41 diff --git a/lib/mesa/mk/libgallium_dri/Makefile b/lib/mesa/mk/libgallium_dri/Makefile index aa9b6c03..0296e22a 100644 --- a/lib/mesa/mk/libgallium_dri/Makefile +++ b/lib/mesa/mk/libgallium_dri/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2024/04/03 22:10:09 jsg Exp $ +# $OpenBSD: Makefile,v 1.11 2024/06/17 01:29:12 jsg Exp $ LIB= gallium_dri @@ -92,11 +92,8 @@ SLIBS= libdri \ libwsw \ libswdri \ libswkmsdri \ - libsoftpipe - -.if ${WITH_AMD_VK} == "yes" || ${WITH_INTEL_VK} == "yes" -SLIBS+= libvtn -.endif + libsoftpipe \ + libvtn .if ${WITH_SSE41} == "yes" SLIBS+= libmesa_sse41