Index: head/games/moonlight-embedded/Makefile =================================================================== --- head/games/moonlight-embedded/Makefile (revision 528612) +++ head/games/moonlight-embedded/Makefile (revision 528613) @@ -1,54 +1,53 @@ # $FreeBSD$ PORTNAME= moonlight-embedded -DISTVERSION= 2.4.10 -PORTREVISION= 1 +DISTVERSION= 2.4.11 CATEGORIES= games MASTER_SITES= https://github.com/irtimmer/moonlight-embedded/releases/download/v${DISTVERSION}/ 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 sdl ssl tar:xz 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@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 528612) +++ head/games/moonlight-embedded/distinfo (revision 528613) @@ -1,3 +1,3 @@ -TIMESTAMP = 1559014681 -SHA256 (moonlight-embedded-2.4.10.tar.xz) = 80efcaf432f6ac7f64d0fcda14728d37051d96d73dca82223ffb688cc248c4d2 -SIZE (moonlight-embedded-2.4.10.tar.xz) = 161696 +TIMESTAMP = 1584486809 +SHA256 (moonlight-embedded-2.4.11.tar.xz) = 4494a30925c42c28197e1b0ebabdac0215507f206696aa5b14cb6e85afa4e33c +SIZE (moonlight-embedded-2.4.11.tar.xz) = 164096 Index: head/games/moonlight-embedded/files/patch-src_main.c =================================================================== --- head/games/moonlight-embedded/files/patch-src_main.c (revision 528612) +++ head/games/moonlight-embedded/files/patch-src_main.c (revision 528613) @@ -1,104 +1,106 @@ ---- src/main.c.orig 2019-04-29 17:09:45 UTC +--- src/main.c.orig 2020-03-09 19:33:27 UTC +++ src/main.c @@ -91,7 +91,6 @@ static void stream(PSERVER_DATA server, PCONFIGURATION } int gamepads = 0; - gamepads += evdev_gamepads; #ifdef HAVE_SDL gamepads += sdl_gamepads; #endif -@@ -121,19 +120,11 @@ static void stream(PSERVER_DATA server, PCONFIGURATION +@@ -121,21 +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); - if (IS_EMBEDDED(system)) { -- evdev_start(); +- if (!config->viewonly) +- evdev_start(); - loop_main(); -- evdev_stop(); +- if (!config->viewonly) +- evdev_stop(); - } #ifdef HAVE_SDL - else if (system == SDL) + if (system == SDL) sdl_loop(); #endif -@@ -182,7 +173,6 @@ static void help() { +@@ -188,7 +177,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/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) -@@ -221,8 +211,6 @@ int main(int argc, char* argv[]) { + printf("\t-viewonly\t\tDisable all input processing (view-only mode)\n"); +@@ -228,8 +216,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); +- evdev_map(config.inputs[0]); + exit(0); } -@@ -233,12 +221,8 @@ int main(int argc, char* argv[]) { +@@ -240,12 +226,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]; -@@ -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)); -- 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); -- } + char host_config_file[128]; +@@ -304,39 +286,8 @@ int main(int argc, char* argv[]) { + if (config.debug_level > 0) + printf("View-only mode enabled, no input will be sent to the host computer\n"); + } else { +- 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); +- 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; -- } +- 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]); +- for (int i=0;i 0) +- printf("Add input %s...\n", config.inputs[i]); - -- evdev_create(config.inputs[i], mappings, config.debug_level > 0); -- } +- evdev_create(config.inputs[i], mappings, config.debug_level > 0); +- } - -- udev_init(!inputAdded, mappings, config.debug_level > 0); -- evdev_init(); -- rumble_handler = evdev_rumble; -- #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); +- udev_init(!inputAdded, mappings, config.debug_level > 0); +- evdev_init(); +- rumble_handler = evdev_rumble; +- #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);