From nobody Sat Dec 11 00:10:11 2021 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 5508F18CA0FD; Sat, 11 Dec 2021 00:10:12 +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 4J9p7S0Yypz3jTP; Sat, 11 Dec 2021 00:10:12 +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 E409A23D4A; Sat, 11 Dec 2021 00:10:11 +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 1BB0AB3U096051; Sat, 11 Dec 2021 00:10:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BB0ABZm096045; Sat, 11 Dec 2021 00:10:11 GMT (envelope-from git) Date: Sat, 11 Dec 2021 00:10:11 GMT Message-Id: <202112110010.1BB0ABZm096045@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: f7abaa498134 - main - graphics/vulkan-headers: update to 1.2.202 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7abaa498134e5bccf45f6ab67525d803b00aaac Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639181412; 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=dKoJb7h2ZhTKxjvSxhYQLuZtKjxkjyUOIpOvJmC7J/8=; b=Y4Hpa2Cf+pA1UrSAKLHDwgYGKbGy5YTG5I2uUfBktdf+bRTClPDJYFXvLEUlcM5DwJF1yS LXalEwBP0VwmJU3YXoRCsp7A53XWuCBsB2NUal9wI/rACPs211QRmmXejNsIHnBtjSFEe9 jO8gdYpg/3g05M5VmqXIkMRlhLxk+mYJtibU8L4ASpoAZ5qACvjc5a2C5qXUN57xlP329S BujAknrHG9XNuOFi1BYrFWXZT1BcoLobJ9zbufkmDXG3+PycpoTFLXC0yMzVapJH58pnG6 mOyS8w4ODUs3g/lSCL3f1h1+4o50ihFBGxf7wY5Hiyug4KEco5shMWhwxhe2fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639181412; a=rsa-sha256; cv=none; b=gM6mnxRBEtRO/OKz+G0nLBdOayxgo1U5096dSvHtRShXqJKaAqmRQIdnKH8/dKnOatxr4s dHzPcx5tTLyidrdsq4nwMbSOx3aB9sNvZLKvd55Tp2KtMUWlgZG20PZfp5moSLe8ICsQ4v +1UdYdVaXBaX7ADusdLnqTgSU1Hjx8UgWxsxvtYAda2243SNP+dHT2dndbFJ5gG8CLi4ZE kSWEtHdBmlt39dzNRSVHSJkMu9CjUve9Ftw3pOU0xinU0IVUiCx7Gf7LJcREvqBsQCbql+ klykfNTvj2ws9/o+uKzUiRKxSkNsN5M3bMz/ReMJUIC76ydrrGtBkS7lAQ4EpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f7abaa498134e5bccf45f6ab67525d803b00aaac commit f7abaa498134e5bccf45f6ab67525d803b00aaac Author: Jan Beich AuthorDate: 2021-12-07 09:36:34 +0000 Commit: Jan Beich CommitDate: 2021-12-11 00:09:54 +0000 graphics/vulkan-headers: update to 1.2.202 Force rebuild vulkan-loader to make sure vulkaninfo shows the new version. Changes: https://github.com/KhronosGroup/Vulkan-Headers/compare/v1.2.201...v1.2.202 Reported by: Repology --- .../warzone2100/files/patch-vulkan-headers-1.2.202 | 30 ++++++++++++++++++++++ graphics/vulkan-headers/Makefile | 2 +- graphics/vulkan-headers/distinfo | 6 ++--- .../files/patch-include_vulkan_vulkan.hpp | 30 ++++++++++++++++++++++ graphics/vulkan-loader/Makefile | 1 + 5 files changed, 65 insertions(+), 4 deletions(-) diff --git a/games/warzone2100/files/patch-vulkan-headers-1.2.202 b/games/warzone2100/files/patch-vulkan-headers-1.2.202 new file mode 100644 index 000000000000..94c67b83349f --- /dev/null +++ b/games/warzone2100/files/patch-vulkan-headers-1.2.202 @@ -0,0 +1,30 @@ +In file included from warzone2100-4.0.1/lib/ivis_opengl/gfx_api_vk.cpp:42: +lib/ivis_opengl/gfx_api_vk.h:123:9: error: redefinition of 'hash' + struct hash + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +/usr/local/include/vulkan/vulkan_structs.hpp:20333:13: note: previous definition is here +struct std::hash + ^ + +--- lib/ivis_opengl/gfx_api_vk.h.orig 2021-04-18 18:28:41 UTC ++++ lib/ivis_opengl/gfx_api_vk.h +@@ -118,19 +118,6 @@ inline void hash_combine(std::size_t& seed, const T& v + #endif + hash_combine(seed, rest...); + } +-namespace std { +- template <> +- struct hash +- { +- std::size_t operator()(const vk::DescriptorBufferInfo& k) const +- { +- std::size_t h = 0; +- hash_combine(h, static_cast(k.buffer), k.offset, k.range); +- return h; +- } +- }; +-} +- + struct BlockBufferAllocator + { + BlockBufferAllocator(VmaAllocator allocator, uint32_t minimumBlockSize, const vk::BufferUsageFlags& usageFlags, const VmaAllocationCreateInfo& allocInfo, bool autoMap = false); diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile index c6ae99fc9317..5d89bac9c1ec 100644 --- a/graphics/vulkan-headers/Makefile +++ b/graphics/vulkan-headers/Makefile @@ -1,6 +1,6 @@ PORTNAME= vulkan-headers DISTVERSIONPREFIX= v -DISTVERSION= 1.2.201 +DISTVERSION= 1.2.202 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/vulkan-headers/distinfo b/graphics/vulkan-headers/distinfo index ff042db4220b..db7b80b2344d 100644 --- a/graphics/vulkan-headers/distinfo +++ b/graphics/vulkan-headers/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1638326636 -SHA256 (KhronosGroup-Vulkan-Headers-v1.2.201_GH0.tar.gz) = 6b7f9c809acff4f0877e2e7722e02a08f2e17e06c6e2e8c84081631d15490009 -SIZE (KhronosGroup-Vulkan-Headers-v1.2.201_GH0.tar.gz) = 1318121 +TIMESTAMP = 1638869794 +SHA256 (KhronosGroup-Vulkan-Headers-v1.2.202_GH0.tar.gz) = df8748ba3073be032f78c97994798c3c2b52b1812e506cc58855faf10f031226 +SIZE (KhronosGroup-Vulkan-Headers-v1.2.202_GH0.tar.gz) = 1361825 diff --git a/graphics/vulkan-headers/files/patch-include_vulkan_vulkan.hpp b/graphics/vulkan-headers/files/patch-include_vulkan_vulkan.hpp new file mode 100644 index 000000000000..edb4a98c9d2e --- /dev/null +++ b/graphics/vulkan-headers/files/patch-include_vulkan_vulkan.hpp @@ -0,0 +1,30 @@ +https://github.com/KhronosGroup/Vulkan-Hpp/issues/1161 + +--- include/vulkan/vulkan.hpp.orig 2021-12-07 09:36:34 UTC ++++ include/vulkan/vulkan.hpp +@@ -234,9 +234,23 @@ static_assert( VK_HEADER_VERSION == 202, "Wrong VK_HEA + # define VULKAN_HPP_NAMESPACE vk + #endif + ++template ::type> ++struct safe_underlying_type ++{ ++ using type = T; ++}; ++ ++template ++struct safe_underlying_type ++{ ++ using type = typename std::underlying_type::type; ++}; ++ + #if !defined( VULKAN_HPP_HASH_COMBINE ) +-# define VULKAN_HPP_HASH_COMBINE( valueType, seed, value ) \ +- seed ^= std::hash::type>{}( value ) + 0x9e3779b9 + ( seed << 6 ) + ( seed >> 2 ) ++# define VULKAN_HPP_HASH_COMBINE( valueType, seed, value ) \ ++ seed ^= std::hash::type>::type>{}( \ ++ static_cast::type>( value ) ) + \ ++ 0x9e3779b9 + ( seed << 6 ) + ( seed >> 2 ) + #endif + + #define VULKAN_HPP_STRINGIFY2( text ) #text diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index 5c256e8edb0a..eb4c681cc81a 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,6 +1,7 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v DISTVERSION= 1.2.201 +PORTREVISION= 1 CATEGORIES= graphics devel MAINTAINER= jbeich@FreeBSD.org