From a703e7f42bb455a4eb5c70511a946b5c830e11b5 Mon Sep 17 00:00:00 2001 From: nox Date: Thu, 8 Dec 2011 19:41:25 +0000 Subject: - Fix random vdr-sxfe xvdr+tcp:// reconnect failures. (I shall update this and the other vdr ports to newer versions later.) - Bump PORTREVISION. Feature safe: yes --- multimedia/vdr-plugin-xineliboutput/Makefile | 2 +- .../vdr-plugin-xineliboutput/files/patch-xine_input_vdr.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 multimedia/vdr-plugin-xineliboutput/files/patch-xine_input_vdr.c diff --git a/multimedia/vdr-plugin-xineliboutput/Makefile b/multimedia/vdr-plugin-xineliboutput/Makefile index 47d60364067d..8eb54816a9fa 100644 --- a/multimedia/vdr-plugin-xineliboutput/Makefile +++ b/multimedia/vdr-plugin-xineliboutput/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr-plugin-xineliboutput PORTVERSION= 1.0.90s20110308.2305 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= multimedia MASTER_SITES= SF:release \ LOCAL:snapshot diff --git a/multimedia/vdr-plugin-xineliboutput/files/patch-xine_input_vdr.c b/multimedia/vdr-plugin-xineliboutput/files/patch-xine_input_vdr.c new file mode 100644 index 000000000000..bc1410a041ac --- /dev/null +++ b/multimedia/vdr-plugin-xineliboutput/files/patch-xine_input_vdr.c @@ -0,0 +1,11 @@ +--- a/xine_input_vdr.c ++++ b/xine_input_vdr.c +@@ -5526,7 +5526,7 @@ static int connect_tcp_data_stream(vdr_i + LOGERR("Data stream write error (TCP)"); + } else if( XIO_READY != io_select_rd(fd_data)) { + LOGERR("Data stream poll failed (TCP)"); +- } else if((n=read(fd_data, tmpbuf, sizeof(tmpbuf))) <= 0) { ++ } else if((n=read(fd_data, tmpbuf, sizeof("DATA\r\n") - 1)) <= 0) { + LOGERR("Data stream read failed (TCP)"); + } else if(n<6 || strncmp(tmpbuf, "DATA\r\n", 6)) { + tmpbuf[n] = 0; -- cgit