From nobody Wed Jul 24 16:30:16 2024 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 4WTfd44zysz5SD2M; Wed, 24 Jul 2024 16:30:16 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WTfd44NPTz47HZ; Wed, 24 Jul 2024 16:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721838616; 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=7JejbC4ElX+41/D+8R0YlZdfW9TmfPTjkbAm198LEiM=; b=MWvu0QoWUwRgh9jibUuud1PfiMCyqGnr+J7jpjv+7MNSfskrmFCJGidPcrnM3V/fmNejy2 3O2q0mIlohbFyCSQML6vTBSoVQGIxWMtkNzL+TunPAG+VDXtGm/GWVPSFCW0pdEKyL2if2 fShiWq4TsKeqGol395LGeOvFjQciPstQAKRzIoJsV18Q1ps0TWrTiL8NugBAodVole//t4 /Lndcci0uAG907p4br7sghKEMr/GKqIPxdUk+vey125zZBQsaAldQjKQ0fNZ0tTl2RHORh 0sJb+4K37o9tdcrjh5ts6lr4RIi5KIfKOq4rQc5CSB7A3851FcZu/xTJbm73OA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721838616; a=rsa-sha256; cv=none; b=X9Hj1sM47zH/yHUv4K3LJmsXO39jPig9285kM3GFUgeTviF61gxNIm857I0ZRHp2ji4/E4 M7aHCs0cYf/c8pzhg+qYDSVtGTUKpsnceGLViW51SOw597bXkKIybMZ8yNGbO/OAa82A1V GEg4kKswlwWcAVC3Dn9hN16bdUztUM4Cen6Nq4KjEKxO4SLlRiOtlOyVy41s1xCjz6b6tb N29zOYEryBrzooCYl9eQ82THHPLg0dVUDr3GLIQq3kBO8m4hFXNQZK/ideIew/kIs0Akga fF+oXGnMMlPIoq3nKPceNPgQFiFafl2d52cD4S83+2fAU1GEiQRmgZ++Rg6mdw== 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=1721838616; 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=7JejbC4ElX+41/D+8R0YlZdfW9TmfPTjkbAm198LEiM=; b=XPK93BTLfaIGtkYCkkhZNz1VYXZHLebgiiwtAUIm0QSx3v97J1En7mTXh7VMRujolab77u nsIwo2oxHOUjfN3dkY3LWyt9a4Evkeqbh7uWOOZ7/xtQScFSbQIgr95GdDhgUIuKGXfk7B EzOvB5CEqfpZfeMYCYmOcQ6sicrIOUYM6+tEUCDDVxCU1LQRf9dYyMOtV35NtSt9NF+oK4 ff9Ck833cgVBktAY/T07765g5hLx7R8tOXoDl1ymYcQXveqAO7QXA6zeTDVPblo+/IctSw qNQjhOKVYuy68zYVdrJDhb7JweNDIL3XGNXLsRnI/Ubp5yk6WhegJx5pNFNC9w== 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 4WTfd43t0fzJMN; Wed, 24 Jul 2024 16:30:16 +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 46OGUGrm080087; Wed, 24 Jul 2024 16:30:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46OGUGAS080082; Wed, 24 Jul 2024 16:30:16 GMT (envelope-from git) Date: Wed, 24 Jul 2024 16:30:16 GMT Message-Id: <202407241630.46OGUGAS080082@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 7e1461db3aab - 2024Q3 - games/moonlight-qt: Build fails on i386: cannot initialize a member subobject of type 'VkSurfaceKHR' (aka 'unsigned long long') with an rvalue of type 'std::nullptr_t' 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: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 7e1461db3aab17a5855da003d577cac0fc089d1d Auto-Submitted: auto-generated The branch 2024Q3 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=7e1461db3aab17a5855da003d577cac0fc089d1d commit 7e1461db3aab17a5855da003d577cac0fc089d1d Author: Armin Zhu AuthorDate: 2024-07-24 16:24:24 +0000 Commit: Vladimir Druzenko CommitDate: 2024-07-24 16:30:08 +0000 games/moonlight-qt: Build fails on i386: cannot initialize a member subobject of type 'VkSurfaceKHR' (aka 'unsigned long long') with an rvalue of type 'std::nullptr_t' In file included from /wrkdirs/usr/ports/games/moonlight-qt/work/moonlight-qt-6.0.1/app/streaming/video/ffmpeg.cpp:48: /wrkdirs/usr/ports/games/moonlight-qt/work/moonlight-qt-6.0.1/app/streaming/video/ffmpeg-renderers/plvk.h:57:32: error: cannot initialize a member subobject of type 'VkSurfaceKHR' (aka 'unsigned long long') with an rvalue of type 'std::nullptr_t' 57 | VkSurfaceKHR m_VkSurface = nullptr; | ^~~~~~~ Upstream bug-report: https://github.com/moonlight-stream/moonlight-qt/issues/1367 PR: 280425 MFH: 2024Q3 (cherry picked from commit 54b259414cb8dc56bacff02399b3668bf1d03f9b) --- .../patch-app_streaming_video_ffmpeg-renderers_plvk.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/games/moonlight-qt/files/patch-app_streaming_video_ffmpeg-renderers_plvk.h b/games/moonlight-qt/files/patch-app_streaming_video_ffmpeg-renderers_plvk.h new file mode 100644 index 000000000000..60440d150c4a --- /dev/null +++ b/games/moonlight-qt/files/patch-app_streaming_video_ffmpeg-renderers_plvk.h @@ -0,0 +1,14 @@ +--- app/streaming/video/ffmpeg-renderers/plvk.h.orig 2024-07-23 05:26:28 UTC ++++ app/streaming/video/ffmpeg-renderers/plvk.h +@@ -54,7 +54,11 @@ class PlVkRenderer : public IFFmpegRenderer { (private + // The libplacebo rendering state + pl_log m_Log = nullptr; + pl_vk_inst m_PlVkInstance = nullptr; ++#if VK_USE_64_BIT_PTR_DEFINES == 1 + VkSurfaceKHR m_VkSurface = nullptr; ++#else ++ VkSurfaceKHR m_VkSurface = 0; ++#endif + pl_vulkan m_Vulkan = nullptr; + pl_swapchain m_Swapchain = nullptr; + pl_renderer m_Renderer = nullptr;