vkd3d-32: 1.1 -> 1.2

4 files changed, 25 insertions, 43 deletions

diff --git a/vkd3d-32/.footprint b/vkd3d-32/.footprint
index 7633e591..1d0ff1a8 100644
--- a/vkd3d-32/.footprint
+++ b/vkd3d-32/.footprint
@@ -1,15 +1,23 @@
 drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/vkd3d-compiler-32
 drwxr-xr-x	root/root	usr/lib32/
+-rw-r--r--	root/root	usr/lib32/libvkd3d-shader.a
+-rwxr-xr-x	root/root	usr/lib32/libvkd3d-shader.la
+lrwxrwxrwx	root/root	usr/lib32/libvkd3d-shader.so -> libvkd3d-shader.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib32/libvkd3d-shader.so.1 -> libvkd3d-shader.so.1.0.0
+-rwxr-xr-x	root/root	usr/lib32/libvkd3d-shader.so.1.0.0
 -rw-r--r--	root/root	usr/lib32/libvkd3d-utils.a
 -rwxr-xr-x	root/root	usr/lib32/libvkd3d-utils.la
-lrwxrwxrwx	root/root	usr/lib32/libvkd3d-utils.so -> libvkd3d-utils.so.1.0.1
-lrwxrwxrwx	root/root	usr/lib32/libvkd3d-utils.so.1 -> libvkd3d-utils.so.1.0.1
--rwxr-xr-x	root/root	usr/lib32/libvkd3d-utils.so.1.0.1
+lrwxrwxrwx	root/root	usr/lib32/libvkd3d-utils.so -> libvkd3d-utils.so.1.1.0
+lrwxrwxrwx	root/root	usr/lib32/libvkd3d-utils.so.1 -> libvkd3d-utils.so.1.1.0
+-rwxr-xr-x	root/root	usr/lib32/libvkd3d-utils.so.1.1.0
 -rw-r--r--	root/root	usr/lib32/libvkd3d.a
 -rwxr-xr-x	root/root	usr/lib32/libvkd3d.la
-lrwxrwxrwx	root/root	usr/lib32/libvkd3d.so -> libvkd3d.so.1.1.0
-lrwxrwxrwx	root/root	usr/lib32/libvkd3d.so.1 -> libvkd3d.so.1.1.0
--rwxr-xr-x	root/root	usr/lib32/libvkd3d.so.1.1.0
+lrwxrwxrwx	root/root	usr/lib32/libvkd3d.so -> libvkd3d.so.1.2.0
+lrwxrwxrwx	root/root	usr/lib32/libvkd3d.so.1 -> libvkd3d.so.1.2.0
+-rwxr-xr-x	root/root	usr/lib32/libvkd3d.so.1.2.0
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
+-rw-r--r--	root/root	usr/lib32/pkgconfig/libvkd3d-shader.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/libvkd3d-utils.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/libvkd3d.pc
diff --git a/vkd3d-32/.signature b/vkd3d-32/.signature
index e656c88c..56c21d3d 100644
--- a/vkd3d-32/.signature
+++ b/vkd3d-32/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXf8gTH9ffX9jvvLY/C1aDLe+M36HBKatn8NclJ39ba7+76Bp+kDNYIIKM0sphm5awl4rB7XSLr5xsyfkSXSl0gQ=
-SHA256 (Pkgfile) = e1139bc8cab8f44f417861c34fc6fad8723ccb362030d292ddbe121f7acc7362
-SHA256 (.footprint) = 8c628551c06c4ff245a14859b593bea6c6dfe31244d26318df7966aaa73ffc17
-SHA256 (vkd3d-1.1.tar.xz) = 495adc61cc80c65d54b2f5b52092ea05d3797cc2c17a610f0fc98457d2f56ab6
-SHA256 (vulkan-headers.patch) = d79ddf19adbe598693916a5e74d22a53aaa560937d5c099b0c6c96b4eaf90313
+RWSwxGo/zH7eXdFGHBvA9nqbZYzoM//gakCSyMVHqozCzrthAXqwKxztys/aILwNJON8hrhheJel50Bx9QbNkryh9UdZaMKEeQQ=
+SHA256 (Pkgfile) = c4eef1b14e9ffad9d22c8fe4608111e435e688f97d8227a325d967e3ddd25902
+SHA256 (.footprint) = 60ae20f941325f826df78e709cf381289f61f7247f50e9233592d58b510dd4a3
+SHA256 (vkd3d-1.2.tar.xz) = b04b030fcbf0f2dacc933c76c74b449bffef1fc1a18d50254ef1ad3e380df96b
diff --git a/vkd3d-32/Pkgfile b/vkd3d-32/Pkgfile
index 1e6d8084..9ac5484c 100644
--- a/vkd3d-32/Pkgfile
+++ b/vkd3d-32/Pkgfile
@@ -1,25 +1,24 @@
 # Description: Direct3D 12 to Vulkan translation library By WineHQ.
 # URL: https://github.com/d3d12/vkd3d
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: vkd3d vulkan-loader-32 xorg-xcb-util-keysyms-32
+# Depends on: spirv-tools-32 vulkan-loader-32 xorg-xcb-util-keysyms-32 vkd3d
 
 name=vkd3d-32
-version=1.1
-release=3
-source=(https://dl.winehq.org/vkd3d/source/${name%-*}-$version.tar.xz
-	vulkan-headers.patch)
+version=1.2
+release=1
+source=(https://dl.winehq.org/vkd3d/source/${name%-*}-$version.tar.xz)
 
 build() {
 	cd ${name%-*}-$version
 
-	patch -p1 -i $SRC/vulkan-headers.patch
-
 	./configure \
 		--prefix=/usr \
-		--libdir=/usr/lib32
+		--libdir=/usr/lib32 \
+		--with-spirv-tools
 
 	make
 	make DESTDIR=$PKG install
+	mv $PKG/usr/bin/vkd3d-compiler{,-32}
 
 	rm -r $PKG/usr/include
 }
diff --git a/vkd3d-32/vulkan-headers.patch b/vkd3d-32/vulkan-headers.patch
deleted file mode 100644
index 207e90de..00000000
--- a/vkd3d-32/vulkan-headers.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/d3d12/vkd3d/commit/8e7bf8a5c3e004763a62822ff2d79cf76907b712
-vkd3d: Do not use VK_PIPELINE_BIND_POINT_RANGE_SIZE.
-These constants were removed in Vulkan 1.2.140 headers.
-diff -pruN vkd3d-1.1.orig/libs/vkd3d/vkd3d_private.h vkd3d-1.1/libs/vkd3d/vkd3d_private.h
---- vkd3d-1.1.orig/libs/vkd3d/vkd3d_private.h	2020-08-18 17:10:16.429411508 +1000
-+++ vkd3d-1.1/libs/vkd3d/vkd3d_private.h	2020-08-18 17:17:39.520672309 +1000
-@@ -49,6 +49,8 @@
- 
- #define VKD3D_MAX_SHADER_STAGES     5u
- 
-+#define VKD3D_PIPELINE_BIND_POINT_COUNT 2u
-+
- struct d3d12_command_list;
- struct d3d12_device;
- 
-@@ -677,7 +679,7 @@ struct d3d12_command_list
-     VkFramebuffer current_framebuffer;
-     VkPipeline current_pipeline;
-     VkRenderPass current_render_pass;
--    struct vkd3d_pipeline_bindings pipeline_bindings[VK_PIPELINE_BIND_POINT_RANGE_SIZE];
-+    struct vkd3d_pipeline_bindings pipeline_bindings[VKD3D_PIPELINE_BIND_POINT_COUNT];
- 
-     struct d3d12_pipeline_state *state;
-