From 5c8aaa70e8a73cd4a57c0188c94e88b086d4e445 Mon Sep 17 00:00:00 2001
From: pal1000 <liviuprodea@yahoo.com>
Date: Mon, 1 Aug 2022 19:14:19 +0300
Subject: [PATCH] d3d12/dzn/spirv2dxil: Require version library

Fixes: b8328c9 ("microsoft/compiler: Blacklist DXIL validator 1.6 from 20348 SDK")

Closes: #6952

Closes: #6959

v2: Always lookup version library on Windows

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17837>
(cherry picked from commit ec46a85c4f92e25e7994881679d6a1531a59b58e)
---
 .pick_status.json | 2 +-
 meson.build       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 2ab59081bd1..b5a055cab87 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -211,7 +211,7 @@
         "description": "d3d12/dzn/spirv2dxil: Require version library",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "b8328c9664ed3f11924be37a243464236812a3a2"
     },
diff --git a/meson.build b/meson.build
index 829d7908c2d..1d281dadbc9 100644
--- a/meson.build
+++ b/meson.build
@@ -1884,7 +1884,7 @@ endif
 # Be explicit about only using this lib on Windows, to avoid picking
 # up random libs with the generic name 'libversion'
 dep_version = null_dep
-if with_opencl_spirv and host_machine.system() == 'windows'
+if host_machine.system() == 'windows'
   dep_version = cpp.find_library('version')
 endif