From nobody Thu Dec 21 01:52:45 2023 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 4SwYNF6c7Xz55b3d; Thu, 21 Dec 2023 01:52:45 +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 4SwYNF65lfz4LTM; Thu, 21 Dec 2023 01:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703123565; 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=b5CYBn+RqH/Zb5ESaHe3FjCXVvS7VVVurgno/5daHD0=; b=WzgSy2hY9KLpqeURJ2e+D4K4oVMFJ+r/DivGQ09SSEG1zaCs64Mxzijdng8RB+ynA8bDDH jsrmkFfSrs1QFSSbQFjbez5m+1I+we0GIEox4vYWByh22Ii6sJKPLqiNIqn63FvpqTgUzu z6mG9G7cb+F4VUMl/zch89I2kiuSqbRfATFTW0+CBNhZ15P4fJegrUO8dB3BfmC5fQVpjG yZlzXGgW0UupFt7giSZ1Ygc6MfWvO82+I3+/WFN4GgQwdf2QBabNs+WEE6umJHv0guh08V ++fnq3pVJA4oSMUb6Uer0xA1LCHfDr+pEsO7U4jzv9jV7SEiJonpGfj16vQNJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703123565; a=rsa-sha256; cv=none; b=ihXIq/3dmDMMCDAB5T0G8GerCdGTmiz7lXF8MRxkm5bg7CbB6NoDeWg0qwLZko18jQRIUf MgpqGLzMl4qaWLAlHg0iT5bnLOeBLTilnuUv6UnyppFsJ2murRwN0TW0ZKfo8wgVrZDwZV DbnIRtJVEU1ePGLntXZ5n6KhrUxeGAeD/CwpbfIseUEIJkGss7rp7TbPh0v7bxZVy/N/wb fvMtfaf/GdVIlSdcgmAJJCVBps/6wmHswqvilSCsjEYk76dnNUb8fpXNPe09KhFz8qeACd Sc5EKjNbsQLJnEr0oqb7hPw4oB3oJ8MkvSgX9Fw9LZmlYzuitqdl3VVu5epHVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703123565; 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=b5CYBn+RqH/Zb5ESaHe3FjCXVvS7VVVurgno/5daHD0=; b=O4+lig2SmVXo9wlZk9fBajliFJ+P+o20WlBiHQJJxLMuLBc5MeSWnkrFPIMGWbMkQWsO3h NRzZCOHdVvpS1RYN2N9MgDSpOXkScJo0Cjg3MiYnvZqKs8NZJvZGItceL4/YAn5J83bOIR vlxNUCYyNuQ8l8dMVCFNkU8rQw/gtrltgZKZZGKSCyayo19gq1ZHREiCDN/wR2AwGBdW9v ymklp6lnmKwYk5i4jfej7NnxL0IT0EQJQQVnbBO8rrqxGXyDR6LMAmhEYvojpeFSUAWAmk nSNB0tGXF2PpbqoV29wYd4AF+26jpMrZPsSPpjVegik4hFNpyxays4LPOd4uiQ== 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 4SwYNF58mYz1CdT; Thu, 21 Dec 2023 01:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BL1qjee086434; Thu, 21 Dec 2023 01:52:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BL1qjA4086431; Thu, 21 Dec 2023 01:52:45 GMT (envelope-from git) Date: Thu, 21 Dec 2023 01:52:45 GMT Message-Id: <202312210152.3BL1qjA4086431@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 34c28cf7a397 - 2023Q4 - emulators/yuzu: unbreak build after ceff15f0052b 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/2023Q4 X-Git-Reftype: branch X-Git-Commit: 34c28cf7a3974daaa331a2d5248386b202eef442 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=34c28cf7a3974daaa331a2d5248386b202eef442 commit 34c28cf7a3974daaa331a2d5248386b202eef442 Author: Jan Beich AuthorDate: 2023-12-21 01:50:26 +0000 Commit: Jan Beich CommitDate: 2023-12-21 01:51:38 +0000 emulators/yuzu: unbreak build after ceff15f0052b CMake Error at /usr/local/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:230 (message): Could NOT find Vulkan: Found unsuitable version "1.3.266", but required is at least "1.3.274" (found /usr/local/lib/libvulkan.so, found components: glslc glslangValidator) Reported by: pkg-fallout (direct commit to 2023Q4 as 1092b9183b10 is missing on the branch) --- emulators/yuzu/files/patch-vk256 | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/emulators/yuzu/files/patch-vk256 b/emulators/yuzu/files/patch-vk256 new file mode 100644 index 000000000000..8e3ab633784c --- /dev/null +++ b/emulators/yuzu/files/patch-vk256 @@ -0,0 +1,26 @@ +Revert https://github.com/yuzu-emu/yuzu/pull/12414 until 2024Q1 branches + +--- CMakeLists.txt.orig 2023-12-20 17:46:50 UTC ++++ CMakeLists.txt +@@ -305,7 +305,7 @@ if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS) + find_package(zstd 1.5 REQUIRED) + + if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS) +- find_package(Vulkan 1.3.274 REQUIRED) ++ find_package(Vulkan 1.3.256 REQUIRED) + endif() + + if (ENABLE_LIBUSB) +--- src/video_core/vulkan_common/vulkan_wrapper.cpp.orig 2023-12-20 17:46:50 UTC ++++ src/video_core/vulkan_common/vulkan_wrapper.cpp +@@ -377,8 +377,10 @@ const char* ToString(VkResult result) noexcept { + return "VK_OPERATION_DEFERRED_KHR"; + case VkResult::VK_OPERATION_NOT_DEFERRED_KHR: + return "VK_OPERATION_NOT_DEFERRED_KHR"; ++#ifdef VK_KHR_VIDEO_ENCODE_QUEUE_SPEC_VERSION + case VkResult::VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR: + return "VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR"; ++#endif + case VkResult::VK_PIPELINE_COMPILE_REQUIRED_EXT: + return "VK_PIPELINE_COMPILE_REQUIRED_EXT"; + case VkResult::VK_RESULT_MAX_ENUM: