Date: Tue, 29 Jan 2019 15:54:10 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r491574 - in branches/2019Q1/games/moonlight-embedded: . files Message-ID: <201901291554.x0TFsARq056086@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Tue Jan 29 15:54:09 2019 New Revision: 491574 URL: https://svnweb.freebsd.org/changeset/ports/491574 Log: MFH: r491573 games/moonlight-embedded: Add patch to fix runtime with GFE 3.16 Submitted by: Brian Bostwick Approved by: ports-secteam runtime fix blanket Added: branches/2019Q1/games/moonlight-embedded/files/patch-third__party_moonlight-common-c_src_ControlStream.c - copied unchanged from r491573, head/games/moonlight-embedded/files/patch-third__party_moonlight-common-c_src_ControlStream.c Modified: branches/2019Q1/games/moonlight-embedded/Makefile Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/games/moonlight-embedded/Makefile ============================================================================== --- branches/2019Q1/games/moonlight-embedded/Makefile Tue Jan 29 15:53:31 2019 (r491573) +++ branches/2019Q1/games/moonlight-embedded/Makefile Tue Jan 29 15:54:09 2019 (r491574) @@ -2,7 +2,7 @@ PORTNAME= moonlight-embedded DISTVERSION= 2.4.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= https://github.com/irtimmer/moonlight-embedded/releases/download/v${DISTVERSION}/ Copied: branches/2019Q1/games/moonlight-embedded/files/patch-third__party_moonlight-common-c_src_ControlStream.c (from r491573, head/games/moonlight-embedded/files/patch-third__party_moonlight-common-c_src_ControlStream.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q1/games/moonlight-embedded/files/patch-third__party_moonlight-common-c_src_ControlStream.c Tue Jan 29 15:54:09 2019 (r491574, copy of r491573, head/games/moonlight-embedded/files/patch-third__party_moonlight-common-c_src_ControlStream.c) @@ -0,0 +1,46 @@ +From 8665d806978d2cba9c9040183a3686f4d87d402c Mon Sep 17 00:00:00 2001 +From: Cameron Gutman <aicommander@gmail.com> +Date: Thu, 15 Nov 2018 12:55:22 -0800 +Subject: [PATCH] Don't expect responses for ENet control messages to fix GFE + 3.16 + +--- + src/ControlStream.c | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +--- third_party/moonlight-common-c/src/ControlStream.c.orig 2018-08-11 15:28:10 UTC ++++ third_party/moonlight-common-c/src/ControlStream.c +@@ -378,10 +378,7 @@ static int sendMessageAndForget(short ptype, short pay + } + + static int sendMessageAndDiscardReply(short ptype, short paylen, const void* payload) { +- // Discard the response + if (AppVersionQuad[0] >= 5) { +- ENetEvent event; +- + PltLockMutex(&enetMutex); + + if (!sendMessageEnet(ptype, paylen, payload)) { +@@ -389,14 +386,6 @@ static int sendMessageAndDiscardReply(short ptype, sho + return 0; + } + +- if (serviceEnetHost(client, &event, CONTROL_STREAM_TIMEOUT_SEC * 1000) <= 0 || +- event.type != ENET_EVENT_TYPE_RECEIVE) { +- PltUnlockMutex(&enetMutex); +- return 0; +- } +- +- enet_packet_destroy(event.packet); +- + PltUnlockMutex(&enetMutex); + } + else { +@@ -406,6 +395,7 @@ static int sendMessageAndDiscardReply(short ptype, sho + return 0; + } + ++ // Discard the response + reply = readNvctlPacketTcp(); + if (reply == NULL) { + return 0;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901291554.x0TFsARq056086>