From: Pierre Ynard <linkfanel@yahoo.fr>
Date: Wed, 11 Nov 2009 02:10:02 +0000 (+0100)
Subject: contrib: live555 for WinCE
X-Git-Tag: 1.1.0-ff~2518
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=9dcb37114f572ae16f022ed4dcfff47d9b02e198;p=vlc

contrib: live555 for WinCE
---

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 9c00911ab3..d6bc5c6701 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1204,11 +1204,17 @@ live: live555-$(LIVEDOTCOM_VERSION).tar.gz
 ifdef HAVE_WIN64
 	patch -p0 < Patches/live-win64.patch
 endif
+ifdef HAVE_WINCE
+	patch -p0 < Patches/live-wince.patch
+endif
 
 .live: live
 ifdef HAVE_WIN32
 	(cd $<;./genMakefiles mingw && make $(HOSTCC))
 else
+ifdef HAVE_WINCE
+	(cd $<;./genMakefiles mingw && make $(HOSTCC))
+else
 ifdef HAVE_DARWIN_OS
 	(cd $<; sed -e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' -e 's%cc%$(CC)%'  -e 's%c++%$(CXX)%' -i.orig  config.macosx)
 	(cd $<; ./genMakefiles macosx && make)
@@ -1223,6 +1229,7 @@ else
 	(cd $<; ./genMakefiles linux && make $(HOSTCC))
 endif
 endif
+endif
 endif
 	mkdir -p $(PREFIX)/lib $(PREFIX)/include
 	cp $</groupsock/libgroupsock.a $(PREFIX)/lib
diff --git a/extras/contrib/src/Patches/live-wince.patch b/extras/contrib/src/Patches/live-wince.patch
new file mode 100644
index 0000000000..ef03594738
--- /dev/null
+++ b/extras/contrib/src/Patches/live-wince.patch
@@ -0,0 +1,42 @@
+diff -urp live.orig/groupsock/GroupsockHelper.cpp live/groupsock/GroupsockHelper.cpp
+--- live.orig/groupsock/GroupsockHelper.cpp	2009-09-28 17:16:16.000000000 +0200
++++ live/groupsock/GroupsockHelper.cpp	2009-11-11 01:10:28.000000000 +0100
+@@ -728,7 +728,7 @@ char const* timestampString() {
+ int gettimeofday(struct timeval* tp, int* /*tz*/) {
+ #if defined(_WIN32_WCE)
+   /* FILETIME of Jan 1 1970 00:00:00. */
+-  static const unsigned __int64 epoch = 116444736000000000L;
++  static const unsigned __int64 epoch = 116444736000000000LL;
+ 
+   FILETIME    file_time;
+   SYSTEMTIME  system_time;
+diff -urp live.orig/liveMedia/InputFile.cpp live/liveMedia/InputFile.cpp
+--- live.orig/liveMedia/InputFile.cpp	2009-09-28 17:16:16.000000000 +0200
++++ live/liveMedia/InputFile.cpp	2009-11-11 01:06:45.000000000 +0100
+@@ -35,7 +35,7 @@ FILE* OpenInputFile(UsageEnvironment& en
+   // Check for a special case file name: "stdin"
+   if (strcmp(fileName, "stdin") == 0) {
+     fid = stdin;
+-#if defined(__WIN32__) || defined(_WIN32)
++#if (defined(__WIN32__) || defined(_WIN32)) && !defined(_WIN32_WCE)
+     _setmode(_fileno(stdin), _O_BINARY); // convert to binary mode
+ #endif
+   } else {
+diff -urp live.orig/liveMedia/OutputFile.cpp live/liveMedia/OutputFile.cpp
+--- live.orig/liveMedia/OutputFile.cpp	2009-09-28 17:16:16.000000000 +0200
++++ live/liveMedia/OutputFile.cpp	2009-11-11 01:07:50.000000000 +0100
+@@ -35,12 +35,12 @@ FILE* OpenOutputFile(UsageEnvironment& e
+   // Check for special case 'file names': "stdout" and "stderr"
+   if (strcmp(fileName, "stdout") == 0) {
+     fid = stdout;
+-#if defined(__WIN32__) || defined(_WIN32)
++#if (defined(__WIN32__) || defined(_WIN32)) && !defined(_WIN32_WCE)
+     _setmode(_fileno(stdout), _O_BINARY);       // convert to binary mode
+ #endif
+   } else if (strcmp(fileName, "stderr") == 0) {
+     fid = stderr;
+-#if defined(__WIN32__) || defined(_WIN32)
++#if (defined(__WIN32__) || defined(_WIN32)) && !defined(_WIN32_WCE)
+     _setmode(_fileno(stderr), _O_BINARY);       // convert to binary mode
+ #endif
+   } else {