From nobody Mon Nov 08 21:40:55 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2CE011830272; Mon, 8 Nov 2021 21:40:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hp4Kz6xR0z3KXd; Mon, 8 Nov 2021 21:40:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A93AB189FD; Mon, 8 Nov 2021 21:40:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1A8LetjV074211; Mon, 8 Nov 2021 21:40:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A8LetZt074210; Mon, 8 Nov 2021 21:40:55 GMT (envelope-from git) Date: Mon, 8 Nov 2021 21:40:55 GMT Message-Id: <202111082140.1A8LetZt074210@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: d97553f6f7b1 - main - graphics/vulkan-loader: unbreak build on non-x86 archs after e99b707ea9df List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d97553f6f7b1ff930036beca218bfc895c850fd4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d97553f6f7b1ff930036beca218bfc895c850fd4 commit d97553f6f7b1ff930036beca218bfc895c850fd4 Author: Jan Beich AuthorDate: 2021-11-08 20:56:12 +0000 Commit: Jan Beich 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) {