Hi, As the subject says. Continues to work here on my integrated Intel Tigerlake GPU.
This includes the update of glslang to 12.1.0 which now defaults to versioning all .so libraries. I discussed this off-list with namn@ already. No breakage observed with flycast etc. Additional testing on non-intel GPU would be welcome! ok? Index: glslang/Makefile =================================================================== RCS file: /cvs/ports/graphics/glslang/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- glslang/Makefile 30 Apr 2023 19:11:57 -0000 1.17 +++ glslang/Makefile 9 May 2023 17:44:13 -0000 @@ -2,12 +2,15 @@ PORTROACH = limit:^[0-9] COMMENT = reference front-end for GLSL and ESSL -GH_TAGNAME = 12.0.0 +GH_TAGNAME = 12.1.0 GH_ACCOUNT = KhronosGroup GH_PROJECT = glslang -REVISION = 1 -SHARED_LIBS += glslang 0.0 # 12.0 +SHARED_LIBS += glslang 1.0 # 12.0 +SHARED_LIBS += HLSL 0.0 # 12.1 +SHARED_LIBS += SPIRV 0.0 # 12.1 +SHARED_LIBS += SPVRemapper 0.0 # 12.1 +SHARED_LIBS += glslang-default-resource-limits 0.0 # 12.1 CATEGORIES = devel graphics Index: glslang/distinfo =================================================================== RCS file: /cvs/ports/graphics/glslang/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- glslang/distinfo 3 Mar 2023 02:38:37 -0000 1.7 +++ glslang/distinfo 9 May 2023 17:44:13 -0000 @@ -1,2 +1,2 @@ -SHA256 (glslang-12.0.0.tar.gz) = fLRYQuwdS26nddYkw9LYupRQqkFrBIKwzH5P3TmcPXU= -SIZE (glslang-12.0.0.tar.gz) = 3682791 +SHA256 (glslang-12.1.0.tar.gz) = FRXoQIgdESj7bYMTCEM/cxgI+BjyEDiBFi8//UexXNU= +SIZE (glslang-12.1.0.tar.gz) = 3686676 Index: glslang/patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/graphics/glslang/patches/patch-CMakeLists_txt,v retrieving revision 1.1 diff -u -p -r1.1 patch-CMakeLists_txt --- glslang/patches/patch-CMakeLists_txt 30 Apr 2023 19:11:57 -0000 1.1 +++ glslang/patches/patch-CMakeLists_txt 9 May 2023 17:44:13 -0000 @@ -12,7 +12,7 @@ https://github.com/KhronosGroup/glslang/ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -171,10 +171,8 @@ if(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU") +@@ -161,10 +161,8 @@ if(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU") add_compile_options(-Werror=deprecated-copy) endif() @@ -24,7 +24,7 @@ Index: CMakeLists.txt add_link_options("-Wl,--no-undefined") endif() elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" AND NOT MSVC) -@@ -188,10 +186,8 @@ elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" AND NO +@@ -178,10 +176,8 @@ elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" AND NO add_compile_options(-fno-exceptions) endif() Index: glslang/pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/glslang/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- glslang/pkg/PLIST 30 Apr 2023 19:11:57 -0000 1.7 +++ glslang/pkg/PLIST 9 May 2023 17:44:13 -0000 @@ -82,8 +82,8 @@ lib/cmake/glslang/glslang-targets${MODCM lib/cmake/glslang/glslang-targets.cmake lib/cmake/glslangValidatorTargets.cmake lib/cmake/spirv-remapTargets.cmake -@so lib/libHLSL.so -@so lib/libSPIRV.so -@so lib/libSPVRemapper.so -@so lib/libglslang-default-resource-limits.so +@lib lib/libHLSL.so.${LIBHLSL_VERSION} +@lib lib/libSPIRV.so.${LIBSPIRV_VERSION} +@lib lib/libSPVRemapper.so.${LIBSPVRemapper_VERSION} +@lib lib/libglslang-default-resource-limits.so.${LIBglslang-default-resource-limits_VERSION} @lib lib/libglslang.so.${LIBglslang_VERSION} Index: spirv-headers/Makefile =================================================================== RCS file: /cvs/ports/graphics/spirv-headers/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- spirv-headers/Makefile 3 Mar 2023 02:38:37 -0000 1.11 +++ spirv-headers/Makefile 9 May 2023 17:44:13 -0000 @@ -1,6 +1,6 @@ COMMENT = SPIRV-Headers -V = 1.3.239.0 +V = 1.3.243.0 DISTNAME = spirv-headers-${V} GH_ACCOUNT = KhronosGroup GH_PROJECT = SPIRV-Headers Index: spirv-headers/distinfo =================================================================== RCS file: /cvs/ports/graphics/spirv-headers/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- spirv-headers/distinfo 3 Mar 2023 02:38:37 -0000 1.9 +++ spirv-headers/distinfo 9 May 2023 17:44:13 -0000 @@ -1,2 +1,2 @@ -SHA256 (spirv-headers-1.3.239.0.tar.gz) = /a9mcOMRzRwIrpC/gT6J3TFjAgW8YAMP/SX7CvObUf4= -SIZE (spirv-headers-1.3.239.0.tar.gz) = 446295 +SHA256 (spirv-headers-1.3.243.0.tar.gz) = FpJ7GGjniRN30FnNVJSE5BWJEkOc93RRrn4B4qO80os= +SIZE (spirv-headers-1.3.243.0.tar.gz) = 449924 Index: spirv-headers/pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/spirv-headers/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- spirv-headers/pkg/PLIST 30 Oct 2022 22:51:56 -0000 1.7 +++ spirv-headers/pkg/PLIST 9 May 2023 17:44:13 -0000 @@ -47,6 +47,7 @@ include/spirv/unified1/AMD_shader_trinar include/spirv/unified1/DebugInfo.h include/spirv/unified1/GLSL.std.450.h include/spirv/unified1/NonSemanticClspvReflection.h +include/spirv/unified1/NonSemanticDebugBreak.h include/spirv/unified1/NonSemanticDebugPrintf.h include/spirv/unified1/NonSemanticShaderDebugInfo100.h include/spirv/unified1/OpenCL.std.h @@ -54,6 +55,7 @@ include/spirv/unified1/OpenCLDebugInfo10 include/spirv/unified1/extinst.debuginfo.grammar.json include/spirv/unified1/extinst.glsl.std.450.grammar.json include/spirv/unified1/extinst.nonsemantic.clspvreflection.grammar.json +include/spirv/unified1/extinst.nonsemantic.debugbreak.grammar.json include/spirv/unified1/extinst.nonsemantic.debugprintf.grammar.json include/spirv/unified1/extinst.nonsemantic.shader.debuginfo.100.grammar.json include/spirv/unified1/extinst.opencl.debuginfo.100.grammar.json Index: spirv-tools/Makefile =================================================================== RCS file: /cvs/ports/graphics/spirv-tools/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- spirv-tools/Makefile 3 Mar 2023 02:38:37 -0000 1.14 +++ spirv-tools/Makefile 9 May 2023 17:44:13 -0000 @@ -1,6 +1,6 @@ COMMENT = API and commands for processing SPIR-V -V = 1.3.239.0 +V = 1.3.243.0 DISTNAME = spirv-tools-${V} GH_ACCOUNT = KhronosGroup GH_PROJECT = SPIRV-Tools Index: spirv-tools/distinfo =================================================================== RCS file: /cvs/ports/graphics/spirv-tools/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- spirv-tools/distinfo 3 Mar 2023 02:38:37 -0000 1.10 +++ spirv-tools/distinfo 9 May 2023 17:44:13 -0000 @@ -1,2 +1,2 @@ -SHA256 (spirv-tools-1.3.239.0.tar.gz) = MnstukUVZG7uKMGl/hMyiR6ByLb/KJNj9Sh38+Z8LYE= -SIZE (spirv-tools-1.3.239.0.tar.gz) = 3088996 +SHA256 (spirv-tools-1.3.243.0.tar.gz) = aEop43v9xuFR/h0+xLh8U5bBekOd5UXYHqBdTub7yG4= +SIZE (spirv-tools-1.3.243.0.tar.gz) = 3102102 Index: vulkan-headers/Makefile =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- vulkan-headers/Makefile 3 Mar 2023 02:38:37 -0000 1.12 +++ vulkan-headers/Makefile 9 May 2023 17:44:13 -0000 @@ -1,6 +1,6 @@ COMMENT = Vulkan header files -V = 1.3.239.0 +V = 1.3.243.0 PKGNAME = vulkan-headers-${V} GH_TAGNAME = sdk-${V} GH_ACCOUNT = KhronosGroup Index: vulkan-headers/distinfo =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- vulkan-headers/distinfo 3 Mar 2023 02:38:37 -0000 1.9 +++ vulkan-headers/distinfo 9 May 2023 17:44:13 -0000 @@ -1,2 +1,2 @@ -SHA256 (Vulkan-Headers-sdk-1.3.239.0.tar.gz) = hl+o6OgxT8ymB3epL1C9DPYSIFo25xnWl1SC0zZvYZ4= -SIZE (Vulkan-Headers-sdk-1.3.239.0.tar.gz) = 1804393 +SHA256 (Vulkan-Headers-sdk-1.3.243.0.tar.gz) = Kd2y75MfX7DKvRp4OY+cTaRNN/jIoeEQ+DT0wmDJ1Ug= +SIZE (Vulkan-Headers-sdk-1.3.243.0.tar.gz) = 1841214 Index: vulkan-headers/patches/patch-registry_apiconventions_py =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_apiconventions_py,v retrieving revision 1.1 diff -u -p -r1.1 patch-registry_apiconventions_py --- vulkan-headers/patches/patch-registry_apiconventions_py 30 Oct 2022 22:51:57 -0000 1.1 +++ vulkan-headers/patches/patch-registry_apiconventions_py 9 May 2023 17:44:14 -0000 @@ -5,5 +5,5 @@ Index: registry/apiconventions.py -#!/usr/bin/python3 -i +#!/usr/bin/env python3 -i # - # Copyright 2021-2022 The Khronos Group Inc. + # Copyright 2021-2023 The Khronos Group Inc. # SPDX-License-Identifier: Apache-2.0 Index: vulkan-headers/patches/patch-registry_cgenerator_py =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_cgenerator_py,v retrieving revision 1.5 diff -u -p -r1.5 patch-registry_cgenerator_py --- vulkan-headers/patches/patch-registry_cgenerator_py 21 Mar 2022 13:21:42 -0000 1.5 +++ vulkan-headers/patches/patch-registry_cgenerator_py 9 May 2023 17:44:14 -0000 @@ -5,5 +5,5 @@ Index: registry/cgenerator.py -#!/usr/bin/python3 -i +#!/usr/bin/env python3 -i # - # Copyright 2013-2022 The Khronos Group Inc. + # Copyright 2013-2023 The Khronos Group Inc. # Index: vulkan-headers/patches/patch-registry_generator_py =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_generator_py,v retrieving revision 1.5 diff -u -p -r1.5 patch-registry_generator_py --- vulkan-headers/patches/patch-registry_generator_py 21 Mar 2022 13:21:42 -0000 1.5 +++ vulkan-headers/patches/patch-registry_generator_py 9 May 2023 17:44:14 -0000 @@ -5,5 +5,5 @@ Index: registry/generator.py -#!/usr/bin/python3 -i +#!/usr/bin/env python3 -i # - # Copyright 2013-2022 The Khronos Group Inc. + # Copyright 2013-2023 The Khronos Group Inc. # Index: vulkan-headers/patches/patch-registry_genvk_py =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_genvk_py,v retrieving revision 1.5 diff -u -p -r1.5 patch-registry_genvk_py --- vulkan-headers/patches/patch-registry_genvk_py 21 Mar 2022 13:21:42 -0000 1.5 +++ vulkan-headers/patches/patch-registry_genvk_py 9 May 2023 17:44:14 -0000 @@ -5,5 +5,5 @@ Index: registry/genvk.py -#!/usr/bin/python3 +#!/usr/bin/env python3 # - # Copyright 2013-2022 The Khronos Group Inc. + # Copyright 2013-2023 The Khronos Group Inc. # Index: vulkan-headers/patches/patch-registry_reg_py =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_reg_py,v retrieving revision 1.6 diff -u -p -r1.6 patch-registry_reg_py --- vulkan-headers/patches/patch-registry_reg_py 21 Mar 2022 13:21:42 -0000 1.6 +++ vulkan-headers/patches/patch-registry_reg_py 9 May 2023 17:44:14 -0000 @@ -5,5 +5,5 @@ Index: registry/reg.py -#!/usr/bin/python3 -i +#!/usr/bin/env python3 -i # - # Copyright 2013-2022 The Khronos Group Inc. + # Copyright 2013-2023 The Khronos Group Inc. # Index: vulkan-headers/patches/patch-registry_spec_tools_conventions_py =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_spec_tools_conventions_py,v retrieving revision 1.1 diff -u -p -r1.1 patch-registry_spec_tools_conventions_py --- vulkan-headers/patches/patch-registry_spec_tools_conventions_py 30 Oct 2022 22:51:57 -0000 1.1 +++ vulkan-headers/patches/patch-registry_spec_tools_conventions_py 9 May 2023 17:44:14 -0000 @@ -5,5 +5,5 @@ Index: registry/spec_tools/conventions.p -#!/usr/bin/python3 -i +#!/usr/bin/env python3 -i # - # Copyright 2013-2022 The Khronos Group Inc. + # Copyright 2013-2023 The Khronos Group Inc. # Index: vulkan-headers/patches/patch-registry_vkconventions_py =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/patches/patch-registry_vkconventions_py,v retrieving revision 1.5 diff -u -p -r1.5 patch-registry_vkconventions_py --- vulkan-headers/patches/patch-registry_vkconventions_py 21 Mar 2022 13:21:42 -0000 1.5 +++ vulkan-headers/patches/patch-registry_vkconventions_py 9 May 2023 17:44:14 -0000 @@ -5,5 +5,5 @@ Index: registry/vkconventions.py -#!/usr/bin/python3 -i +#!/usr/bin/env python3 -i # - # Copyright 2013-2022 The Khronos Group Inc. + # Copyright 2013-2023 The Khronos Group Inc. # Index: vulkan-headers/pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/vulkan-headers/pkg/PLIST,v retrieving revision 1.10 diff -u -p -r1.10 PLIST --- vulkan-headers/pkg/PLIST 3 Mar 2023 02:38:37 -0000 1.10 +++ vulkan-headers/pkg/PLIST 9 May 2023 17:44:14 -0000 @@ -10,7 +10,6 @@ include/vulkan/ include/vulkan/vk_icd.h include/vulkan/vk_layer.h include/vulkan/vk_platform.h -include/vulkan/vk_sdk_platform.h include/vulkan/vulkan.h include/vulkan/vulkan.hpp include/vulkan/vulkan_android.h @@ -49,6 +48,7 @@ share/vulkan/registry/apiconventions.py share/vulkan/registry/cgenerator.py share/vulkan/registry/generator.py share/vulkan/registry/genvk.py +share/vulkan/registry/parse_dependency.py share/vulkan/registry/profiles/ share/vulkan/registry/profiles/VP_KHR_roadmap_2022.json share/vulkan/registry/reg.py Index: vulkan-loader/Makefile =================================================================== RCS file: /cvs/ports/graphics/vulkan-loader/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- vulkan-loader/Makefile 10 Mar 2023 22:28:49 -0000 1.19 +++ vulkan-loader/Makefile 9 May 2023 17:44:14 -0000 @@ -1,8 +1,7 @@ COMMENT = Vulkan ICD loader -V = 1.3.239.0 +V = 1.3.243.0 PKGNAME = vulkan-loader-${V} -REVISION = 0 GH_TAGNAME = sdk-${V} GH_ACCOUNT = KhronosGroup GH_PROJECT = Vulkan-Loader @@ -17,7 +16,7 @@ MAINTAINER = Thomas Frohwein <thfr@openb # Apache 2.0 PERMIT_PACKAGE = Yes -WANTLIB += m pthread +WANTLIB += X11 xcb m pthread BUILD_DEPENDS = graphics/vulkan-headers RUN_DEPENDS = graphics/vulkan-headers Index: vulkan-loader/distinfo =================================================================== RCS file: /cvs/ports/graphics/vulkan-loader/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- vulkan-loader/distinfo 3 Mar 2023 02:38:37 -0000 1.9 +++ vulkan-loader/distinfo 9 May 2023 17:44:14 -0000 @@ -1,2 +1,2 @@ -SHA256 (Vulkan-Loader-sdk-1.3.239.0.tar.gz) = +iB4QIeTshc/F0FzqHhN5Wtrv7y1+5WKB+Ru8SbH6to= -SIZE (Vulkan-Loader-sdk-1.3.239.0.tar.gz) = 1646923 +SHA256 (Vulkan-Loader-sdk-1.3.243.0.tar.gz) = iaCVR74wSR7goRzXyIPnimN/t2EoDWxsIXTzcYhSfcM= +SIZE (Vulkan-Loader-sdk-1.3.243.0.tar.gz) = 1656815 Index: vulkan-tools/Makefile =================================================================== RCS file: /cvs/ports/graphics/vulkan-tools/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- vulkan-tools/Makefile 3 Mar 2023 02:38:38 -0000 1.14 +++ vulkan-tools/Makefile 9 May 2023 17:44:14 -0000 @@ -1,6 +1,6 @@ COMMENT = Vulkan Utilities and Tools -V = 1.3.239.0 +V = 1.3.243.0 PKGNAME = vulkan-tools-${V} GH_TAGNAME = sdk-${V} GH_ACCOUNT = KhronosGroup Index: vulkan-tools/distinfo =================================================================== RCS file: /cvs/ports/graphics/vulkan-tools/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- vulkan-tools/distinfo 3 Mar 2023 02:38:38 -0000 1.9 +++ vulkan-tools/distinfo 9 May 2023 17:44:14 -0000 @@ -1,2 +1,2 @@ -SHA256 (Vulkan-Tools-sdk-1.3.239.0.tar.gz) = Xz7R/d74WBvxiMnQed18FmLY93m2gpd/8NxZQrE3d/Q= -SIZE (Vulkan-Tools-sdk-1.3.239.0.tar.gz) = 775603 +SHA256 (Vulkan-Tools-sdk-1.3.243.0.tar.gz) = YyryEL8/OAHOtd7WoLLENSggafXR1/oZaYBOOp/oUmI= +SIZE (Vulkan-Tools-sdk-1.3.243.0.tar.gz) = 778991 Index: vulkan-validation-layers/Makefile =================================================================== RCS file: /cvs/ports/graphics/vulkan-validation-layers/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- vulkan-validation-layers/Makefile 10 Mar 2023 22:28:49 -0000 1.17 +++ vulkan-validation-layers/Makefile 9 May 2023 17:44:14 -0000 @@ -1,8 +1,7 @@ COMMENT = Vulkan Validation Layers -V = 1.3.239.0 +V = 1.3.243.0 PKGNAME = vulkan-validation-layers-${V} -REVISION = 0 GH_TAGNAME = sdk-${V} GH_ACCOUNT = KhronosGroup GH_PROJECT = Vulkan-ValidationLayers Index: vulkan-validation-layers/distinfo =================================================================== RCS file: /cvs/ports/graphics/vulkan-validation-layers/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- vulkan-validation-layers/distinfo 3 Mar 2023 02:38:38 -0000 1.9 +++ vulkan-validation-layers/distinfo 9 May 2023 17:44:14 -0000 @@ -1,2 +1,2 @@ -SHA256 (Vulkan-ValidationLayers-sdk-1.3.239.0.tar.gz) = eqf7RuJeXvAUTSnJISK2Mdx8fGgEpjOfGVs2itUzKOQ= -SIZE (Vulkan-ValidationLayers-sdk-1.3.239.0.tar.gz) = 4549587 +SHA256 (Vulkan-ValidationLayers-sdk-1.3.243.0.tar.gz) = /Z9sJAJ94Xey+w62OFVC1i9MIWZajUzH4cEYaI4INt4= +SIZE (Vulkan-ValidationLayers-sdk-1.3.243.0.tar.gz) = 4624249
