From nobody Thu Jul 25 12:35:47 2024 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 4WV9N33ndGz5Rygp; Thu, 25 Jul 2024 12:35:47 +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 4WV9N334pMz4LSM; Thu, 25 Jul 2024 12:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721910947; 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=111CaZog82lj4mYqGlDDeBa4j3oYqmLHPzyd8hIcWTo=; b=vJXyskbqvEfyUDoPlRuU5dMA19fGGtI/XUe44edKO6bDM7LxfLsDf+BiXCEE4SfynB1I2y RDex77JiANxHfNm2pu+Wcz0F0YLT6Y4fGaFBLeSu98Fc5s7BIq9BGVxPryP1w/F0gpgKeb dNoaMpI2K/IvF78z17JJqRa3srQnZ08rU4k0dkpIXxhwLu4AllheD5SaQfuV8B0PQjK3pz KPjZFD120bh+gTxgSHeTbiWnHmdHmFgEtRDC9+G8Jh47mCQcmLtzC20ish0VJg552Ejj+5 cplBEdtoN4BxnPvx0mn5CXNR/y3QlvddCvKbLjz9T6hesK7lAhHjlvpKFd+3Rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721910947; a=rsa-sha256; cv=none; b=ixfPagF0ksCuRhuR+GUW2CaT2aMGZOTyK1v5yo1vPf4wEXWKhRPPXYkKkmrMO5wQ73njxT J6Yc9RgQuxDxSzmu7ww2c6PyRxFR/4njaTHzah70ry4bYd2PN4pFa3iGhPUt0TvASmTRSo lFa5i3xpZC1ELtBuXSafZ8f9HTKVO04UpsEFQvP+YiQkQW074tzCyEZVVQ6hjnJdVFGsQc 6ixZ9U9UMBIcMi0PKwWKCKPqKNdNvi04KjJTMMG458XDJQT1rDnIcNaLMVW5POc7p3uFff E/1uUK/zH6ympB7jYTsgvdQHL2ynav3l6ZgtZRWmtSQHm8hUu/qMnFlSTZELOg== 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=1721910947; 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=111CaZog82lj4mYqGlDDeBa4j3oYqmLHPzyd8hIcWTo=; b=gWt559lQzWDVq4daPbGkYs2LAWLdcn7/iGEFIZJEmmYjyGmfbvUooUqV0Z90Q2UIDBkvxT Fit25ki0uFsf0+Phl8NdzoHfszUzzSba8nFWECI8aoSSjTmpKH9xLM23wsCczQAVgEcwrR lg5TeOO84VoiWPHjSHUnvVi8VszE2nW1MgXSSoJ5JwwBf9/Uil4fHbwaRCbGJSYP7/66BJ 24YeWpPhgp9K5je7jwj8ACjnm4ii+OyGxqWAM+uV/EaC0Kte8QTeE2S6Qu5A7LrgCU3vpD j61bxxj974k+kvkbPCls2mPgidXe3VHT04FG4oUcOZ5GDuRro3obbM9Nd1oeMQ== 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 4WV9N32NRdzw6Z; Thu, 25 Jul 2024 12:35:47 +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 46PCZl6M028295; Thu, 25 Jul 2024 12:35:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46PCZl2V028292; Thu, 25 Jul 2024 12:35:47 GMT (envelope-from git) Date: Thu, 25 Jul 2024 12:35:47 GMT Message-Id: <202407251235.46PCZl2V028292@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 064b0f0d3073 - main - games/moonlight-qt: replace local patch with patch from upstream 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 064b0f0d30733e0022674c9340b44024923538f7 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=064b0f0d30733e0022674c9340b44024923538f7 commit 064b0f0d30733e0022674c9340b44024923538f7 Author: Vladimir Druzenko AuthorDate: 2024-07-25 12:33:21 +0000 Commit: Vladimir Druzenko CommitDate: 2024-07-25 12:33:21 +0000 games/moonlight-qt: replace local patch with patch from upstream https://github.com/moonlight-stream/moonlight-qt/commit/9e92c07cb7bce3591f43df2984f4e8dc61511c95 PR: 280425 MFH: 2024Q3 --- games/moonlight-qt/Makefile | 4 ++++ games/moonlight-qt/distinfo | 4 +++- .../patch-app_streaming_video_ffmpeg-renderers_plvk.h | 14 -------------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/games/moonlight-qt/Makefile b/games/moonlight-qt/Makefile index 275d5d43694f..c152b8e1a9c5 100644 --- a/games/moonlight-qt/Makefile +++ b/games/moonlight-qt/Makefile @@ -5,6 +5,10 @@ MASTER_SITES= https://github.com/moonlight-stream/moonlight-qt/releases/download PKGNAMESUFFIX= -qt DISTNAME= MoonlightSrc-${DISTVERSIONFULL} +PATCH_SITES= https://github.com/moonlight-stream/moonlight-qt/commit/ +# Build fails on i386: https://github.com/moonlight-stream/moonlight-qt/issues/1367 +PATCHFILES+= 9e92c07cb7bce3591f43df2984f4e8dc61511c95.patch:-p1 + MAINTAINER= lisp_25689@163.com COMMENT= Gamestream client WWW= https://github.com/moonlight-stream/moonlight-qt diff --git a/games/moonlight-qt/distinfo b/games/moonlight-qt/distinfo index 2ef4a1114303..af285490a390 100644 --- a/games/moonlight-qt/distinfo +++ b/games/moonlight-qt/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1720010303 +TIMESTAMP = 1721910249 SHA256 (MoonlightSrc-6.0.1.tar.gz) = c4e59b033f4cfa78c7af54213d1eec158bc1676472c358be61482375e1a38ee0 SIZE (MoonlightSrc-6.0.1.tar.gz) = 83786545 +SHA256 (9e92c07cb7bce3591f43df2984f4e8dc61511c95.patch) = 0e17bf514b279a99dbe3c7cbaa548306f94026c759aa9a01e53100e585a3a50b +SIZE (9e92c07cb7bce3591f43df2984f4e8dc61511c95.patch) = 973 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 deleted file mode 100644 index 60440d150c4a..000000000000 --- a/games/moonlight-qt/files/patch-app_streaming_video_ffmpeg-renderers_plvk.h +++ /dev/null @@ -1,14 +0,0 @@ ---- 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;