From 65051550a06c1ea9822d0958d784ef498b6b1809 Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Tue, 23 Jul 2024 08:22:36 +0000
Subject: [PATCH] don't define VA_DRIVER_INIT_FUNC twice use pkg-config to get
 va api version ok matthieu@ rsadowski@

---
 lib/mesa/mk/libva_st/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/mesa/mk/libva_st/Makefile b/lib/mesa/mk/libva_st/Makefile
index 623dee2d4..012017bbe 100644
--- a/lib/mesa/mk/libva_st/Makefile
+++ b/lib/mesa/mk/libva_st/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2024/07/19 14:40:39 rsadowski Exp $
+#	$OpenBSD: Makefile,v 1.2 2024/07/23 08:22:36 jsg Exp $
 
 .include <bsd.xconf.mk>
 
@@ -32,9 +32,9 @@ SRCS=	buffer.c \
 CFLAGS+=	${C_VIS_ARGS}
 CXXFLAGS+=	${CXX_VIS_ARGS}
 
-# XXX keep in sync with libva
-CFLAGS +=	-DVA_DRIVER_INIT_FUNC=__vaDriverInit_1_22
-CPPFLAGS +=	-DVA_DRIVER_INIT_FUNC=__vaDriverInit_1_22
+VA_INIT!=	pkg-config --modversion libva \
+		    | awk -F. '{printf "__vaDriverInit_%d_%d\n", $$1, $$2}'
+CPPFLAGS+=	-DVA_DRIVER_INIT_FUNC=${VA_INIT}
 
 CPPFLAGS+=	-I${MESA_SRC}/src/gallium/frontends/va \
 		-I${MESA_SRC}/src/gallium/include \