Ticket #1590: patch1.diff

configure

@@ -2726 +2726 @@
   echo "Mac accel.       $mac_accel"
   echo "OpenGL vsync     $opengl_vsync"
   echo "DirectFB         $direct_fb"
-  if test x"$mingw32" = x"yes" -o x"$cygwin" = x"yes" ; then
+  if test x"$mingw32" = x"yes" -o x"$targetos" = x"CYGWIN" ; then
   echo "DirectX          $direct_x"
 fi
 echo
@@ -3174 +3174 @@
   echo "CONFIG_X264=yes" >> $MYTH_CONFIG_MAK
 fi
 
+if test x"$targetos" = x"CYGWIN" ; then
+  echo "#define CONFIG_CYGWIN 1" >> $TMPH
+  echo "#ifndef llrint" >> $TMPH
+  echo "#define llrint llrint  // make sure not to define twice" >> $TMPH
+  echo "static inline long long int llrint (double x)" >> $TMPH
+  echo "{" >> $TMPH
+  echo "    long long int llrintres;" >> $TMPH
+  echo "    asm" >> $TMPH
+  echo "    (\"fistpll %0\"" >> $TMPH
+  echo "    : \"=m\" (llrintres) : \"t\" (x) : \"st\");" >> $TMPH
+  echo "    return llrintres;" >> $TMPH
+  echo "}" >> $TMPH
+  echo "#endif" >> $TMPH
+fi
+
 if test "$mingw32" = "yes" ; then
   echo "#define CONFIG_MINGW 1" >> $TMPH
   echo "CONFIG_MINGW=yes" >> $MYTH_CONFIG_MAK

libs/libavcodec/libavcodec.pro

@@ -17 +17 @@
     QMAKE_CFLAGS_SHLIB = 
 }
 
+cygwin {
+    LIBS += -lz
+}
+
 QMAKE_CFLAGS_DEBUG += -O
 
 QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)

libs/libavformat/libavformat.pro

@@ -13 +13 @@
 
 LIBS += $$LOCAL_LIBDIR_X11
 
+cygwin {
+    LIBS += -lz
+}
+
 QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
 
 # Input

libs/libmyth/libmyth.pro

@@ -61 +61 @@
 inc.files += mythevent.h mythobservable.h mythsocket.h
 inc.files += mythexp.h mythpluginapi.h
 
+cygwin {
+    DEFINES += CONFIG_CYGWIN
+}
+
 using_oss {
     DEFINES += USING_OSS
     SOURCES += audiooutputoss.cpp

libs/libmyth/util.cpp

@@ -18 +18 @@
 #include <sys/sysinfo.h>
 #else
 #include <sys/param.h>
+#ifdef CONFIG_CYGWIN
+#include <sys/statfs.h>
+#else
 #include <sys/sysctl.h>
+#endif
 #include <sys/mount.h>
 #endif
 

settings.pro

@@ -7 +7 @@
 LIBVERSION = 0.20
 VERSION = 0.20.0
 
+# if CYGWIN compile, set up flag in CONFIG
+contains(TARGET_OS, CYGWIN) {
+   CONFIG += cygwin
+}
+
 # Die on the (common) case where OS X users inadvertently use Fink's
 # Qt/X11 install instead of Qt/Mac. '
 contains(CONFIG_DARWIN, yes) {