From nobody Fri Dec 6 19:36:54 2024 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 4Y4hN65vhhz5fmHQ; Fri, 06 Dec 2024 19:36:54 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4hN65NFGz542P; Fri, 6 Dec 2024 19:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733513814; 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=YeUYkg7AdhAwyy2jfcHXi6GFK/vavTaBTRxgSKv4kw0=; b=BnPVeMh5nP38CuK0L/zE1K/XnIdqFS5Xy2XEjeXkLceuoEAuQ8tG4JJJLTf+pTtFqEZZKx UTjU3s61Lkz8t5Osb4avLKppWLHgJRcOse81NzQOc1yH6DVelNKlNAgSNxX9FlmTt7RanY iahmDR1PxoQYYd4jNfCtUZATAIH6u93pqbHGN6Ac+vjj+jt8dLIrLuMkea2my5xAMjp+yz Sa+1MAZ26Mjkef4sgHNC6KEJsw206mErtd5UoHf0a7oIQYiFHttRmRgg7iPgjy1sc/u1wP 4rm5kcZW3fTMyH4qZodLPM+spwh/m95xEG3CKfNmMFDt2p73xkNpW3UvYS7IWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733513814; 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=YeUYkg7AdhAwyy2jfcHXi6GFK/vavTaBTRxgSKv4kw0=; b=nIRmBOWjYHzmQlLPIL3G5kUTq+93U8OBHEVYtRD7UElhJIsUt2ByzoY6qd6zVgt2CfnBVf 5Of1JuiCTCOqGd5z09qpbsqtUNuN4rSMmxdgaqJfsqE24NAa9DO4jmknxa3juRfEwIF5Lx LKISnJ8YRqNT7oG2TsfcDU3iIBPXY0U/Lb39SPzEQ9zYRmzmF+SMJubOPJrNGcXTKwL/2p VAoG6wbc56BHLK8+9K483SHAiM4iiEq0hl0OP42OOUBJnrd2nFEw7U35xEvxq+KqVT4Zxf 7++zUummlHGoPd2AFjEEZO53UsHXRS24Ki/3UJ9+GIi58iur+LOKT+aC88HULA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733513814; a=rsa-sha256; cv=none; b=WOlq4OJnMQKhaU+Dqpa2ADqSGti4b/Wq5S3CzX+wV2b0YnhxDcMF0k+t6w4IalOjPk87+N T7fwvO2SwyZJ55g9TFnnlcSeS1Qs9t000u3f5jSelLqTTebstUoaR2qdXERq0/DNkzIerf OvsPDMBeWxJKY+WWLNu65ohONSdhR1SZhtv3MG76TWpX+A5oVOFaPPeSK7sheFPjMCRusN 6xyYbcsnrHMMZO6yCZEkyt+AeNWclOWjU4cuS9xnVrGC5xyo3IJ4AiK8v/0a/otB0vRdXt Nw8TKtQyYzCuQigsNMdzfNeyhb3seqslQiGZSbOsXOJy9Zwawdy+PJ9NsRmBag== 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 4Y4hN64sTqzrWT; Fri, 6 Dec 2024 19:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B6Jasm0053284; Fri, 6 Dec 2024 19:36:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B6JasJn053281; Fri, 6 Dec 2024 19:36:54 GMT (envelope-from git) Date: Fri, 6 Dec 2024 19:36:54 GMT Message-Id: <202412061936.4B6JasJn053281@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: 4e6771047102 - main - graphics/vulkan-headers: unbreak 32-bit consumers after 4868165d658c 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: 4e677104710264cca16b92b544cc2829a3d0d357 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4e677104710264cca16b92b544cc2829a3d0d357 commit 4e677104710264cca16b92b544cc2829a3d0d357 Author: Jan Beich AuthorDate: 2024-12-05 13:24:21 +0000 Commit: Jan Beich CommitDate: 2024-12-06 19:36:36 +0000 graphics/vulkan-headers: unbreak 32-bit consumers after 4868165d658c In file included from /usr/local/include/vulkan/vulkan.hpp:8864: /usr/local/include/vulkan/vulkan_structs.hpp:1241:90: error: invalid operands to binary expression ('const vk::AccelerationStructureKHR' and 'const vk::AccelerationStructureKHR') 1241 | return ( sType == rhs.sType ) && ( pNext == rhs.pNext ) && ( accelerationStructure == rhs.accelerationStructure ) && | ~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~ Reported by: pkg-fallout (benchmarks/vkmark, emulators/flycast) --- graphics/vulkan-headers/Makefile | 1 + graphics/vulkan-headers/files/patch-32bit | 62 +++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile index d8b74a877a4d..c0c578caf341 100644 --- a/graphics/vulkan-headers/Makefile +++ b/graphics/vulkan-headers/Makefile @@ -1,6 +1,7 @@ PORTNAME= vulkan-headers DISTVERSIONPREFIX= v DISTVERSION= 1.4.303 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org diff --git a/graphics/vulkan-headers/files/patch-32bit b/graphics/vulkan-headers/files/patch-32bit new file mode 100644 index 000000000000..2413e6fe2618 --- /dev/null +++ b/graphics/vulkan-headers/files/patch-32bit @@ -0,0 +1,62 @@ +https://github.com/KhronosGroup/Vulkan-Hpp/commit/c2c49478e9f2 +https://github.com/KhronosGroup/Vulkan-Hpp/issues/2009 + +--- include/vulkan/vulkan_handles.hpp.orig 2024-12-04 08:19:07 UTC ++++ include/vulkan/vulkan_handles.hpp +@@ -17706,5 +17706,56 @@ namespace VULKAN_HPP_NAMESPACE + VULKAN_HPP_NODISCARD typename ResultValueType::type enumerateInstanceVersion( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ); + #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */ + ++// operators to compare vk::-handles ++#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) ++template ::value, int>::type = 0> ++bool operator<=>( T const & lhs, T const & rhs ) ++{ ++ return static_cast( lhs ) <=> static_cast( rhs ); ++} ++#else ++template ::value, int>::type = 0> ++bool operator==( T const & lhs, T const & rhs ) ++{ ++ return static_cast( lhs ) == static_cast( rhs ); ++} ++ ++template ::value, int>::type = 0> ++bool operator!=( T const & lhs, T const & rhs ) ++{ ++ return static_cast( lhs ) != static_cast( rhs ); ++} ++ ++template ::value, int>::type = 0> ++bool operator<( T const & lhs, T const & rhs ) ++{ ++ return static_cast( lhs ) < static_cast( rhs ); ++} ++#endif ++ ++template ::value, int>::type = 0> ++bool operator==( T const & v, std::nullptr_t ) ++{ ++ return !v; ++} ++ ++template ::value, int>::type = 0> ++bool operator==( std::nullptr_t, T const & v ) ++{ ++ return !v; ++} ++ ++template ::value, int>::type = 0> ++bool operator!=( T const & v, std::nullptr_t ) ++{ ++ return !!v; ++} ++ ++template ::value, int>::type = 0> ++bool operator!=( std::nullptr_t, T const & v ) ++{ ++ return !!v; ++} ++ + } // namespace VULKAN_HPP_NAMESPACE + #endif