Ticket #9653: libmythtv.diff

File libmythtv.diff, 3.4 KB (added by Lawrence Rust <lvr@…>, 15 years ago)

  • mythtv/libs/libmythtv/libmythtv.pro 

    # For x-compile MacOSX 10.3 and 10.4
diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
index 9635faf..3d26e0a 100644
    QMAKE_LFLAGS_SHLIB += $${FREETYPE_LIBS}  
    8787
    8888macx {
    8989    # Mac OS X Frameworks
    90     FWKS = AGL ApplicationServices Carbon Cocoa CoreFoundation CoreVideo OpenGL QuickTime IOKit
     90    FWKS = AGL ApplicationServices Carbon Cocoa CoreFoundation OpenGL QuickTime IOKit
     91    using_quartz_video {
     92        FWKS += QuartzCore
     93    } else {
     94        FWKS += CoreVideo
     95    }
    9196
    9297    using_firewire:using_backend: FWKS += IOKit
    9398

  • mythtv/libs/libmythtv/privatedecoder_vda.cpp 

    diff --git a/mythtv/libs/libmythtv/privatedecoder_vda.cpp b/mythtv/libs/libmythtv/privatedecoder_vda.cpp
index be26f03..0414042 100644
     
    99#include "myth_imgconvert.h"
    1010#include "util-osx-cocoa.h"
    1111#include "privatedecoder_vda.h"
     12#ifdef USING_QUARTZ_VIDEO
     13#undef CodecType
     14#import  "QuickTime/ImageCompression.h"
     15#endif
    1216
    1317extern "C" {
    1418#include "libavformat/avformat.h"
    … … bool PrivateDecoderVDA::Init(const QString &decoder,  
    191195        CFDictionaryCreateMutable(kCFAllocatorDefault, 1,
    192196                                  &kCFTypeDictionaryKeyCallBacks,
    193197                                  &kCFTypeDictionaryValueCallBacks);
     198#ifdef USING_QUARTZ_VIDEO
     199    OSType cvPixelFormatType = k422YpCbCr8PixelFormat;
     200#else
    194201    OSType cvPixelFormatType = kCVPixelFormatType_422YpCbCr8;
     202#endif
    195203    CFNumberRef pixelFormat  = CFNumberCreate(kCFAllocatorDefault,
    196204                                              kCFNumberSInt32Type,
    197205                                              &cvPixelFormatType);

  • mythtv/libs/libmythtv/privatedecoder_vda.h 

    diff --git a/mythtv/libs/libmythtv/privatedecoder_vda.h b/mythtv/libs/libmythtv/privatedecoder_vda.h
index cbb500b..eb79cc4 100644
     
    66#include <QList>
    77
    88#import  "CoreFoundation/CoreFoundation.h"
     9#ifdef USING_QUARTZ_VIDEO
     10#import  "QuartzCore/CoreVideo.h"
     11#else
    912#import  "CoreVideo/CoreVideo.h"
     13#endif
    1014#include "privatedecoder_vda_defs.h"
    1115#include "privatedecoder.h"
    1216

  • mythtv/libs/libmythtv/videoout_quartz.cpp 

    diff --git a/mythtv/libs/libmythtv/videoout_quartz.cpp b/mythtv/libs/libmythtv/videoout_quartz.cpp
index 3485b26..710361f 100644
    using namespace std;  
    5151
    5252#include "util-osx.h"
    5353
     54#ifdef USING_QUARTZ_VIDEO
     55#import <QuartzCore/CoreVideo.h>
     56#else
    5457#import <CoreGraphics/CGBase.h>
    5558#import <CoreGraphics/CGDisplayConfiguration.h>
    5659#import <CoreGraphics/CGImage.h>
     60#endif
    5761#import <Carbon/Carbon.h>
    5862#import <QuickTime/QuickTime.h>
    5963

  • mythtv/libs/libmythtv/bswap.h 

    diff --git a/mythtv/libs/libmythtv/bswap.h b/mythtv/libs/libmythtv/bswap.h
index 6683c46..4856de9 100644
     
    22#define MYTHTV_BSWAP_H
    33
    44#include <stdint.h> /* uint32_t */
    5 #include <byteswap.h> /* bswap_16|32|64 */
     5
     6#ifdef __linux__
     7#  include <byteswap.h> /* bswap_16|32|64 */
     8#elif defined __APPLE__
     9#  include <libkern/OSByteOrder.h>
     10#  define bswap_16(x) OSSwapInt16(x)
     11#  define bswap_32(x) OSSwapInt32(x)
     12#  define bswap_64(x) OSSwapInt64(x)
     13#else
     14#  error Byte swapping functions not defined for this platform
     15#endif
    616
    717static __inline__ double bswap_dbl(double x)
    818{