From be1ea71f8eedf9c4250ef4d870c8c8a4886606f6 Mon Sep 17 00:00:00 2001 From: jsg Date: Mon, 17 Jun 2024 01:29:12 +0000 Subject: [PATCH] libvtn is now required where libmesa is used Fixes missing symbols at runtime on macppc. Reported and tested by Donovan Watteau. --- lib/mesa/mk/libOSMesa/Makefile | 5 +++-- lib/mesa/mk/libgallium_dri/Makefile | 9 +++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/mesa/mk/libOSMesa/Makefile b/lib/mesa/mk/libOSMesa/Makefile index f118bfe64..56e57b8f5 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 aa9b6c03a..0296e22ab 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