Ticket #6533: r20511_win32.patch

File r20511_win32.patch, 5.9 KB (added by Jeff Lu <jll544@…>, 11 years ago)
  • libs/libmythdvdnav/dvdnav/dvdnav.h

     
    4141#include <dvdread/ifo_types.h> /* For vm_cmd_t */
    4242#include <dvdnav/dvdnav_events.h>
    4343
     44#include "compat.h"
    4445
    4546
    4647/*********************************************************************
  • libs/libmythdvdnav/dvdread/dvd_input.c

     
    5454#include <dlfcn.h>
    5555#else
    5656/* Only needed on MINGW at the moment */
    57 #include "../../msvc/contrib/dlfcn.c"
     57#include "compat.h"
    5858#endif
    5959
    6060typedef struct dvdcss_s *dvdcss_handle;
  • libs/libmythdvdnav/libmythdvdnav.pro

     
    99
    1010INCLUDEPATH += ../../
    1111INCLUDEPATH += ./dvdnav
     12INCLUDEPATH += ../libmythdb
    1213
    1314
    1415#build position independent code since the library is linked into a shared library
  • libs/libmythtv/util-opengl.h

     
    8282#define GL_FRAMEBUFFER_UNSUPPORTED_EXT    0x8CDD
    8383#endif
    8484
     85#ifndef GL_MAX_TEXTURE_UNITS
     86#define GL_MAX_TEXTURE_UNITS 0x84E2
     87#endif
     88
    8589#ifndef GL_PIXEL_UNPACK_BUFFER_ARB
    8690#define GL_PIXEL_UNPACK_BUFFER_ARB        0x88EC
    8791#endif
  • libs/libmythtv/channelscan/channelscan_sm.h

     
    3030#ifndef SISCAN_H
    3131#define SISCAN_H
    3232
     33// POSIX includes
     34#include <pthread.h>
     35
    3336// Qt includes
    3437#include <qobject.h>
    3538#include <qstring.h>
  • filters/kerneldeint/filter_kerneldeint.c

     
    4040{
    4141    int       ready;
    4242    pthread_t id;
     43    int       exists;
    4344};
    4445
    4546typedef struct ThisFilter
     
    525526    {
    526527        filter->kill_threads = 1;
    527528        for (i = 0; i < filter->requested_threads; i++)
    528             if (filter->threads[i].id != 0)
     529            if (filter->threads[i].exists)
    529530                pthread_join(filter->threads[i].id, NULL);
    530531        free(filter->threads);
    531532    }
     
    615616        {
    616617            if (pthread_create(&(filter->threads[i].id), NULL,
    617618                               KernelThread, (void*)filter) != 0)
    618                 filter->threads[i].id = 0;
     619                filter->threads[i].exists = 0;
    619620            else
     621            {
    620622                success++;
     623                filter->threads[i].exists = 1;
     624            }
    621625        }
    622626
    623627        if (success < filter->requested_threads)
     
    675679    },
    676680    FILT_NULL
    677681};
     682/* vim: set expandtab tabstop=4 shiftwidth=4: */
  • filters/kerneldeint/kerneldeint.pro

     
    77LIBS += -lmythdb-$${LIBVERSION} -L../../libs/libmythdb
    88macx:LIBS += -lmythui-$${LIBVERSION} -L../../libs/libmythui
    99macx:LIBS += -lmythupnp-$${LIBVERSION} -L../../libs/libmythupnp
     10mingw:LIBS += -lpthread
    1011
    1112# Input
    1213SOURCES += filter_kerneldeint.c
  • filters/yadif/filter_yadif.c

     
    5656{
    5757    int       ready;
    5858    pthread_t id;
     59    int       exists;
    5960};
    6061
    6162typedef struct ThisFilter
     
    545546    {
    546547        f->kill_threads = 1;
    547548        for (i = 0; i < f->requested_threads; i++)
    548             if (f->threads[i].id != 0)
     549            if (f->threads[i].exists)
    549550                pthread_join(f->threads[i].id, NULL);
    550551        free(f->threads);
    551552    }
     
    671672        {
    672673            if (pthread_create(&(filter->threads[i].id), NULL,
    673674                               YadifThread, (void*)filter) != 0)
    674                 filter->threads[i].id = 0;
     675                filter->threads[i].exists = 0;
    675676            else
     677            {
    676678                success++;
     679                filter->threads[i].exists = 1;
     680            }
    677681        }
    678682
    679683        if (success < filter->requested_threads)
  • filters/yadif/yadif.pro

     
    33
    44INCLUDEPATH += ../../libs/libmythtv ../../libs/libavcodec ../..
    55
     6mingw:LIBS += -lpthread
     7
    68# Input
    79SOURCES += filter_yadif.c
    810
  • programs/mythjobqueue/main.cpp

     
    22#include <sys/types.h>
    33#include <sys/stat.h>
    44#include <fcntl.h>
     5#include <signal.h>
    56
    67#include <iostream>
    78#include <fstream>
  • libs/libmyth/util.cpp

     
    13601360
    13611361bool IsPulseAudioRunning(void)
    13621362{
     1363#ifdef USING_MINGW
     1364    return false;
     1365#endif
    13631366#if defined(CONFIG_DARWIN) || (__FreeBSD__) || defined(__OpenBSD__)
    13641367    const char *command = "ps -ax | grep -i pulseaudio | grep -v grep > /dev/null";
    13651368#else