Date: Mon, 8 Nov 2021 21:40:55 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d97553f6f7b1 - main - graphics/vulkan-loader: unbreak build on non-x86 archs after e99b707ea9df Message-ID: <202111082140.1A8LetZt074210@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d97553f6f7b1ff930036beca218bfc895c850fd4 commit d97553f6f7b1ff930036beca218bfc895c850fd4 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-11-08 20:56:12 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-11-08 21:40:14 +0000 graphics/vulkan-loader: unbreak build on non-x86 archs after e99b707ea9df CMake Error at loader/CMakeLists.txt:311 (target_compile_definitions): Cannot specify compile definitions for target "asm_offset" which is not built by this project. This reverts commit e99b707ea9df7966f9f95e2871a053715318f00a. PR: 259718 Reported by: mikael (aarch64) --- graphics/vulkan-loader/Makefile | 3 --- graphics/vulkan-loader/distinfo | 2 -- .../vulkan-loader/files/patch-loader_vk__loader__platform.h | 11 +++++++++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index c6b52d8bc46e..c3242d751719 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -4,9 +4,6 @@ DISTVERSION= 1.2.197 PORTREVISION= 1 CATEGORIES= graphics devel -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= b8ee23e4d5ac.patch:-p1 # https://github.com/KhronosGroup/Vulkan-Loader/pull/738 - MAINTAINER= jbeich@FreeBSD.org COMMENT= Driver loader for the Vulkan graphics API diff --git a/graphics/vulkan-loader/distinfo b/graphics/vulkan-loader/distinfo index 27e7df636a76..c797350af85d 100644 --- a/graphics/vulkan-loader/distinfo +++ b/graphics/vulkan-loader/distinfo @@ -1,5 +1,3 @@ TIMESTAMP = 1635956498 SHA256 (KhronosGroup-Vulkan-Loader-v1.2.197_GH0.tar.gz) = fd1bf11dfa62ed118fc3537c849e6619e2c7b84598b60a2ad89f7af553eb29d6 SIZE (KhronosGroup-Vulkan-Loader-v1.2.197_GH0.tar.gz) = 1436996 -SHA256 (b8ee23e4d5ac.patch) = a5bdac0080bcaf342d45b4b4d5ebbc6d68aef190b47dfb7bd5545a6f72aa3dd5 -SIZE (b8ee23e4d5ac.patch) = 1797 diff --git a/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h b/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h new file mode 100644 index 000000000000..9d07571f9242 --- /dev/null +++ b/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h @@ -0,0 +1,11 @@ +--- loader/vk_loader_platform.h.orig 2021-11-03 16:21:38 UTC ++++ loader/vk_loader_platform.h +@@ -156,7 +156,7 @@ static inline bool loader_platform_is_path_absolute(co + + static inline char *loader_platform_dirname(char *path) { return dirname(path); } + +-#if defined(__linux__) || defined(__FreeBSD__) ++#if defined(__linux__) + + // find application path + name. Path cannot be longer than 1024, returns NULL if it is greater than that. + static inline char *loader_platform_executable_path(char *buffer, size_t size) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111082140.1A8LetZt074210>