games/moonlight-embedded: Update to 2.4.8

Changes:	https://github.com/irtimmer/moonlight-embedded/releases/tag/v2.4.8

5 files changed, 22 insertions, 61 deletions

diff --git a/games/moonlight-embedded/Makefile b/games/moonlight-embedded/Makefile
index ff4fba003ef4..4858d9f6e650 100644
--- a/games/moonlight-embedded/Makefile
+++ b/games/moonlight-embedded/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	moonlight-embedded
-DISTVERSION=	2.4.7
-PORTREVISION=	2
+DISTVERSION=	2.4.8
 CATEGORIES=	games
 MASTER_SITES=	https://github.com/irtimmer/moonlight-embedded/releases/download/v${DISTVERSION}/
 
@@ -19,12 +18,13 @@ LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libopus.so:audio/opus \
 		libuuid.so:misc/e2fsprogs-libuuid
 
-USES=		cmake localbase:ldflags perl5 pkgconfig ssl tar:xz
+USES=		cmake localbase:ldflags perl5 pkgconfig sdl ssl tar:xz
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 USE_SDL=	sdl2
 
 CFLAGS+=	-DPREFIX="\\\"${PREFIX}\\\""
+NO_WRKSUBDIR=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e '/(ALSA)/d' \
diff --git a/games/moonlight-embedded/distinfo b/games/moonlight-embedded/distinfo
index 0d6dfcaf9db7..6687289f0c51 100644
--- a/games/moonlight-embedded/distinfo
+++ b/games/moonlight-embedded/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1534076138
-SHA256 (moonlight-embedded-2.4.7.tar.xz) = f78e7de28e190ea21ad567f2c580be384c53fa40f22d2ab8db16487c3e99fc56
-SIZE (moonlight-embedded-2.4.7.tar.xz) = 152496
+TIMESTAMP = 1556560792
+SHA256 (moonlight-embedded-2.4.8.tar.xz) = a60b005e8720fae0da5aa2f09fa2476207f71c08ba01a13111d916e02c2ea2f8
+SIZE (moonlight-embedded-2.4.8.tar.xz) = 160412
diff --git a/games/moonlight-embedded/files/patch-src_main.c b/games/moonlight-embedded/files/patch-src_main.c
index 7f9da0fedbef..d7343992a11f 100644
--- a/games/moonlight-embedded/files/patch-src_main.c
+++ b/games/moonlight-embedded/files/patch-src_main.c
@@ -1,4 +1,4 @@
---- src/main.c.orig	2018-08-11 15:43:13 UTC
+--- src/main.c.orig	2019-04-29 17:09:45 UTC
 +++ src/main.c
 @@ -91,7 +91,6 @@ static void stream(PSERVER_DATA server, PCONFIGURATION
    }
@@ -8,7 +8,13 @@
    #ifdef HAVE_SDL
    gamepads += sdl_gamepads;
    #endif
-@@ -124,13 +123,8 @@ static void stream(PSERVER_DATA server, PCONFIGURATION
+@@ -121,19 +120,11 @@ static void stream(PSERVER_DATA server, PCONFIGURATION
+     connection_debug = true;
+   }
+ 
+-  if (IS_EMBEDDED(system))
+-    loop_init();
+-
    platform_start(system);
    LiStartConnection(&server->serverInfo, &config->stream, &connection_callbacks, platform_get_video(system), platform_get_audio(system, config->audio_device), NULL, drFlags, config->audio_device, 0);
  
@@ -23,15 +29,15 @@
      sdl_loop();
    #endif
  
-@@ -172,7 +166,6 @@ static void help() {
+@@ -182,7 +173,6 @@ static void help() {
    printf("\t-surround\t\tStream 5.1 surround sound (requires GFE 2.7)\n");
    printf("\t-keydir <directory>\tLoad encryption keys from directory\n");
    printf("\t-mapping <file>\t\tUse <file> as gamepad mappings configuration file\n");
 -  printf("\t-platform <system>\tSpecify system used for audio, video and input: pi/imx/aml/rk/x11/x11_vdpau/sdl/fake (default auto)\n");
    printf("\t-unsupported\t\tTry streaming if GFE version or options are unsupported\n");
+   printf("\t-quitappafter\t\tSend quit app request to remote after quitting session\n");
    #if defined(HAVE_SDL) || defined(HAVE_X11)
-   printf("\n WM options (SDL and X11 only)\n\n");
-@@ -210,8 +203,6 @@ int main(int argc, char* argv[]) {
+@@ -221,8 +211,6 @@ int main(int argc, char* argv[]) {
        exit(-1);
      }
   
@@ -40,7 +46,7 @@
      exit(0); 
    }
  
-@@ -222,12 +213,8 @@ int main(int argc, char* argv[]) {
+@@ -233,12 +221,8 @@ int main(int argc, char* argv[]) {
        exit(-1);
      }
      config.address[0] = 0;
@@ -55,7 +61,7 @@
    }
    
    char host_config_file[128];
-@@ -277,38 +264,8 @@ int main(int argc, char* argv[]) {
+@@ -288,39 +272,8 @@ int main(int argc, char* argv[]) {
      }
      config.stream.supportsHevc = config.codec != CODEC_H264 && (config.codec == CODEC_HEVC || platform_supports_hevc(system));
  
@@ -85,6 +91,7 @@
 -
 -      udev_init(!inputAdded, mappings, config.debug_level > 0);
 -      evdev_init();
+-      rumble_handler = evdev_rumble;
 -      #ifdef HAVE_LIBCEC
 -      cec_init();
 -      #endif /* HAVE_LIBCEC */
diff --git a/games/moonlight-embedded/files/patch-third__party_moonlight-common-c_src_ControlStream.c b/games/moonlight-embedded/files/patch-third__party_moonlight-common-c_src_ControlStream.c
deleted file mode 100644
index 7d7851d80d50..000000000000
--- a/games/moonlight-embedded/files/patch-third__party_moonlight-common-c_src_ControlStream.c
+++ /dev/null
@@ -1,46 +0,0 @@
-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;
diff --git a/games/moonlight-embedded/files/patch-third__party_moonlight-common-c_src_InputStream.c b/games/moonlight-embedded/files/patch-third__party_moonlight-common-c_src_InputStream.c
index b5382ac25255..11a31e91d292 100644
--- a/games/moonlight-embedded/files/patch-third__party_moonlight-common-c_src_InputStream.c
+++ b/games/moonlight-embedded/files/patch-third__party_moonlight-common-c_src_InputStream.c
@@ -1,6 +1,6 @@
---- third_party/moonlight-common-c/src/InputStream.c.orig	2017-06-11 16:02:49 UTC
+--- third_party/moonlight-common-c/src/InputStream.c.orig	2019-04-29 17:05:00 UTC
 +++ third_party/moonlight-common-c/src/InputStream.c
-@@ -34,7 +34,7 @@ typedef struct _PACKET_HOLDER {
+@@ -35,7 +35,7 @@ typedef struct _PACKET_HOLDER {
      LINKED_BLOCKING_QUEUE_ENTRY entry;
  } PACKET_HOLDER, *PPACKET_HOLDER;