aboutsummaryrefslogtreecommitdiff
path: root/graphics/vulkan-tools
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/vulkan-tools')
-rw-r--r--graphics/vulkan-tools/Makefile4
-rw-r--r--graphics/vulkan-tools/distinfo6
-rw-r--r--graphics/vulkan-tools/files/patch-cube_cube.cpp11
-rw-r--r--graphics/vulkan-tools/files/patch-vulkaninfo_vulkaninfo.h45
4 files changed, 5 insertions, 61 deletions
diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile
index dbb3958e9078..2e3a9d729591 100644
--- a/graphics/vulkan-tools/Makefile
+++ b/graphics/vulkan-tools/Makefile
@@ -1,6 +1,6 @@
PORTNAME= vulkan-tools
DISTVERSIONPREFIX= v
-DISTVERSION= 1.2.184
+DISTVERSION= 1.2.185
CATEGORIES= graphics
MAINTAINER= jbeich@FreeBSD.org
@@ -12,7 +12,7 @@ BUILD_DEPENDS= glslangValidator:graphics/glslang \
vulkan-headers>0:graphics/vulkan-headers
LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader
-USES= cmake compiler:c++11-lib pkgconfig python:3.4+,build
+USES= alias cmake compiler:c++11-lib pkgconfig python:3.4+,build
USE_GITHUB= yes
GH_ACCOUNT= KhronosGroup
GH_PROJECT= Vulkan-Tools
diff --git a/graphics/vulkan-tools/distinfo b/graphics/vulkan-tools/distinfo
index d2371629bb08..fb4ff57ab9c8 100644
--- a/graphics/vulkan-tools/distinfo
+++ b/graphics/vulkan-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625605987
-SHA256 (KhronosGroup-Vulkan-Tools-v1.2.184_GH0.tar.gz) = fc0730eae7c9b7c760af92aa465697c5e97c6519f4bf1624a147de9b5a4a0a4c
-SIZE (KhronosGroup-Vulkan-Tools-v1.2.184_GH0.tar.gz) = 847971
+TIMESTAMP = 1626891697
+SHA256 (KhronosGroup-Vulkan-Tools-v1.2.185_GH0.tar.gz) = 29b34497daf940e3e36f5a9a64079de6d7e2d39e3ca1d4f5a771122dbb556089
+SIZE (KhronosGroup-Vulkan-Tools-v1.2.185_GH0.tar.gz) = 849135
diff --git a/graphics/vulkan-tools/files/patch-cube_cube.cpp b/graphics/vulkan-tools/files/patch-cube_cube.cpp
deleted file mode 100644
index 12fdcff31e5e..000000000000
--- a/graphics/vulkan-tools/files/patch-cube_cube.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- cube/cube.cpp.orig 2020-04-08 02:52:46 UTC
-+++ cube/cube.cpp
-@@ -2999,7 +2999,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPre
- return (int)msg.wParam;
- }
-
--#elif __linux__
-+#elif __unix__
-
- int main(int argc, char **argv) {
- Demo demo;
diff --git a/graphics/vulkan-tools/files/patch-vulkaninfo_vulkaninfo.h b/graphics/vulkan-tools/files/patch-vulkaninfo_vulkaninfo.h
deleted file mode 100644
index c242706cec6d..000000000000
--- a/graphics/vulkan-tools/files/patch-vulkaninfo_vulkaninfo.h
+++ /dev/null
@@ -1,45 +0,0 @@
---- vulkaninfo/vulkaninfo.h.orig 2020-04-08 02:52:46 UTC
-+++ vulkaninfo/vulkaninfo.h
-@@ -60,7 +60,7 @@
- #include <windows.h>
- #endif // _WIN32
-
--#if defined(__linux__) || defined(__APPLE__)
-+#if defined(__unix__) || defined(__APPLE__)
- #include <dlfcn.h>
- #endif
-
-@@ -253,7 +253,7 @@ auto GetVector(const char *func_name, F &&f, Ts &&...
- // ----------- Instance Setup ------- //
- struct VkDll {
- VkResult Initialize() {
--#if defined(__linux__)
-+#if defined(__unix__)
- library = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
- if (!library) library = dlopen("libvulkan.so.1", RTLD_NOW | RTLD_LOCAL);
- #elif defined(_WIN32)
-@@ -265,7 +265,7 @@ struct VkDll {
- return VK_SUCCESS;
- }
- void Close() {
--#if defined(__linux__)
-+#if defined(__unix__)
- dlclose(library);
- #elif defined(_WIN32)
- FreeLibrary(library);
-@@ -427,13 +427,13 @@ struct VkDll {
- private:
- template <typename T>
- void Load(T &func_dest, const char *func_name) {
--#if defined(__linux__)
-+#if defined(__unix__)
- func_dest = reinterpret_cast<T>(dlsym(library, func_name));
- #elif defined(_WIN32)
- func_dest = reinterpret_cast<T>(GetProcAddress(library, func_name));
- #endif
- }
--#if defined(__linux__)
-+#if defined(__unix__)
- void *library;
- #elif defined(_WIN32)
- HMODULE library;