commit b4d77064b5373e4d5318b9fa9dd3356b0e3b33a2 Author: Danny Rawlins <contact@romster.me> Date: Sat Oct 24 01:59:32 2020 +1100 [notify] vkd3d: 1.1 -> 1.2 new dependency: spirv-tools diff --git a/vkd3d/.footprint b/vkd3d/.footprint index ab33814ee..c8713a4c2 100644 --- a/vkd3d/.footprint +++ b/vkd3d/.footprint @@ -1,24 +1,35 @@ drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/vkd3d-compiler drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/vkd3d/ -rw-r--r-- root/root usr/include/vkd3d/vkd3d.h -rw-r--r-- root/root usr/include/vkd3d/vkd3d_d3d12.h +-rw-r--r-- root/root usr/include/vkd3d/vkd3d_d3d12sdklayers.h -rw-r--r-- root/root usr/include/vkd3d/vkd3d_d3dcommon.h -rw-r--r-- root/root usr/include/vkd3d/vkd3d_dxgibase.h -rw-r--r-- root/root usr/include/vkd3d/vkd3d_dxgiformat.h +-rw-r--r-- root/root usr/include/vkd3d/vkd3d_shader.h +-rw-r--r-- root/root usr/include/vkd3d/vkd3d_types.h -rw-r--r-- root/root usr/include/vkd3d/vkd3d_utils.h -rw-r--r-- root/root usr/include/vkd3d/vkd3d_windows.h drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/libvkd3d-shader.a +-rwxr-xr-x root/root usr/lib/libvkd3d-shader.la +lrwxrwxrwx root/root usr/lib/libvkd3d-shader.so -> libvkd3d-shader.so.1.0.0 +lrwxrwxrwx root/root usr/lib/libvkd3d-shader.so.1 -> libvkd3d-shader.so.1.0.0 +-rwxr-xr-x root/root usr/lib/libvkd3d-shader.so.1.0.0 -rw-r--r-- root/root usr/lib/libvkd3d-utils.a -rwxr-xr-x root/root usr/lib/libvkd3d-utils.la -lrwxrwxrwx root/root usr/lib/libvkd3d-utils.so -> libvkd3d-utils.so.1.0.1 -lrwxrwxrwx root/root usr/lib/libvkd3d-utils.so.1 -> libvkd3d-utils.so.1.0.1 --rwxr-xr-x root/root usr/lib/libvkd3d-utils.so.1.0.1 +lrwxrwxrwx root/root usr/lib/libvkd3d-utils.so -> libvkd3d-utils.so.1.1.0 +lrwxrwxrwx root/root usr/lib/libvkd3d-utils.so.1 -> libvkd3d-utils.so.1.1.0 +-rwxr-xr-x root/root usr/lib/libvkd3d-utils.so.1.1.0 -rw-r--r-- root/root usr/lib/libvkd3d.a -rwxr-xr-x root/root usr/lib/libvkd3d.la -lrwxrwxrwx root/root usr/lib/libvkd3d.so -> libvkd3d.so.1.1.0 -lrwxrwxrwx root/root usr/lib/libvkd3d.so.1 -> libvkd3d.so.1.1.0 --rwxr-xr-x root/root usr/lib/libvkd3d.so.1.1.0 +lrwxrwxrwx root/root usr/lib/libvkd3d.so -> libvkd3d.so.1.2.0 +lrwxrwxrwx root/root usr/lib/libvkd3d.so.1 -> libvkd3d.so.1.2.0 +-rwxr-xr-x root/root usr/lib/libvkd3d.so.1.2.0 drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/libvkd3d-shader.pc -rw-r--r-- root/root usr/lib/pkgconfig/libvkd3d-utils.pc -rw-r--r-- root/root usr/lib/pkgconfig/libvkd3d.pc diff --git a/vkd3d/.signature b/vkd3d/.signature index f887b6be2..75261479f 100644 --- a/vkd3d/.signature +++ b/vkd3d/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/fPHyoXq5/GuDvpF+HQlyQhGQkWBOgiGdkyqauRu/L8U/DN2kJRNQV4g0TPSATaqsAOrsjJJDPl3VFC/SfBcGAQ= -SHA256 (Pkgfile) = 9e7f0f651068d22251dfbe40553472c1e42f3149dbbe9a52c104bfb37e166e32 -SHA256 (.footprint) = 83f0606cf8a591cff4886fc9d7f3b07b2de019a08bbc60f978ac3ebb8f40623f -SHA256 (vkd3d-1.1.tar.xz) = 495adc61cc80c65d54b2f5b52092ea05d3797cc2c17a610f0fc98457d2f56ab6 -SHA256 (vulkan-headers.patch) = d79ddf19adbe598693916a5e74d22a53aaa560937d5c099b0c6c96b4eaf90313 +RWSE3ohX2g5d/Vwc1UzEV9pIJA5rWmaRZc8IpLI9qHccijc2t3ALd+35HKL+AVfEM7OUAxIJysdLm2SYEZUOSwMz1UFNiFGfaAA= +SHA256 (Pkgfile) = 04977f3a699b1d1bbb02b5c0c81684ac89c3e01a130c28137a4a0d970a239556 +SHA256 (.footprint) = 607e89fc430bfead2f72078abeca2ce514c27bcfe397ea1f3b2ecfc0f8504223 +SHA256 (vkd3d-1.2.tar.xz) = b04b030fcbf0f2dacc933c76c74b449bffef1fc1a18d50254ef1ad3e380df96b diff --git a/vkd3d/Pkgfile b/vkd3d/Pkgfile index 0400c253c..7f303af97 100644 --- a/vkd3d/Pkgfile +++ b/vkd3d/Pkgfile @@ -1,21 +1,17 @@ # 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: spirv-headers vulkan-loader xorg-xcb-util-keysyms +# Depends on: spirv-tools vulkan-loader xorg-xcb-util-keysyms name=vkd3d -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 - + ./configure --prefix=/usr --with-spirv-tools make make DESTDIR=$PKG install } diff --git a/vkd3d/vulkan-headers.patch b/vkd3d/vulkan-headers.patch deleted file mode 100644 index 207e90ded..000000000 --- a/vkd3d/vulkan-headers.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/d3d12/vkd3d/commit/8e7bf8a5c3e004763a62822ff2d79cf76907b7... -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; -