Skip to content
Snippets Groups Projects
Commit 82977245 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Contribs: update live555 to 2016.07.19

parent 4919758a
No related branches found
No related tags found
No related merge requests found
813a38d3d2068658e377d8b4ad4431d34bce1126ec590ef5a65c4add44605ca0316397edb407d78be63ebd0e40fac149aec8f992e0ef721d95ba9c6fe2638ddd live.2016.02.22.tar.gz
b3209042dc53a5e4abd43bbd58f0f4599e694dd6ece92289dfa914dc5b35ecf6aa202f79e0eeaff45088007be2aa4df7b0cfc1c979e8a9caacc16952e41a27ce live.2016.07.19.tar.gz
--- 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 @@
......
# 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 $@
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment