Ticket #10716: 0001-enable-compilation-on-mingw32-w64-64-bit-mingw.patch

mythtv/filters/greedyhdeint/mangle.h

@@ -9 +9 @@
 
 /* Feel free to add more to the list, eg. a.out IMO */
 /* Use rip-relative addressing if compiling PIC code on x86-64. */
-#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__OS2__) || \
+#if defined(__CYGWIN__) || defined(__MINGW32__) && !defined(_WIN64) || defined(__OS2__) || \
     CONFIG_DARWIN || (defined(__OpenBSD__) && !defined(__ELF__))
 #if ARCH_X86_64 && defined(PIC)
 #define MANGLE(a) "_" #a"(%%rip)"

mythtv/filters/linearblend/filter_linearblend.c

@@ -82 +82 @@
        PAVGB(%%mm1, %%mm2)                                   // 2L8 + L7 + L9
        "movq %%mm2, (%%"REG_d", %1, 2)                     \n\t"
 
-       : : "r" (src), "r" ((long)stride)
+       : : "r" (src), "r" ((intptr_t)stride)
        : "%"REG_a, "%"REG_d
     );
 }
@@ -129 +129 @@
        PAVGUSB(%%mm1, %%mm2)                                 // 2L8 + L7 + L9
        "movq %%mm2, (%%"REG_d", %1, 2)                     \n\t"
 
-       : : "r" (src), "r" ((long)stride)
+       : : "r" (src), "r" ((intptr_t)stride)
        : "%"REG_a, "%"REG_d
     );
 }

mythtv/filters/yadif/aclib_template.c

@@ -78 +78 @@
 /* for small memory blocks (<256 bytes) this version is faster */
 #define small_memcpy(to,from,n)\
 {\
-register unsigned long int dummy;\
+register uintptr_t dummy;\
 __asm__ __volatile__(\
         "rep; movsb"\
         :"=&D"(to), "=&S"(from), "=&c"(dummy)\
@@ -165 +165 @@
 #endif
         if (len >= MIN_LEN)
         {
-          register unsigned long int delta;
+          register uintptr_t delta;
           /* Align destinition to MMREG_SIZE -boundary */
-          delta = ((unsigned long int)to)&(MMREG_SIZE-1);
+          delta = ((uintptr_t)to)&(MMREG_SIZE-1);
           if (delta)
           {
             delta=MMREG_SIZE-delta;
@@ -186 +186 @@
            processor's decoders, but it's not always possible.
         */
 #ifdef HAVE_SSE /* Only P3 (may be Cyrix3) */
-        if (((unsigned long)from) & 15)
+        if (((uintptr_t)from) & 15)
         /* if SRC is misaligned */
         for (; i>0; i--)
         {
@@ -231 +231 @@
         }
 #else
         // Align destination at BLOCK_SIZE boundary
-        for (; ((long)to & (BLOCK_SIZE-1)) && i>0; i--)
+        for (; ((intptr_t)to & (BLOCK_SIZE-1)) && i>0; i--)
         {
                 __asm__ __volatile__ (
 #ifndef HAVE_ONLY_MMX1
@@ -318 +318 @@
                         " jae 1b                \n\t"
       MOVX" %6, %%"REG_b" \n\t"
                                 : "+r" (from), "+r" (to), "+r" (i)
-                                : "r" ((long)BLOCK_SIZE), "i" (BLOCK_SIZE/64), "i" ((long)CONFUSION_FACTOR), "m" (oldbx)
+                                : "r" ((intptr_t)BLOCK_SIZE), "i" (BLOCK_SIZE/64), "i" ((intptr_t)CONFUSION_FACTOR), "m" (oldbx)
                                 : "%"REG_a, "memory"
                 );
 

mythtv/filters/yadif/filter_yadif.c

@@ -352 +352 @@
             :[prev] "r"(prev),\
              [cur]  "r"(cur),\
              [next] "r"(next),\
-             [prefs]"r"((long)refs),\
-             [mrefs]"r"((long)-refs),\
+             [prefs]"r"((intptr_t)refs),\
+             [mrefs]"r"((intptr_t)-refs),\
              [pw1]  "m"(pw_1),\
              [pb1]  "m"(pb_1),\
              [mode] "g"(mode)\

mythtv/libs/libmyth/audio/audiooutputbase.cpp

@@ -26 +26 @@
 #define RPOS audiobuffer + raud
 #define ABUF audiobuffer
 #define STST soundtouch::SAMPLETYPE
+#ifdef _WIN64
+#define AOALIGN(x) (((long long)&x + 15) & ~0xf);
+#else
 #define AOALIGN(x) (((long)&x + 15) & ~0xf);
+#endif
 
 // 1,2,5 and 7 channels are currently valid for upmixing if required
 #define UPMIX_CHANNEL_MASK ((1<<1)|(1<<2)|(1<<5)|1<<7)

mythtv/libs/libmyth/audio/audiooutpututil.cpp

@@ -140 +140 @@
     float f = (1<<7) - 1;
 
 #if ARCH_X86
-    if (sse_check() && len >= 16 && ((unsigned long)out & 0xf) == 0)
+    if (sse_check() && len >= 16 && ((uintptr_t)out & 0xf) == 0)
     {
         int loops = len >> 4;
         i = loops << 4;
@@ -245 +245 @@
     float f = (1<<15) - 1;
 
 #if ARCH_X86
-    if (sse_check() && len >= 16 && ((unsigned long)out & 0xf) == 0)
+    if (sse_check() && len >= 16 && ((uintptr_t)out & 0xf) == 0)
     {
         int loops = len >> 4;
         i = loops << 4;
@@ -352 +352 @@
         shift = 0;
 
 #if ARCH_X86
-    if (sse_check() && len >= 16 && ((unsigned long)out & 0xf) == 0)
+    if (sse_check() && len >= 16 && ((uintptr_t)out & 0xf) == 0)
     {
         float o = 1, mo = -1;
         int loops = len >> 4;
@@ -417 +417 @@
     int i = 0;
 
 #if ARCH_X86
-    if (sse_check() && len >= 16 && ((unsigned long)in & 0xf) == 0)
+    if (sse_check() && len >= 16 && ((uintptr_t)in & 0xf) == 0)
     {
         int loops = len >> 4;
         float o = 1, mo = -1;

mythtv/libs/libmyth/audio/audiooutputwin.cpp

@@ -218 +218 @@
 
     MMRESULT mmr = waveOutOpen(&m_priv->m_hWaveOut, WAVE_MAPPER,
                                (WAVEFORMATEX *)&wf,
-                               (DWORD)AudioOutputWinPrivate::waveOutProc,
-                               (DWORD)this, CALLBACK_FUNCTION);
+                               (DWORD_PTR)AudioOutputWinPrivate::waveOutProc,
+                               (DWORD_PTR)this, CALLBACK_FUNCTION);
 
     if (mmr == WAVERR_BADFORMAT)
     {

mythtv/libs/libmythbase/compat.h

@@ -202 +202 @@
 
 #ifdef USING_MINGW
 #define mkfifo(path, mode) \
-    (int)CreateNamedPipeA(path, PIPE_ACCESS_DUPLEX | WRITE_DAC, \
+    (intptr_t)CreateNamedPipeA(path, PIPE_ACCESS_DUPLEX | WRITE_DAC, \
                           PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, \
                           1024, 1024, 10000, NULL)
 #endif // USING_MINGW

mythtv/libs/libmythbluray/file/filesystem.h

@@ -40 +40 @@
     int64_t (*seek)(BD_FILE_H *file, int64_t offset, int32_t origin);
     int64_t (*tell)(BD_FILE_H *file);
     int (*eof)(BD_FILE_H *file);
-    int (*stat)(BD_FILE_H *file, struct stat *buf);
+    #ifdef _WIN64
+        int (*_stat64)(BD_FILE_H *file, struct stat *buf);//not sure if this is just my mingw32-w64 install or not
+    #else
+        int (*stat)(BD_FILE_H *file, struct stat *buf);
+    #endif
     int64_t (*read)(BD_FILE_H *file, uint8_t *buf, int64_t size);
     int64_t (*write)(BD_FILE_H *file, const uint8_t *buf, int64_t size);
 };

mythtv/libs/libmythsoundtouch/FIFOSampleBuffer.cpp

@@ -171 +171 @@
         {
             throw std::runtime_error("Couldn't allocate memory!\n");
         }
-        temp = (SAMPLETYPE *)(((ulong)tempUnaligned + 15) & -16);
+        temp = (SAMPLETYPE *)(((intptr_t)tempUnaligned + 15) & -16);
         memcpy(temp, ptrBegin(), samplesInBuffer * channels * sizeof(SAMPLETYPE));
         delete[] bufferUnaligned;
         buffer = temp;

mythtv/libs/libmythsoundtouch/TDStretch.cpp

@@ -781 +781 @@
 
         pRefMidBufferUnaligned = new SAMPLETYPE[midBufferLength + 16 / sizeof(SAMPLETYPE)];
         // ensure that 'pRefMidBuffer' is aligned to 16 byte boundary for efficiency
-        pRefMidBuffer = (SAMPLETYPE *)((((ulong)pRefMidBufferUnaligned) + 15) & -16);
+        pRefMidBuffer = (SAMPLETYPE *)((((intptr_t)pRefMidBufferUnaligned) + 15) & -16);
     }
 }
 

mythtv/libs/libmythsoundtouch/cpu_detect_x86_gcc.cpp

@@ -95 +95 @@
     int rval = 0;
     int eax, ebx, ecx, edx;
     int max_std_level, max_ext_level, std_caps=0, ext_caps=0;
-    long a, c;
+    intptr_t a, c;
 
     __asm__ __volatile__ (
                           /* See if CPUID instruction is supported ... */

mythtv/libs/libmythsoundtouch/sse_gcc.cpp

@@ -11 +11 @@
 {
     double corr = 0;
     int count = overlapLength * channels;
-    int loops = count >> 4;
+    #ifdef _WIN64
+        intptr_t loops = count >> 4;
+    #else 
+        int loops = count >> 4;
+    #endif
     int i = loops << 4;
     const float *mp = mPos;
     const float *cp = cPos;
@@ -53 +57 @@
 {
     double corr = 0;
     int count = overlapLength * channels;
-    int loops = count >> 4;
+    #ifdef _WIN64
+        intptr_t loops = count >> 4;
+    #else 
+        int loops = count >> 4;
+    #endif
     int i = loops << 4;
     const float *mp = mPos;
     const float *cp = cPos;
@@ -99 +107 @@
 {
     double corr = 0;
     int count = overlapLength <<1;
-    int loops = count >> 4;
+    #ifdef _WIN64
+        intptr_t loops = count >> 4;
+    #else 
+        int loops = count >> 4;
+    #endif
     int i = loops << 4;
+    
     const float *mp = mPos;
     const float *cp = cPos;
 
@@ -141 +154 @@
 {
     double corr = 0;
     int count = overlapLength <<1;
-    int loops = count >> 4;
+    #ifdef _WIN64
+        intptr_t loops = count >> 4;
+    #else 
+        int loops = count >> 4;
+    #endif
     int i = loops << 4;
     const float *mp = mPos;
     const float *cp = cPos;
@@ -220 +237 @@
             "sub        $1,     %%ecx       \n\t"
             "jnz        1b                  \n\t"
             :
-            :"c"(overlapLength),"r"(i),"r"(m),"r"(o),"r"((long)channels)
+            :"c"(overlapLength),"r"(i),"r"(m),"r"(o),"r"((intptr_t)channels)
         );
     else
         __asm__ volatile (
@@ -258 +275 @@
             "sub        $1,     %%ecx       \n\t"
             "jnz        1b                  \n\t"
             :
-            :"c"(overlapLength),"r"(i),"r"(m),"r"(o),"r"((long)channels)
+            :"c"(overlapLength),"r"(i),"r"(m),"r"(o),"r"((intptr_t)channels)
         );
 }
 
@@ -325 +342 @@
     // Ensure that filter coeffs array is aligned to 16-byte boundary
     delete[] filterCoeffsUnalign;
     filterCoeffsUnalign = new float[2 * newLen + 16];
-    filterCoeffsAlign = (float *)(((ulong)filterCoeffsUnalign + 15) & -16);
+    filterCoeffsAlign = (float *)(((uintptr_t)filterCoeffsUnalign + 15) & -16);
 
     float fdiv = (float)resultDivider;
 

mythtv/libs/libmythtv/RTjpegN.cpp

@@ -2727 +2727 @@
 
     if (key_rate > 0)
     {
-        unsigned long tmp;
+        uintptr_t tmp;
         if (old)
             delete [] old_start;
         old_start = new int16_t[((4*width*height)+32)];
 
-        tmp = (unsigned long)old_start;
+        tmp = (uintptr_t)old_start;
         tmp += 32;
         tmp = tmp>>5;
 
@@ -2749 +2749 @@
 
 int RTjpeg::SetIntra(int *key, int *lm, int *cm)
 {
-    unsigned long tmp;
+    uintptr_t tmp;
 
     if (*key < 0)
         *key = 0;
@@ -2777 +2777 @@
     if (old)
         delete [] old_start;
     old_start = new int16_t[((4*width*height)+32)];
-    tmp = (unsigned long)old_start;
+    tmp = (uintptr_t)old_start;
     tmp += 32;
     tmp = tmp >> 5;
     old = (int16_t *)(tmp << 5);

mythtv/libs/libmythtv/nuppeldecoder.cpp

@@ -56 +56 @@
     memset(&extradata, 0, sizeof(extendeddata));
     memset(&tmppicture, 0, sizeof(AVPicture));
     planes[0] = planes[1] = planes[2] = 0;
-    audioSamples = (short int*) (((long)audioSamples_buf + 15) & ~0xf);
+    audioSamples = (short int*) (((intptr_t)audioSamples_buf + 15) & ~0xf);
     memset(audioSamples, 0, AVCODEC_MAX_AUDIO_FRAME_SIZE * sizeof(short int));
 
     // set parent class variables
@@ -615 +615 @@
 
     buf = new unsigned char[video_size];
     strm_buf = new unsigned char[video_size * 2 + 16];
-    strm = (unsigned char*) (((long)strm_buf + 15) & ~0xf);
+    strm = (unsigned char*) (((intptr_t)strm_buf + 15) & ~0xf);
 
     if (hasFullPositionMap)
         return 1;

mythtv/libs/libmythtv/signalmonitor.cpp

@@ -167 +167 @@
     {
         LOG(VB_GENERAL, LOG_ERR,
             QString("Failed to create signal monitor in Init(%1, %2, 0x%3)")
-                .arg(cardtype).arg(db_cardnum).arg((long)channel,0,16));
+                .arg(cardtype).arg(db_cardnum).arg((intptr_t)channel,0,16));
     }
 
     return signalMonitor;

mythtv/programs/mythfrontend/audiogeneralsettings.cpp

@@ -621 +621 @@
     if (m_audioOutput)
     {
         char *frames_in = new char[m_channels * 1024 * sizeof(int32_t) + 15];
-        char *frames = (char *)(((long)frames_in + 15) & ~0xf);
+        char *frames = (char *)(((intptr_t)frames_in + 15) & ~0xf);
 
         m_audioOutput->Pause(false);