diff --git a/abi_symbols b/abi_symbols --- a/abi_symbols +++ b/abi_symbols @@ -38,6 +38,7 @@ libVkLayer_unique_objects.so:vkGetDeviceProcAddr libVkLayer_unique_objects.so:vkGetInstanceProcAddr libVkLayer_unique_objects.so:vkNegotiateLoaderLayerInterfaceVersion +libVkLayer_utils.so:FindMultiplaneCompatibleFormat libVkLayer_utils.so:FormatChannelCount libVkLayer_utils.so:FormatCompatibilityClass libVkLayer_utils.so:FormatCompressedTexelBlockExtent @@ -56,6 +57,7 @@ libVkLayer_utils.so:FormatIsSNorm libVkLayer_utils.so:FormatIsSRGB libVkLayer_utils.so:FormatIsSScaled +libVkLayer_utils.so:FormatIsSinglePlane_422 libVkLayer_utils.so:FormatIsStencilOnly libVkLayer_utils.so:FormatIsUInt libVkLayer_utils.so:FormatIsUNorm @@ -138,6 +140,7 @@ libvulkan.so.1:vkCreateComputePipelines libvulkan.so.1:vkCreateDescriptorPool libvulkan.so.1:vkCreateDescriptorSetLayout +libvulkan.so.1:vkCreateDescriptorUpdateTemplate libvulkan.so.1:vkCreateDevice libvulkan.so.1:vkCreateDisplayModeKHR libvulkan.so.1:vkCreateDisplayPlaneSurfaceKHR @@ -166,6 +169,7 @@ libvulkan.so.1:vkDestroyCommandPool libvulkan.so.1:vkDestroyDescriptorPool libvulkan.so.1:vkDestroyDescriptorSetLayout +libvulkan.so.1:vkDestroyDescriptorUpdateTemplate libvulkan.so.1:vkDestroyDevice libvulkan.so.1:vkDestroyEvent libvulkan.so.1:vkDestroyFence @@ -764,6 +768,7 @@ libvulkan.so.1:vkSetEvent libvulkan.so.1:vkTrimCommandPool libvulkan.so.1:vkUnmapMemory +libvulkan.so.1:vkUpdateDescriptorSetWithTemplate libvulkan.so.1:vkUpdateDescriptorSets libvulkan.so.1:vkWaitForFences libvulkan.so.1:vkdev_ext0 diff --git a/abi_symbols32 b/abi_symbols32 --- a/abi_symbols32 +++ b/abi_symbols32 @@ -38,6 +38,7 @@ libVkLayer_unique_objects.so:vkGetDeviceProcAddr libVkLayer_unique_objects.so:vkGetInstanceProcAddr libVkLayer_unique_objects.so:vkNegotiateLoaderLayerInterfaceVersion +libVkLayer_utils.so:FindMultiplaneCompatibleFormat libVkLayer_utils.so:FormatChannelCount libVkLayer_utils.so:FormatCompatibilityClass libVkLayer_utils.so:FormatCompressedTexelBlockExtent @@ -56,6 +57,7 @@ libVkLayer_utils.so:FormatIsSNorm libVkLayer_utils.so:FormatIsSRGB libVkLayer_utils.so:FormatIsSScaled +libVkLayer_utils.so:FormatIsSinglePlane_422 libVkLayer_utils.so:FormatIsStencilOnly libVkLayer_utils.so:FormatIsUInt libVkLayer_utils.so:FormatIsUNorm @@ -138,6 +140,7 @@ libvulkan.so.1:vkCreateComputePipelines libvulkan.so.1:vkCreateDescriptorPool libvulkan.so.1:vkCreateDescriptorSetLayout +libvulkan.so.1:vkCreateDescriptorUpdateTemplate libvulkan.so.1:vkCreateDevice libvulkan.so.1:vkCreateDisplayModeKHR libvulkan.so.1:vkCreateDisplayPlaneSurfaceKHR @@ -166,6 +169,7 @@ libvulkan.so.1:vkDestroyCommandPool libvulkan.so.1:vkDestroyDescriptorPool libvulkan.so.1:vkDestroyDescriptorSetLayout +libvulkan.so.1:vkDestroyDescriptorUpdateTemplate libvulkan.so.1:vkDestroyDevice libvulkan.so.1:vkDestroyEvent libvulkan.so.1:vkDestroyFence @@ -764,6 +768,7 @@ libvulkan.so.1:vkSetEvent libvulkan.so.1:vkTrimCommandPool libvulkan.so.1:vkUnmapMemory +libvulkan.so.1:vkUpdateDescriptorSetWithTemplate libvulkan.so.1:vkUpdateDescriptorSets libvulkan.so.1:vkWaitForFences libvulkan.so.1:vkdev_ext0 diff --git a/files/external-spirv.patch b/files/external-spirv.patch --- a/files/external-spirv.patch +++ b/files/external-spirv.patch @@ -1,20 +1,11 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 831a61a0..ac558d6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -335,7 +335,6 @@ add_custom_target(generate_helper_files DEPENDS - vk_dispatch_table_helper.h - vk_extension_helper.h - vk_typemap_helper.h -- spirv_tools_commit_id.h - ) - - # Rules to build generated helper files -@@ -349,7 +348,6 @@ run_vk_xml_generate(helper_file_generator.py vk_enum_string_helper.h) +@@ -380,9 +380,6 @@ run_vk_xml_generate(helper_file_generator.py vk_object_types.h) run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h) run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h) --run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) +-if(BUILD_LAYERS) +- run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) +-endif() + - if(NOT WIN32) - include(GNUInstallDirs) diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : vulkan -version : 1.1.70 -release : 9 +version : 1.1.73.0 +release : 10 source : - - https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-1.1.70.0.tar.gz : bd30ffe25a0723775ea8427d65e96bbad6f5130674ac6577ec639b54ce811397 + - https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-1.1.73.0.tar.gz : ab6bd8162b246bc5d73dcfb3b69ed7a35b12b739735493f47304b0fc852463e1 license : Apache-2.0 component : xorg.graphics libsplit : no @@ -22,10 +22,10 @@ - spirv-headers setup : | %patch -p1 < $pkgfiles/external-spirv.patch - mkdir solusBuildDir && cd solusBuildDir - echo "#pragma once" >> spirv_tools_commit_id.h - echo "#define SPIRV_TOOLS_COMMIT_ID \"01f32ee001409893773219d1a0cc8e696287628e\"" >> spirv_tools_commit_id.h + echo "#pragma once" > spirv_tools_commit_id.h + echo "#define SPIRV_TOOLS_COMMIT_ID \"5f53c42a1e24e329c6e02e41cfd24a1cc0f8d22f\"" >> spirv_tools_commit_id.h + cp spirv_tools_commit_id.h layers\ # assembler gets awfully unhappy. EXTRA32="" @@ -33,7 +33,7 @@ export ASFLAGS=--32 export EXTRA32="-DCMAKE_INSTALL_LIBDIR=lib32" fi - %cmake -DBUILD_WSI_MIR_SUPPORT=OFF \ + %cmake_ninja -DBUILD_WSI_MIR_SUPPORT=OFF \ -DBUILD_WSI_WAYLAND_SUPPORT=ON \ -DBUILD_WSI_XCB_SUPPORT=ON \ -DBUILD_WSI_XLIB_SUPPORT=ON \ @@ -44,9 +44,8 @@ -DCMAKE_SKIP_RPATH=True \ -DCUSTOM_GLSLANG_BIN_ROOT=/usr/bin \ -DCUSTOM_SPIRV_TOOLS_BIN_ROOT=/usr/bin \ - -DCMAKE_INSTALL_SYSCONFDIR=/usr/share \ - -GNinja .. + -DCMAKE_INSTALL_SYSCONFDIR=/usr/share build : | - %meson_build + %ninja_build install : | - %meson_install + %ninja_install diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -35,7 +35,7 @@ emul32 - vulkan + vulkan /usr/lib32/lib*.so @@ -50,8 +50,8 @@ programming.devel - vulkan-devel - vulkan-32bit + vulkan-devel + vulkan-32bit /usr/lib32/pkgconfig/*.pc @@ -65,7 +65,7 @@ programming.devel - vulkan + vulkan /usr/include/ @@ -73,12 +73,12 @@ - - 2018-03-20 - 1.1.70 + + 2018-04-24 + 1.1.73.0 Packaging update Pierre-Yves pyu@riseup.net \ No newline at end of file