[vlc-commits] Contribs: update live555

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jun 22 11:02:43 2015 +0200| [042529c3b602dada99c559b1dc55fb0850a3c998] | committer: Jean-Baptiste Kempf

Contribs: update live555

(cherry picked from commit fd0a69dff784a32dbf6b7f88e0c589d31ea9198d)
(cherry picked from commit 953d664bf320f49e7e9e1264885110bd6e0064a6)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=042529c3b602dada99c559b1dc55fb0850a3c998
---

 contrib/src/live555/SHA512SUMS             |    2 +-
 contrib/src/live555/live555-nosignal.patch |   50 +++++++++++++---------------
 contrib/src/live555/rules.mak              |    4 +--
 3 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/contrib/src/live555/SHA512SUMS b/contrib/src/live555/SHA512SUMS
index 82d144f..1c529da 100644
--- a/contrib/src/live555/SHA512SUMS
+++ b/contrib/src/live555/SHA512SUMS
@@ -1 +1 @@
-613450ced9bd656bc3e736ce8bae7f867e0c1577c8bdb29369620c3b1772d76e45ce3b8218bf99819c593ac7b92a6760500923c22d3aaaa2b393f88da7044066  live.2014.07.25.tar.gz
+6de220196f8e503d8d0fc5191c241ffd082cde903bef8f504cb789904518ee7f1e790e265bc7b30bdb4ec61e74b94fc2aa7aa969dc52b1b402d54b362b970189  live.2015.06.24.tar.gz
diff --git a/contrib/src/live555/live555-nosignal.patch b/contrib/src/live555/live555-nosignal.patch
index 424b168..71c8c33 100644
--- a/contrib/src/live555/live555-nosignal.patch
+++ b/contrib/src/live555/live555-nosignal.patch
@@ -2,28 +2,6 @@ Copyright (C) 2015 Rémi Denis-Courmont
 
 Licensed under the terms of the GNU LGPL version 2.1 or later.
 
-diff -ru live555.orig/groupsock/GroupsockHelper.cpp live555/groupsock/GroupsockHelper.cpp
---- live555.orig/groupsock/GroupsockHelper.cpp	2015-05-21 20:34:45.854307019 +0300
-+++ live555/groupsock/GroupsockHelper.cpp	2015-05-21 20:36:36.003306022 +0300
-@@ -30,6 +30,9 @@
- #define initializeWinsockIfNecessary() 1
- #endif
- #include <stdio.h>
-+#ifndef MSG_NOSIGNAL
-+# define MSG_NOSIGNAL 0
-+#endif
- 
- // By default, use INADDR_ANY for the sending and receiving interfaces:
- netAddressBits SendingInterfaceAddr = INADDR_ANY;
-@@ -337,7 +340,7 @@
- 		    unsigned char* buffer, unsigned bufferSize) {
-   do {
-     MAKE_SOCKADDR_IN(dest, address.s_addr, port.num());
--    int bytesSent = sendto(socket, (char*)buffer, bufferSize, 0,
-+    int bytesSent = sendto(socket, (char*)buffer, bufferSize, MSG_NOSIGNAL,
- 			   (struct sockaddr*)&dest, sizeof dest);
-     if (bytesSent != (int)bufferSize) {
-       char tmpBuf[100];
 diff -ru live555.orig/liveMedia/RTPInterface.cpp live555/liveMedia/RTPInterface.cpp
 --- live555.orig/liveMedia/RTPInterface.cpp	2015-05-21 20:34:45.855307019 +0300
 +++ live555/liveMedia/RTPInterface.cpp	2015-05-21 20:38:10.383305167 +0300
@@ -117,13 +95,33 @@ diff -ru live555.orig/liveMedia/RTSPServerSupportingHTTPStreaming.cpp live555/li
    fResponseBuffer[0] = '\0'; // We've already sent the response.  This tells the calling code not to send it again.
  
    // Then, send the playlist.  Because it's large, we don't do so using "send()", because that might not send it all at once.
-diff -ru live555.orig/liveMedia/TCPStreamSink.cpp live555/liveMedia/TCPStreamSink.cpp
---- live555.orig/liveMedia/TCPStreamSink.cpp	2015-05-21 20:34:45.857307019 +0300
-+++ live555/liveMedia/TCPStreamSink.cpp	2015-05-21 20:39:34.599304405 +0300
+--- live/groupsock/GroupsockHelper.cpp.orig	2015-06-22 00:09:17.000000000 +0200
++++ live/groupsock/GroupsockHelper.cpp	2015-06-22 10:56:08.673912904 +0200
+@@ -35,6 +35,9 @@
+ #define USE_SIGNALS 1
+ #endif
+ #include <stdio.h>
++#ifndef MSG_NOSIGNAL
++# define MSG_NOSIGNAL 0
++#endif
+ 
+ // By default, use INADDR_ANY for the sending and receiving interfaces:
+ netAddressBits SendingInterfaceAddr = INADDR_ANY;
+@@ -342,7 +345,7 @@
+ 		    unsigned char* buffer, unsigned bufferSize) {
+   do {
+     MAKE_SOCKADDR_IN(dest, address.s_addr, portNum);
+-    int bytesSent = sendto(socket, (char*)buffer, bufferSize, 0,
++    int bytesSent = sendto(socket, (char*)buffer, bufferSize, MSG_NOSIGNAL,
+ 			   (struct sockaddr*)&dest, sizeof dest);
+     if (bytesSent != (int)bufferSize) {
+       char tmpBuf[100];
+--- live/liveMedia/TCPStreamSink.cpp.orig	2015-06-22 00:09:17.000000000 +0200
++++ live/liveMedia/TCPStreamSink.cpp	2015-06-22 11:01:32.669268927 +0200
 @@ -20,6 +20,9 @@
  
  #include "TCPStreamSink.hh"
- #include "RTSPCommon.hh" // for "ignoreSigPipeOnSocket()"
+ #include <GroupsockHelper.hh> // for "ignoreSigPipeOnSocket()"
 +#ifndef MSG_NOSIGNAL
 +# define MSG_NOSIGNAL 0
 +#endif
diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index 7057b8d..3d60fbd 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -1,7 +1,7 @@
 # live555
 
-#LIVEDOTCOM_URL := http://live555.com/liveMedia/public/live555-latest.tar.gz
-LIVE555_FILE := live.2014.07.25.tar.gz
+LIVE555_FILE := live.2015.06.24.tar.gz
+#LIVEDOTCOM_URL := http://live555.com/liveMedia/public/$(LIVE555_FILE)
 LIVEDOTCOM_URL := $(CONTRIB_VIDEOLAN)/live555/$(LIVE555_FILE)
 
 ifdef BUILD_NETWORK