openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-18 07:24:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update vulkan ports to latest sdk 1.4.304.0. Survived a bulk build with

Browse Source 
separate fixes applied to emulators/snes9x and games/fs2open.
This commit is contained in:
thfr
2025-01-23 13:59:52 +00:00
parent 238d59081f
commit 045f055bac
22 changed files with 38 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/glslang/Makefile
+2 -3
View File
@@ -2,12 +2,11 @@ PORTROACH = limit:^[0-9]
COMMENT = reference front-end for GLSL and ESSL
GH_TAGNAME = 15.0.0
GH_TAGNAME = 15.1.0
GH_ACCOUNT = KhronosGroup
GH_PROJECT = glslang
REVISION = 0
SHARED_LIBS += glslang 6.0 # 15.0
SHARED_LIBS += glslang 7.0 # 15.1
SHARED_LIBS += glslang-default-resource-limits 0.1 # 15.0
SHARED_LIBS += SPIRV 6.0 # 15.0
SHARED_LIBS += SPVRemapper 2.0 # 15.0
graphics/glslang/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (glslang-15.0.0.tar.gz) = wxyMLomvkHUHwGMSc5iVJu59XN99+V7OzWKP17gR4GQ=
SIZE (glslang-15.0.0.tar.gz) = 3864508
SHA256 (glslang-15.1.0.tar.gz) = S9zYzbMwMT8NTe7XvlJ7CsHBFf8nLkkoU6bpit1htLw=
SIZE (glslang-15.1.0.tar.gz) = 3915238
graphics/spirv-headers/Makefile
+1 -1
View File
@@ -1,6 +1,6 @@
COMMENT = SPIRV-Headers
V = 1.3.296.0
V = 1.4.304.0
DISTNAME = spirv-headers-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = SPIRV-Headers
graphics/spirv-headers/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (spirv-headers-1.3.296.0.tar.gz) = FCPVihFxYR1auiv2+Maccu+cOKCsoSw0k+T9pkybLcY=
SIZE (spirv-headers-1.3.296.0.tar.gz) = 523647
SHA256 (spirv-headers-1.4.304.0.tar.gz) = FiuGTrrzOdZpU/wsStl0vE9FPg8EFVzTdVqF4z9Aju4=
SIZE (spirv-headers-1.4.304.0.tar.gz) = 532015
graphics/spirv-tools/Makefile
+1 -1
View File
@@ -1,6 +1,6 @@
COMMENT = API and commands for processing SPIR-V
V = 1.3.296.0
V = 1.4.304.0
DISTNAME = spirv-tools-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = SPIRV-Tools
graphics/spirv-tools/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (spirv-tools-1.3.296.0.tar.gz) = dar99+cxtLa/s2pZDd+7OOvGBdgEh/OCVNok/gy5WDc=
SIZE (spirv-tools-1.3.296.0.tar.gz) = 3195963
SHA256 (spirv-tools-1.4.304.0.tar.gz) = rW6JIlOMSY5xMbzYKo1tn5hjuNdDHFv6J92Y4mQ1vgc=
SIZE (spirv-tools-1.4.304.0.tar.gz) = 3203635
graphics/spirv-tools/patches/patch-tools_CMakeLists_txt
+2 -2
View File
@@ -3,9 +3,9 @@ Add -lstdc++fs for ports-gcc
Index: tools/CMakeLists.txt
--- tools/CMakeLists.txt.orig
+++ tools/CMakeLists.txt
@@ -74,7 +74,7 @@ if (NOT ${SPIRV_SKIP_EXECUTABLES})
objdump/extract_source.cpp
@@ -77,7 +77,7 @@ if (NOT ${SPIRV_SKIP_EXECUTABLES})
util/cli_consumer.cpp
io.cpp
${COMMON_TOOLS_SRCS}
- LIBS ${SPIRV_TOOLS_FULL_VISIBILITY})
+ LIBS ${SPIRV_TOOLS_FULL_VISIBILITY} ${ADDITIONAL_LIBRARIES})
graphics/spirv-tools/pkg/PLIST
-1
View File
@@ -9,7 +9,6 @@ bin/spirv-lesspipe.sh
@bin bin/spirv-reduce
@bin bin/spirv-val
include/spirv-tools/
include/spirv-tools/instrument.hpp
include/spirv-tools/libspirv.h
include/spirv-tools/libspirv.hpp
include/spirv-tools/linker.hpp
graphics/volk/Makefile
+4 -4
View File
@@ -1,10 +1,10 @@
COMMENT = meta loader for Vulkan API
# doesn't build dynamic library; (conflict with libvolk.so from comms/gnuradio)
V = 1.3.296.0
V = 1.4.304.0
PKGNAME = volk-${V}
DIST_TUPLE += github zeux volk vulkan-sdk-${V} .
REVISION = 0
CATEGORIES = graphics
MAINTAINER = Thomas Frohwein <thfr@openbsd.org>
@@ -16,8 +16,8 @@ MODULES = devel/cmake
BUILD_DEPENDS = graphics/vulkan-headers
LIB_DEPENDS = graphics/vulkan-loader
CONFIGURE_ARGS = -DCMAKE_INSTALL_INCLUDEDIR=/usr/local/include/vulkan_volk \
-DCMAKE_INSTALL_LIBDIR=/usr/local/lib/vulkan_volk \
CONFIGURE_ARGS = -DCMAKE_INSTALL_INCLUDEDIR=${LOCALBASE}/include/vulkan_volk \
-DCMAKE_INSTALL_LIBDIR=${LOCALBASE}/lib/vulkan_volk \
-DVOLK_INSTALL=ON
graphics/volk/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (zeux-volk-vulkan-sdk-1.3.296.0.tar.gz) = j/0OgeKWiPSrqjnlmJNxYLCYIo83UDkDsQ1IHUhiq4U=
SIZE (zeux-volk-vulkan-sdk-1.3.296.0.tar.gz) = 63986
SHA256 (zeux-volk-vulkan-sdk-1.4.304.0.tar.gz) = KlY8ndkmyATZHXuExZUWZ4zLMtA5A4BJ/CDrIlR8iPs=
SIZE (zeux-volk-vulkan-sdk-1.4.304.0.tar.gz) = 65511
graphics/vulkan-headers/Makefile
+1 -1
View File
@@ -1,6 +1,6 @@
COMMENT = Vulkan header files
V = 1.3.296.0
V = 1.4.304.0
PKGNAME = vulkan-headers-${V}
GH_TAGNAME = vulkan-sdk-${V}
GH_ACCOUNT = KhronosGroup
graphics/vulkan-headers/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (Vulkan-Headers-vulkan-sdk-1.3.296.0.tar.gz) = HocqC+OJB4S75o3NibfgF/7Xe6lYIIQYSHGMmL2m3DM=
SIZE (Vulkan-Headers-vulkan-sdk-1.3.296.0.tar.gz) = 2358781
SHA256 (Vulkan-Headers-vulkan-sdk-1.4.304.0.tar.gz) = Rvj1tjhKNsaI4MQNKNU030HSLeQGST37XJt7zClnJhM=
SIZE (Vulkan-Headers-vulkan-sdk-1.4.304.0.tar.gz) = 2443240
graphics/vulkan-headers/pkg/PLIST
+1
View File
@@ -1,6 +1,7 @@
include/vk_video/
include/vk_video/vulkan_video_codec_av1std.h
include/vk_video/vulkan_video_codec_av1std_decode.h
include/vk_video/vulkan_video_codec_av1std_encode.h
include/vk_video/vulkan_video_codec_h264std.h
include/vk_video/vulkan_video_codec_h264std_decode.h
include/vk_video/vulkan_video_codec_h264std_encode.h
graphics/vulkan-loader/Makefile
+2 -2
View File
@@ -1,12 +1,12 @@
COMMENT = Vulkan ICD loader
V = 1.3.296.0
V = 1.4.304.0
PKGNAME = vulkan-loader-${V}
GH_TAGNAME = vulkan-sdk-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = Vulkan-Loader
SHARED_LIBS += vulkan 1.2 # 1.3.296.0
SHARED_LIBS += vulkan 1.3 # 1.4.304.0
CATEGORIES = devel graphics
graphics/vulkan-loader/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (Vulkan-Loader-vulkan-sdk-1.3.296.0.tar.gz) = kktDlCHDBRP1nf02DLEwljnBUi3ihgjrZMnXlYHkTHI=
SIZE (Vulkan-Loader-vulkan-sdk-1.3.296.0.tar.gz) = 1719284
SHA256 (Vulkan-Loader-vulkan-sdk-1.4.304.0.tar.gz) = l1rCl2J2lk1b/Y6XsoqrhfZRsiX6FSukFQZ/fURDmW8=
SIZE (Vulkan-Loader-vulkan-sdk-1.4.304.0.tar.gz) = 1756893
graphics/vulkan-tools/Makefile
+4 -4
View File
@@ -1,11 +1,10 @@
COMMENT = Vulkan Utilities and Tools
V = 1.3.296.0
V = 1.4.304.0
PKGNAME = vulkan-tools-${V}
GH_TAGNAME = vulkan-sdk-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = Vulkan-Tools
REVISION = 1
CATEGORIES = devel graphics
@@ -29,11 +28,12 @@ MODPY_RUNDEP = No
BUILD_DEPENDS = graphics/glslang \
graphics/volk \
graphics/vulkan-headers \
wayland/libinput-openbsd
wayland/libinput-openbsd \
wayland/wayland-protocols
LIB_DEPENDS = graphics/vulkan-loader \
wayland/wayland
CONFIGURE_ARGS += -DGLSLANG_INSTALL_DIR="/usr/local"
CONFIGURE_ARGS += -DGLSLANG_INSTALL_DIR="${LOCALBASE}"
CONFIGURE_ENV += volk_DIR=${LOCALBASE}/lib/vulkan_volk/cmake/volk
NO_TEST = Yes
graphics/vulkan-tools/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (Vulkan-Tools-vulkan-sdk-1.3.296.0.tar.gz) = b5C/9KkIaIy2uvB2kzYTqO6FieIcfcPDuoQ6+9fdhOM=
SIZE (Vulkan-Tools-vulkan-sdk-1.3.296.0.tar.gz) = 757355
SHA256 (Vulkan-Tools-vulkan-sdk-1.4.304.0.tar.gz) = 3o/GPIlqXPx83f9O92a8KyPC5PU8EP0giPPwkWk7l1c=
SIZE (Vulkan-Tools-vulkan-sdk-1.4.304.0.tar.gz) = 758609
graphics/vulkan-tools/patches/patch-cube_cube_c
-109
View File
@@ -1,109 +0,0 @@
fix unsafe functions sprintf and strcat
Index: cube/cube.c
--- cube/cube.c.orig
+++ cube/cube.c
@@ -453,7 +453,8 @@ VKAPI_ATTR VkBool32 VKAPI_CALL debug_messenger_callbac
const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData,
void *pUserData) {
char prefix[64] = "";
- char *message = (char *)malloc(strlen(pCallbackData->pMessage) + 5000);
+ size_t message_size = strlen(pCallbackData->pMessage) + 5000;
+ char *message = (char *)malloc(message_size);
assert(message);
struct demo *demo = (struct demo *)pUserData;
@@ -466,68 +467,68 @@ VKAPI_ATTR VkBool32 VKAPI_CALL debug_messenger_callbac
}
if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT) {
- strcat(prefix, "VERBOSE : ");
+ strlcat(prefix, "VERBOSE : ", sizeof(prefix));
} else if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT) {
- strcat(prefix, "INFO : ");
+ strlcat(prefix, "INFO : ", sizeof(prefix));
} else if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT) {
- strcat(prefix, "WARNING : ");
+ strlcat(prefix, "WARNING : ", sizeof(prefix));
} else if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) {
- strcat(prefix, "ERROR : ");
+ strlcat(prefix, "ERROR : ", sizeof(prefix));
}
if (messageType & VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT) {
- strcat(prefix, "GENERAL");
+ strlcat(prefix, "GENERAL", sizeof(prefix));
} else {
if (messageType & VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT) {
- strcat(prefix, "VALIDATION");
+ strlcat(prefix, "VALIDATION", sizeof(prefix));
validation_error = 1;
}
if (messageType & VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT) {
if (messageType & VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT) {
- strcat(prefix, "|");
+ strlcat(prefix, "|", sizeof(prefix));
}
- strcat(prefix, "PERFORMANCE");
+ strlcat(prefix, "PERFORMANCE", sizeof(prefix));
}
}
- sprintf(message, "%s - Message Id Number: %d | Message Id Name: %s\n\t%s\n", prefix, pCallbackData->messageIdNumber,
+ snprintf(message, message_size, "%s - Message Id Number: %d | Message Id Name: %s\n\t%s\n", prefix, pCallbackData->messageIdNumber,
pCallbackData->pMessageIdName == NULL ? "" : pCallbackData->pMessageIdName, pCallbackData->pMessage);
if (pCallbackData->objectCount > 0) {
char tmp_message[500];
- sprintf(tmp_message, "\n\tObjects - %d\n", pCallbackData->objectCount);
- strcat(message, tmp_message);
+ snprintf(tmp_message, sizeof(tmp_message), "\n\tObjects - %d\n", pCallbackData->objectCount);
+ strlcat(message, tmp_message, message_size);
for (uint32_t object = 0; object < pCallbackData->objectCount; ++object) {
- sprintf(tmp_message, "\t\tObject[%d] - %s", object, string_VkObjectType(pCallbackData->pObjects[object].objectType));
- strcat(message, tmp_message);
+ snprintf(tmp_message, sizeof(tmp_message), "\t\tObject[%d] - %s", object, string_VkObjectType(pCallbackData->pObjects[object].objectType));
+ strlcat(message, tmp_message, message_size);
VkObjectType t = pCallbackData->pObjects[object].objectType;
if (t == VK_OBJECT_TYPE_INSTANCE || t == VK_OBJECT_TYPE_PHYSICAL_DEVICE || t == VK_OBJECT_TYPE_DEVICE ||
t == VK_OBJECT_TYPE_COMMAND_BUFFER || t == VK_OBJECT_TYPE_QUEUE) {
- sprintf(tmp_message, ", Handle %p", (void *)(uintptr_t)(pCallbackData->pObjects[object].objectHandle));
- strcat(message, tmp_message);
+ snprintf(tmp_message, sizeof(tmp_message), ", Handle %p", (void *)(uintptr_t)(pCallbackData->pObjects[object].objectHandle));
+ strlcat(message, tmp_message, message_size);
} else {
- sprintf(tmp_message, ", Handle Ox%" PRIx64, (pCallbackData->pObjects[object].objectHandle));
- strcat(message, tmp_message);
+ snprintf(tmp_message, sizeof(tmp_message), ", Handle Ox%" PRIx64, (pCallbackData->pObjects[object].objectHandle));
+ strlcat(message, tmp_message, message_size);
}
if (NULL != pCallbackData->pObjects[object].pObjectName && strlen(pCallbackData->pObjects[object].pObjectName) > 0) {
- sprintf(tmp_message, ", Name \"%s\"", pCallbackData->pObjects[object].pObjectName);
- strcat(message, tmp_message);
+ snprintf(tmp_message, sizeof(tmp_message), ", Name \"%s\"", pCallbackData->pObjects[object].pObjectName);
+ strlcat(message, tmp_message, message_size);
}
- sprintf(tmp_message, "\n");
- strcat(message, tmp_message);
+ snprintf(tmp_message, sizeof(tmp_message), "\n");
+ strlcat(message, tmp_message, message_size);
}
}
if (pCallbackData->cmdBufLabelCount > 0) {
char tmp_message[500];
- sprintf(tmp_message, "\n\tCommand Buffer Labels - %d\n", pCallbackData->cmdBufLabelCount);
- strcat(message, tmp_message);
+ snprintf(tmp_message, sizeof(tmp_message), "\n\tCommand Buffer Labels - %d\n", pCallbackData->cmdBufLabelCount);
+ strlcat(message, tmp_message, message_size);
for (uint32_t cmd_buf_label = 0; cmd_buf_label < pCallbackData->cmdBufLabelCount; ++cmd_buf_label) {
- sprintf(tmp_message, "\t\tLabel[%d] - %s { %f, %f, %f, %f}\n", cmd_buf_label,
+ snprintf(tmp_message, sizeof(tmp_message), "\t\tLabel[%d] - %s { %f, %f, %f, %f}\n", cmd_buf_label,
pCallbackData->pCmdBufLabels[cmd_buf_label].pLabelName, pCallbackData->pCmdBufLabels[cmd_buf_label].color[0],
pCallbackData->pCmdBufLabels[cmd_buf_label].color[1], pCallbackData->pCmdBufLabels[cmd_buf_label].color[2],
pCallbackData->pCmdBufLabels[cmd_buf_label].color[3]);
- strcat(message, tmp_message);
+ strlcat(message, tmp_message, message_size);
}
}
graphics/vulkan-utility-libraries/Makefile
+1 -1
View File
@@ -1,6 +1,6 @@
COMMENT = Vulkan Utility Libraries
V = 1.3.296.0
V = 1.4.304.0
PKGNAME = vulkan-utility-libraries-${V}
DIST_TUPLE = github KhronosGroup Vulkan-Utility-Libraries vulkan-sdk-${V} .
graphics/vulkan-utility-libraries/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (KhronosGroup-Vulkan-Utility-Libraries-vulkan-sdk-1.3.296.0.tar.gz) = 2fFcREsMxZapxJ/++OZzNuwIp5P3r9frtkrsn2whhCM=
SIZE (KhronosGroup-Vulkan-Utility-Libraries-vulkan-sdk-1.3.296.0.tar.gz) = 556437
SHA256 (KhronosGroup-Vulkan-Utility-Libraries-vulkan-sdk-1.4.304.0.tar.gz) = ElzfX4Z1MuJlFumIrlZs3a8eFSfK91YtpK0hQNq8EsI=
SIZE (KhronosGroup-Vulkan-Utility-Libraries-vulkan-sdk-1.4.304.0.tar.gz) = 572128
graphics/vulkan-validation-layers/Makefile
+1 -1
View File
@@ -1,6 +1,6 @@
COMMENT = Vulkan Validation Layers
V = 1.3.296.0
V = 1.4.304.0
PKGNAME = vulkan-validation-layers-${V}
GH_TAGNAME = vulkan-sdk-${V}
GH_ACCOUNT = KhronosGroup
graphics/vulkan-validation-layers/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (Vulkan-ValidationLayers-vulkan-sdk-1.3.296.0.tar.gz) = 3qKQ1hTHHutRJFLf8VVfkHpAWlohuu/PQbVUjV0P4Vc=
SIZE (Vulkan-ValidationLayers-vulkan-sdk-1.3.296.0.tar.gz) = 5529046
SHA256 (Vulkan-ValidationLayers-vulkan-sdk-1.4.304.0.tar.gz) = lo5hLfmq5SR8t7fp1TIug0Faq9S8FKl1QeWmkR/iK1Y=
SIZE (Vulkan-ValidationLayers-vulkan-sdk-1.4.304.0.tar.gz) = 5940153