Index: head/games/moonlight-embedded/Makefile =================================================================== --- head/games/moonlight-embedded/Makefile (revision 453473) +++ head/games/moonlight-embedded/Makefile (revision 453474) @@ -1,57 +1,56 @@ # $FreeBSD$ PORTNAME= moonlight-embedded -PORTVERSION= 2.4.3 DISTVERSIONPREFIX= v -PORTREVISION= 1 +DISTVERSION= 2.4.4 CATEGORIES= games MAINTAINER= tobik@FreeBSD.org COMMENT= Gamestream client LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libcurl.so:ftp/curl \ libenet.so:net/enet \ libexpat.so:textproc/expat2 \ libopus.so:audio/opus \ libuuid.so:misc/e2fsprogs-libuuid USES= cmake localbase:ldflags perl5 pkgconfig ssl USE_GITHUB= yes GH_ACCOUNT= irtimmer GH_TUPLE= irtimmer:moonlight-common-c:a1bdb36766f8db5dc9cc0694c9a376f0dca3ab59:common/third_party/moonlight-common-c USE_LDCONFIG= yes USE_PERL5= build USE_SDL= sdl2 CFLAGS+= -DPREFIX="\\\"${PREFIX}\\\"" post-patch: @${REINPLACE_CMD} -e '/(ALSA)/d' \ -e '/libpulse-simple/d' \ -e '/libcec/d' \ -e '/libevdev/d' -e 's@./src/input/evdev.c@@' \ -e '/libudev/d' -e 's@./src/input/udev.c@@' \ -e '/libva/d' \ -e '/vdpau/d' \ -e '/egl/d' \ -e '/glesv2/d' \ -e '/x11/d' \ ${WRKSRC}/CMakeLists.txt @${RM} ${WRKSRC}/src/loop.c @${REINPLACE_CMD} -e '/avahi-client/d' -e 's@SHARED@STATIC@' \ -e 's@OpenSSL 1.0.2@OpenSSL@' -e '/^install(/d' \ ${WRKSRC}/libgamestream/CMakeLists.txt @${RM} ${WRKSRC}/libgamestream/discover.c @${REINPLACE_CMD} -e 's@/etc/moonlight/moonlight.conf@${PREFIX}/etc/moonlight.conf@' \ - -e 's@moonligt@moonlight@' \ + -e 's@moonligt@moonlight@g' \ ${WRKSRC}/docs/README.pod post-install: @${MV} ${STAGEDIR}${PREFIX}/etc/moonlight.conf \ ${STAGEDIR}${PREFIX}/etc/moonlight.conf.sample .include Index: head/games/moonlight-embedded/distinfo =================================================================== --- head/games/moonlight-embedded/distinfo (revision 453473) +++ head/games/moonlight-embedded/distinfo (revision 453474) @@ -1,5 +1,5 @@ -TIMESTAMP = 1503005827 -SHA256 (irtimmer-moonlight-embedded-v2.4.3_GH0.tar.gz) = 81a45d382d8511410f37e61a8957a3d1a5e0d081358ae2a3cef990602f27fd58 -SIZE (irtimmer-moonlight-embedded-v2.4.3_GH0.tar.gz) = 136489 +TIMESTAMP = 1509795639 +SHA256 (irtimmer-moonlight-embedded-v2.4.4_GH0.tar.gz) = 10ce448cf88303ad5b851461fb2e1b7c3f5ebc415ee5086ecb18166225f0e491 +SIZE (irtimmer-moonlight-embedded-v2.4.4_GH0.tar.gz) = 137835 SHA256 (irtimmer-moonlight-common-c-a1bdb36766f8db5dc9cc0694c9a376f0dca3ab59_GH0.tar.gz) = b9fce9621b4b0cf780c3e1e75b52afa3e4493993289f28301b957beb7299d8bb SIZE (irtimmer-moonlight-common-c-a1bdb36766f8db5dc9cc0694c9a376f0dca3ab59_GH0.tar.gz) = 64283 Index: head/games/moonlight-embedded/files/patch-libgamestream_client.c =================================================================== --- head/games/moonlight-embedded/files/patch-libgamestream_client.c (revision 453473) +++ head/games/moonlight-embedded/files/patch-libgamestream_client.c (revision 453474) @@ -1,14 +1,14 @@ ---- libgamestream/client.c.orig 2017-07-02 11:38:48 UTC +--- libgamestream/client.c.orig 2017-10-24 18:52:11 UTC +++ libgamestream/client.c -@@ -494,7 +494,11 @@ int gs_pair(PSERVER_DATA server, char* pin) { +@@ -503,7 +503,11 @@ int gs_pair(PSERVER_DATA server, char* pin) { RAND_bytes(client_secret_data, 16); const ASN1_BIT_STRING *asnSignature; +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) X509_get0_signature(&asnSignature, NULL, cert); +#else + asnSignature = cert->signature; +#endif char challenge_response[16 + 256 + 16]; char challenge_response_hash[32]; Index: head/games/moonlight-embedded/files/patch-src_main.c =================================================================== --- head/games/moonlight-embedded/files/patch-src_main.c (revision 453473) +++ head/games/moonlight-embedded/files/patch-src_main.c (revision 453474) @@ -1,80 +1,89 @@ ---- src/main.c.orig 2017-07-02 11:38:48 UTC +--- src/main.c.orig 2017-10-24 18:52:11 UTC +++ src/main.c -@@ -113,13 +113,8 @@ static void stream(PSERVER_DATA server, PCONFIGURATION +@@ -115,13 +115,8 @@ static void stream(PSERVER_DATA server, PCONFIGURATION 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); - if (IS_EMBEDDED(system)) { - evdev_start(); - loop_main(); - evdev_stop(); - } #ifdef HAVE_SDL - else if (system == SDL) + if (system == SDL) sdl_loop(); #endif -@@ -160,7 +155,6 @@ static void help() { +@@ -163,7 +158,6 @@ static void help() { printf("\t-surround\t\tStream 5.1 surround sound (requires GFE 2.7)\n"); printf("\t-keydir \tLoad encryption keys from directory\n"); printf("\t-mapping \t\tUse as gamepad mappings configuration file\n"); - printf("\t-platform \tSpecify system used for audio, video and input: pi/imx/aml/x11/x11_vdpau/sdl/fake (default auto)\n"); printf("\t-unsupported\t\tTry streaming if GFE version or options are unsupported\n"); #if defined(HAVE_SDL) || defined(HAVE_X11) printf("\n WM options (SDL and X11 only)\n\n"); -@@ -199,12 +193,8 @@ int main(int argc, char* argv[]) { +@@ -201,8 +195,6 @@ int main(int argc, char* argv[]) { exit(-1); } + +- evdev_create(config.inputs[0], NULL, config.debug_level > 0); +- evdev_map(config.inputs[0]); + exit(0); + } + +@@ -213,12 +205,8 @@ int main(int argc, char* argv[]) { + exit(-1); + } config.address[0] = 0; - printf("Searching for server...\n"); - gs_discover_server(config.address); - if (config.address[0] == 0) { - fprintf(stderr, "Autodiscovery failed. Specify an IP address next time.\n"); - exit(-1); - } + fprintf(stderr, "Autodiscovery unsupported. Specify an IP address next time.\n"); + exit(-1); } char host_config_file[128]; -@@ -251,38 +241,8 @@ int main(int argc, char* argv[]) { +@@ -268,38 +256,8 @@ int main(int argc, char* argv[]) { } config.stream.supportsHevc = config.codec != CODEC_H264 && (config.codec == CODEC_HEVC || platform_supports_hevc(system)); - if (IS_EMBEDDED(system)) { - char* mapping_env = getenv("SDL_GAMECONTROLLERCONFIG"); - if (config.mapping == NULL && mapping_env == NULL) { - fprintf(stderr, "Please specify mapping file as default mapping could not be found.\n"); - exit(-1); - } - - struct mapping* mappings = NULL; - if (config.mapping != NULL) - mappings = mapping_load(config.mapping, config.debug_level > 0); - - if (mapping_env != NULL) { - struct mapping* map = mapping_parse(mapping_env); - map->next = mappings; - mappings = map; - } - - for (int i=0;i 0) - printf("Add input %s...\n", config.inputs[i]); - - evdev_create(config.inputs[i], mappings, config.debug_level > 0); - } - - udev_init(!inputAdded, mappings, config.debug_level > 0); - evdev_init(); - #ifdef HAVE_LIBCEC - cec_init(); - #endif /* HAVE_LIBCEC */ - } #ifdef HAVE_SDL - else if (system == SDL) { + if (system == SDL) { if (config.inputsCount > 0) { fprintf(stderr, "You can't select input devices as SDL will automatically use all available controllers\n"); exit(-1);