From nobody Sun Dec 18 10:06:14 2022 X-Original-To: dev-commits-ports-main@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 4NZdlW3bqcz1H56w; Sun, 18 Dec 2022 10:06:15 +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 4NZdlW2ySRz3MB3; Sun, 18 Dec 2022 10:06:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671357975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LEOyOtSopp4ZsAeL9+kuwRN2unQqeEBw9SXYPY4N9Xg=; b=c02HWhgU+o72Ir9/daacBjISkygBGz/AbEe0pyaC0t8NTye70Zay35xGV8X9j15+Fw5OmG RJoTObmklOxKZp6LKf3ioF4P31dLvaz5MDcdKCieoJhDKYLQXbvb5DTaqynzYeLoR06WRw 2DhrkYQ+PpR0bIozKLScrvC818dZbYjLXtQCaudjvsWFszhYQubgoiYJY+phWTCtAVBARu 5StES1i7k1sPlEAd+vZvg2wlRsGSB9x2Ieclqm9UKYZphLBvzSp3jAPhHQG6u+UYDmMDnw 9DHNr/A7EE59EuhhD7VcdK198pvlJxr/d/gI6MdrPTEjeEqum11i52B8XvlZbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671357975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LEOyOtSopp4ZsAeL9+kuwRN2unQqeEBw9SXYPY4N9Xg=; b=eelBvF2wlxXqF9icIgl7m4wcdTLcjjciXSOVi+EQbWejgZdnL73X71H+7Qqj3XMGk4rqFo lr0oGpBK1gzR/h//kMXu8YojMIUSoO0MnKi5/0hbMTR+asNkLuYwDhxI02HNGD3wpY0fSh f0eBKKccoM7vgxFItxT85958rAxyeOsbt6n9iUHbLh6cj0wuRCWyO6Gq+ZxDBUsIY3vTnJ 8fopH6ld2S1y3m2n/vZ878PvG4g8NTGQDLKuunV03vs0f1HsHVaTKHnEJ54oKtRHEt8b3J yai2x1Fr9c/l/AtQl03RM7iv6wP9zxqcfJ9p/3aylq0E/9V+lfurt07T8wy/Ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671357975; a=rsa-sha256; cv=none; b=dzdnl81rT67LoVHjdEiNtHpJaHlyy/K9UCtx5EbvFr1s4HJRuV3Esrj68gmQ1GUT7nLAqD btV6DMezofVdAp+p6iICf/eI4H+WSOYSVwr3ibsLso0/xcAPUs/zt1vUzH7uQA7AkzrtxP gYsYGFb+s2h0KLaAVYJj12F//727gYzzTyedhPvIYJ0gdsIcdXLVQu3yUsgLS1Jfuusa/+ UznoRK0qRDXJYFEtDNp7YR6kzHxe1okziiReFzf2+++DEtWqddiLmQE0f5+7wTC5nSs1C7 zWolgJKC52FqbHzYIOuXttPBziLttteiJnck1TzMc11gpdpNt9eRC2ZmxJTqsQ== 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 4NZdlW1jv9z1Qn2; Sun, 18 Dec 2022 10:06:15 +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 2BIA6EAw046644; Sun, 18 Dec 2022 10:06:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BIA6EI7046643; Sun, 18 Dec 2022 10:06:14 GMT (envelope-from git) Date: Sun, 18 Dec 2022 10:06:14 GMT Message-Id: <202212181006.2BIA6EI7046643@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 9ea68c3c05e5 - main - devel/electron21: Fix patch. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ea68c3c05e54c5b817e11a7c93f2e196539e5c1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=9ea68c3c05e54c5b817e11a7c93f2e196539e5c1 commit 9ea68c3c05e54c5b817e11a7c93f2e196539e5c1 Author: Mikael Urankar AuthorDate: 2022-12-18 10:05:32 +0000 Commit: Mikael Urankar CommitDate: 2022-12-18 10:06:06 +0000 devel/electron21: Fix patch. --- ...ty_vulkan__memory__allocator_include_vk__mem__alloc.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/devel/electron21/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h b/devel/electron21/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h index f91dcc0021b0..9faee003ae78 100644 --- a/devel/electron21/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h +++ b/devel/electron21/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h @@ -1,11 +1,11 @@ --- third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.orig 2022-02-28 16:54:41 UTC +++ third_party/vulkan_memory_allocator/include/vk_mem_alloc.h @@ -2503,7 +2503,7 @@ void *vma_aligned_alloc(size_t alignment, size_t size) - - return memalign(alignment, size); - } --#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) -+#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) || defined(__OpenBSD__) || defined(__FreeBSD__) - #include - - #if defined(__APPLE__) + + return memalign(alignment, size); + } +-#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) ++#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) || defined(__OpenBSD__) || defined(__FreeBSD__) + #include + + #if defined(__APPLE__)