Skip to content
Snippets Groups Projects
Commit d5d48006 authored by Jan Beich's avatar Jan Beich
Browse files

graphics/vulkan-headers: update to 1.3.241

Force rebuild vulkan-loader to make sure vulkaninfo shows the new version.

Changes:	https://github.com/KhronosGroup/Vulkan-Headers/compare/v1.3.240...v1.3.241
Reported by:	Repology, portscout
parent 36abdf5c
No related branches found
No related tags found
No related merge requests found
......@@ -13,6 +13,8 @@ WWW= https://github.com/flightlessmango/MangoHud
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN= https://github.com/flightlessmango/MangoHud/issues/927
BUILD_DEPENDS= glslangValidator:graphics/glslang \
${LOCALBASE}/share/vulkan/registry/vk.xml:graphics/vulkan-headers \
${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${PY_FLAVOR}
......
......@@ -17,6 +17,9 @@ USE_LDCONFIG= yes
GH_ACCOUNT= haasn
MESON_ARGS= -Ddemos=false
# XXX https://code.videolan.org/videolan/libplacebo/-/issues/249
GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.240:vkheaders/3rdparty/Vulkan-Headers
OPTIONS_DEFINE= LCMS2 LIBUNWIND OPENGL TEST VULKAN
OPTIONS_DEFAULT=LCMS2 LIBUNWIND OPENGL SHADERC
OPTIONS_SINGLE= VULKAN
......
TIMESTAMP = 1672849094
SHA256 (haasn-libplacebo-v5.229.2_GH0.tar.gz) = 1c67bec76832c7a42242570798cc96a3f58a70be79daa84ade628d5bce749c84
SIZE (haasn-libplacebo-v5.229.2_GH0.tar.gz) = 673761
SHA256 (KhronosGroup-Vulkan-Headers-v1.3.240_GH0.tar.gz) = 98734513f4847254ef5bdd31a9c897f64938dac0733b9aea9e4b3fd339d82281
SIZE (KhronosGroup-Vulkan-Headers-v1.3.240_GH0.tar.gz) = 1810650
SHA256 (Dav1dde-glad-v2.0.1_GH0.tar.gz) = bbdfb8a2c8ea7fbad747dd91424fc9fc7bb22e1b95c7a5b451e68c3d9bd96d95
SIZE (Dav1dde-glad-v2.0.1_GH0.tar.gz) = 581028
Workaround for https://code.videolan.org/videolan/libplacebo/-/issues/249
--- src/vulkan/meson.build.orig 2023-01-04 16:18:14 UTC
+++ src/vulkan/meson.build
@@ -4,17 +4,10 @@ registry_xml = get_option('vulkan-registry')
vulkan_headers = disabler()
registry_xml = get_option('vulkan-registry')
-if vulkan_loader.found()
- vulkan_headers = vulkan_loader.partial_dependency(includes: true, compile_args: true)
-# Probe for <vulkan/vulkan.h> as a fallback for the vulkan headers
-elif cc.has_header_symbol('vulkan/vulkan_core.h', 'VK_VERSION_1_2')
- vulkan_headers = declare_dependency()
-elif fs.is_dir(thirdparty/'Vulkan-Headers/include')
vulkan_inc = include_directories('../../3rdparty/Vulkan-Headers/include')
vulkan_headers = declare_dependency(include_directories: vulkan_inc)
# Force the use of this vk.xml because it has to be in sync with the headers
registry_xml = thirdparty/'Vulkan-Headers/registry/vk.xml'
-endif
build_deps += vulkan_headers
if not vulkan_headers.found()
......@@ -18,4 +18,9 @@ GH_ACCOUNT= KhronosGroup
GH_PROJECT= Vulkan-ExtensionLayer
CMAKE_OFF= BUILD_TESTS
.if ${DISTVERSION:E} < 241
GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.240:vkheaders/Vulkan-Headers
CFLAGS+= -I${WRKSRC_vkheaders}/include
.endif
.include <bsd.port.mk>
TIMESTAMP = 1674235192
SHA256 (KhronosGroup-Vulkan-ExtensionLayer-v1.3.239_GH0.tar.gz) = 7d023d8881e072e6c233978e23a90e42c1c4931fcad6287cb4c529a39e18168f
SIZE (KhronosGroup-Vulkan-ExtensionLayer-v1.3.239_GH0.tar.gz) = 522210
SHA256 (KhronosGroup-Vulkan-Headers-v1.3.240_GH0.tar.gz) = 98734513f4847254ef5bdd31a9c897f64938dac0733b9aea9e4b3fd339d82281
SIZE (KhronosGroup-Vulkan-Headers-v1.3.240_GH0.tar.gz) = 1810650
PORTNAME= vulkan-headers
DISTVERSIONPREFIX= v
DISTVERSION= 1.3.240
DISTVERSION= 1.3.241
CATEGORIES= graphics
MAINTAINER= jbeich@FreeBSD.org
......
TIMESTAMP = 1674724520
SHA256 (KhronosGroup-Vulkan-Headers-v1.3.240_GH0.tar.gz) = 98734513f4847254ef5bdd31a9c897f64938dac0733b9aea9e4b3fd339d82281
SIZE (KhronosGroup-Vulkan-Headers-v1.3.240_GH0.tar.gz) = 1810650
TIMESTAMP = 1676556552
SHA256 (KhronosGroup-Vulkan-Headers-v1.3.241_GH0.tar.gz) = 4322fd17d456c0687ed947b1b75d7b10b121ec20ed43d1cfa76e721f7e803bec
SIZE (KhronosGroup-Vulkan-Headers-v1.3.241_GH0.tar.gz) = 1826896
......@@ -42,6 +42,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/VP_KHR_roadmap_2022.json
share/vulkan/registry/reg.py
share/vulkan/registry/spec_tools/conventions.py
......
PORTNAME= vulkan-loader
DISTVERSIONPREFIX= v
DISTVERSION= 1.3.240
PORTREVISION= 1
CATEGORIES= graphics devel
MAINTAINER= jbeich@FreeBSD.org
......
......@@ -23,6 +23,11 @@ CMAKE_OFF= BUILD_TESTS
CMAKE_ON= BUILD_LAYER_SUPPORT_FILES
CMAKE_ARGS= -DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}"
.if ${DISTVERSION:E} < 241
GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.240:vkheaders/Vulkan-Headers
CFLAGS+= -I${WRKSRC_vkheaders}/include
.endif
OPTIONS_DEFINE= WAYLAND XCB XLIB
OPTIONS_DEFAULT=WAYLAND XCB XLIB
......
......@@ -3,3 +3,5 @@ SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.240_GH0.tar.gz) = 4ea885a071bc
SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.240_GH0.tar.gz) = 4555043
SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-214-gd13b522_GH0.tar.gz) = f4f0663a7fc0c17beaecb824c58ece4169edec1b3bb6eb1f6857b7b56bad3194
SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-214-gd13b522_GH0.tar.gz) = 446635
SHA256 (KhronosGroup-Vulkan-Headers-v1.3.240_GH0.tar.gz) = 98734513f4847254ef5bdd31a9c897f64938dac0733b9aea9e4b3fd339d82281
SIZE (KhronosGroup-Vulkan-Headers-v1.3.240_GH0.tar.gz) = 1810650
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment