From nobody Wed Jan 18 22:33:52 2023 X-Original-To: dev-commits-ports-branches@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 4Ny0sr4nGdz2txZb; Wed, 18 Jan 2023 22:33:52 +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 4Ny0sr4Fz0z4HFl; Wed, 18 Jan 2023 22:33:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674081232; 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=eELzdEb9X0QNiNBCnsP8tHu7q7fgLpJw4pmtqMccxrY=; b=qijADTJ3gblHuMd3wOozY1h+K/s0cxZeNxS+j8ZepAb0TGpiSl65MuUTj83Tpr9WXZ8sA2 GWksiDZF6JM+glLWNtcBfKOTnJHlmXB47dB/sQcYqw8A0mW68Z1abqHCpUak+mhzEgKPGL m/e4q1HKmdvTGWR+4A6Kg/eNXC1o/oLOXaluZusG+dNijkH+xFmq/WTVaDuDCaH8XszMmC 67kI+CcUHkcLEcarpq7gvBcQ+0axOXrGYNr5AVh71BGYm9pCy8qnOEHzBelq7hKFhH2q0W OROeAMsuXuJLxTRlGabsS86WyQUINufNESX4hDFSZlrTgRFnl4m9VoIQg73hQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674081232; 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=eELzdEb9X0QNiNBCnsP8tHu7q7fgLpJw4pmtqMccxrY=; b=vgrnmYeN+FrQkFviwYp6AefS6SuqkpWF0CSuwUcCcdlCu7YNQP3wXdOcNxCiwA54qZpaf4 LepvKMTOMzXsFamEuVUrBC5cTeKQBXCRe7AkI3TArPVPysU4AhSWHnvuiwso7NmV3M9mXT Hk9bLjRPQhk59rzfb3h0k2EluGHBQvsiZ+WCY4u5g3yjLriBorRxu8UljXBy6Db4y4L43M Jj/WbQA2N8oDP7RBjKBxD1h01HRX0+1dEfFMXQL3SeYO+IscvduBFZfZ7qujotkogQZrfP 4NPW2qJTnKHsZ5+byjpASJeDaFwmuJHb9jZkZDBWv8Amsxn85BYPDOFdN9UCTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674081232; a=rsa-sha256; cv=none; b=ohgNlPQiOVNGo0jtiRNiUTm0xP7WR4stcIKfY45z4ZKDKiCeTt91WhBmQ2AzBQoY74kDUn Cls662QqWd/Zh8XhYHyT4RChne3ptBDO/g+W9QuI8AUP1MSGkxGGpWk08AcxF+jufiUR7Y HcGGyL/arxqYTIk14QUqKs50fyMOSz1yVN8CygGPm8v3FQqQVf69GywzFyIWJGibVYd5Df hBQaRTlV9MWggUm751vC5Oma4QCGNTbtjITOpQW/ihyjLUwtm1LcVkmVuUPXdxGQE9JPuT wXN+X0wDNjvoqYgnEIQkunIECpKTyg74Z3v6UiMGvr4eveZlLkreBDS6UvZBvw== 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 4Ny0sr3HCZzSsx; Wed, 18 Jan 2023 22:33:52 +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 30IMXqP8069079; Wed, 18 Jan 2023 22:33:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30IMXq2A069078; Wed, 18 Jan 2023 22:33:52 GMT (envelope-from git) Date: Wed, 18 Jan 2023 22:33:52 GMT Message-Id: <202301182233.30IMXq2A069078@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rene Ladan Subject: git: c6499c86f19c - 2023Q1 - www/iridium: fix build List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: c6499c86f19c9ac3ff9b41ee413248d0e5ad9f8b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=c6499c86f19c9ac3ff9b41ee413248d0e5ad9f8b commit c6499c86f19c9ac3ff9b41ee413248d0e5ad9f8b Author: Rene Ladan AuthorDate: 2023-01-18 21:56:51 +0000 Commit: Rene Ladan CommitDate: 2023-01-18 22:33:39 +0000 www/iridium: fix build Fixes: fbc179be5cf "www/iridium: update to 2023.01.109" Pointy hat: rene (cherry picked from commit 806350ecc912c45293b3569582780ae34966bee1) --- ..._vulkan__memory__allocator_include_vk__mem__alloc.h | 18 +++++++++--------- www/iridium/pkg-plist | 1 + 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/www/iridium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h b/www/iridium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h index 4976c1dbc4f4..9faee003ae78 100644 --- a/www/iridium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h +++ b/www/iridium/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 2023-01-17 20:31:46 UTC +--- 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__) diff --git a/www/iridium/pkg-plist b/www/iridium/pkg-plist index 48c1c36bb8a0..3cb2d6e97f32 100644 --- a/www/iridium/pkg-plist +++ b/www/iridium/pkg-plist @@ -141,3 +141,4 @@ share/icons/hicolor/24x24/apps/iridium.png share/icons/hicolor/256x256/apps/iridium.png share/icons/hicolor/48x48/apps/iridium.png share/icons/hicolor/64x64/apps/iridium.png +@dir %%DATADIR%%/swiftshader