Ticket #6597: 6597-hdhr-win32.2.patch

libs/libmythhdhomerun/libmythhdhomerun.pro

@@ -9 +9 @@
 target.path = $${LIBDIR}
 INSTALLS = target
 
+mingw:LIBS += -lws2_32 -liphlpapi -lpthread
+
 QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
 
 HEADERS += hdhomerun.h  hdhomerun_os.h  hdhomerun_types.h

libs/libmythhdhomerun/hdhomerun_os.h

@@ -23 +23 @@
 
 #if defined(__WINDOWS__)
 #define _WINSOCKAPI_
+// MinGW lacks wspiapi, so remove dependency by setting minimum WINVER to WinXP
+#define WINVER 0x0501
 #include <windows.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#include <wspiapi.h>
+//#include <wspiapi.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -78 +80 @@
 #endif
 
 typedef int bool_t;
+/* Use MinGW includes instead of these...
 typedef signed __int8 int8_t;
 typedef signed __int16 int16_t;
 typedef signed __int32 int32_t;
@@ -88 +91 @@
 typedef unsigned __int64 uint64_t;
 typedef HANDLE pthread_t;
 typedef HANDLE pthread_mutex_t;
+*/
+#include <stdint.h>
+#include <pthread.h>
 
+// Avoid #define conflicts by limiting scope to non-c++
+#ifndef __cplusplus
 #define socklen_t int
 #define close closesocket
 #define sock_getlasterror WSAGetLastError()
 #define sock_getlasterror_socktimeout (WSAGetLastError() == WSAETIMEDOUT)
-#define va_copy(x, y) x = y
+//#define va_copy(x, y) x = y
 #define atoll _atoi64
 #define strdup _strdup
 #define strcasecmp _stricmp
@@ -104 +112 @@
 #define sleep(sec) Sleep((sec)*1000)
 #define THREAD_FUNC_PREFIX DWORD WINAPI
 #define SIGPIPE SIGABRT
+#endif
 
 static inline uint64_t getcurrenttime(void)
 {
@@ -118 +127 @@
         return setsockopt(s, level, optname, (char *)&t, sizeof(t));
 }
 
+/* MythTV uses pthreads lib instead of these...
 static inline int pthread_create(pthread_t *tid, void *attr, LPTHREAD_START_ROUTINE start, void *arg)
 {
         *tid = CreateThread(NULL, 0, start, arg, 0, NULL);
@@ -154 +164 @@
 {
         ReleaseMutex(*mutex);
 }
+*/
 
 #else /* !defined(__WINDOWS__) */
 

libs/libmythtv/hdhrchannel.cpp

@@ -7 +7 @@
 // C includes
 #include <unistd.h>
 #include <sys/types.h>
+#ifndef USING_MINGW
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#endif
 #include <sys/time.h>
 #include <fcntl.h>
 

libs/libmythtv/hdhrrecorder.cpp

@@ -10 +10 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/types.h>
+#ifndef USING_MINGW
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#endif
 #include <sys/time.h>
 
 // C++ includes

libs/libmythtv/hdhrsignalmonitor.cpp

@@ -7 +7 @@
 #include <pthread.h>
 #include <fcntl.h>
 #include <unistd.h>
+#ifndef USING_MINGW
 #include <sys/select.h>
+#endif
 
 #include "mythcontext.h"
 #include "mythdbcon.h"

libs/libmythtv/libmythtv.pro

@@ -581 +581 @@
     SOURCES += videoout_d3d.cpp
 
     LIBS += -lpthread
+    LIBS += -lws2_32
 }
 
 # install headers required by mytharchive

libs/libmythtv/hdhrstreamhandler.cpp

@@ -4 +4 @@
 #include <pthread.h>
 #include <fcntl.h>
 #include <unistd.h>
+#ifndef USING_MINGW
 #include <sys/select.h>
 #include <sys/ioctl.h>
+#endif
 
 // Qt headers
 #include <QString>