[vlc-commits] Contribs: update live555 to 2016.07.19

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Aug  5 18:19:22 2016 +0200| [8297724513df61423258c75d4b16a609a8a2eb2c] | committer: Jean-Baptiste Kempf

Contribs: update live555 to 2016.07.19

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8297724513df61423258c75d4b16a609a8a2eb2c
---

 contrib/src/live555/SHA512SUMS            |  2 +-
 contrib/src/live555/no-gettimeofday.patch | 33 -------------------------------
 contrib/src/live555/rules.mak             |  3 +--
 3 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/contrib/src/live555/SHA512SUMS b/contrib/src/live555/SHA512SUMS
index b2bda68..c8f7f0a 100644
--- a/contrib/src/live555/SHA512SUMS
+++ b/contrib/src/live555/SHA512SUMS
@@ -1 +1 @@
-813a38d3d2068658e377d8b4ad4431d34bce1126ec590ef5a65c4add44605ca0316397edb407d78be63ebd0e40fac149aec8f992e0ef721d95ba9c6fe2638ddd  live.2016.02.22.tar.gz
+b3209042dc53a5e4abd43bbd58f0f4599e694dd6ece92289dfa914dc5b35ecf6aa202f79e0eeaff45088007be2aa4df7b0cfc1c979e8a9caacc16952e41a27ce  live.2016.07.19.tar.gz
diff --git a/contrib/src/live555/no-gettimeofday.patch b/contrib/src/live555/no-gettimeofday.patch
index e614d06..c94c914 100644
--- a/contrib/src/live555/no-gettimeofday.patch
+++ b/contrib/src/live555/no-gettimeofday.patch
@@ -1,36 +1,3 @@
---- live555/groupsock/GroupsockHelper.cpp.orig	2016-03-30 21:07:02.538195751 +0200
-+++ live555/groupsock/GroupsockHelper.cpp	2016-03-30 21:07:23.286235570 +0200
-@@ -755,7 +755,7 @@
-   return (char const*)&timeString;
- }
- 
--#if defined(__WIN32__) || defined(_WIN32)
-+#if (defined(__WIN32__) || defined(_WIN32)) && !defined(__MINGW32__)
- // For Windoze, we need to implement our own gettimeofday()
- 
- // used to make sure that static variables in gettimeofday() aren't initialized simultaneously by multiple threads
---- live555/groupsock/include/GroupsockHelper.hh.orig	2016-03-31 10:11:32.734142022 +0200
-+++ live555/groupsock/include/GroupsockHelper.hh	2016-03-31 10:11:51.614092708 +0200
-@@ -130,7 +130,7 @@
- void reclaimGroupsockPriv(UsageEnvironment& env);
- 
- 
--#if defined(__WIN32__) || defined(_WIN32)
-+#if (defined(__WIN32__) || defined(_WIN32)) && !defined(__MINGW32__)
- // For Windoze, we need to implement our own gettimeofday()
- extern int gettimeofday(struct timeval*, int*);
- #endif
---- live555/groupsock/GroupsockHelper.cpp.orig	2016-03-31 10:16:23.765299784 +0200
-+++ live555/groupsock/GroupsockHelper.cpp	2016-03-31 10:17:00.701127166 +0200
-@@ -20,7 +20,7 @@
- 
- #include "GroupsockHelper.hh"
- 
--#if defined(__WIN32__) || defined(_WIN32)
-+#if (defined(__WIN32__) || defined(_WIN32)) && !defined(__MINGW32__)
- #include <time.h>
- extern "C" int initializeWinsockIfNecessary();
- #else
 --- live555/groupsock/GroupsockHelper.cpp.orig	2016-03-31 10:17:46.284928287 +0200
 +++ live555/groupsock/GroupsockHelper.cpp	2016-03-31 10:20:20.428341877 +0200
 @@ -27,6 +27,7 @@
diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index 55ef715..2c1c19c 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -1,6 +1,6 @@
 # live555
 
-LIVE555_FILE := live.2016.02.22.tar.gz
+LIVE555_FILE := live.2016.07.19.tar.gz
 LIVEDOTCOM_URL := http://live555.com/liveMedia/public/$(LIVE555_FILE)
 
 ifdef BUILD_NETWORK
@@ -53,7 +53,6 @@ ifdef HAVE_ANDROID
 	cd live && sed -e 's%-DPIC%-DPIC -DNO_SSTREAM=1 -DLOCALE_NOT_USED -I$(ANDROID_NDK)/platforms/$(ANDROID_API)/arch-$(PLATFORM_SHORT_ARCH)/usr/include%' -i.orig config.linux
 endif
 	cd live && patch -lfp1 < ../../src/live555/winstore.patch
-	cd live && patch -lfp1 < ../../src/live555/no-gettimeofday.patch
 	mv live $@
 	touch $@