Ticket #10366: libcec_configure_f76910875f.patch

File libcec_configure_f76910875f.patch, 1.9 KB (added by mythtv@…, 9 years ago)
  • mythtv/configure

    diff --git a/mythtv/configure b/mythtv/configure
    index 31d1164..c3d95a2 100755
    a b Advanced options (experts only): 
    107107  --disable-joystick-menu  disable joystick menu
    108108  --disable-libcec         disable libCEC device support
    109109  --libcec-path=HDRLOC     location of directory containing
    110                            cec.h [$libcec_path_default]
     110                           'libcec/cec.h', not the directory
     111                           with 'cec.h' [$libcec_path_default]
    111112  --disable-firewire       disable support for FireWire cable boxes
    112113  --disable-iptv           disable support for recording RTSP/UDP/RTP streams
    113114  --disable-hdhomerun      disable support for HDHomeRun boxes
    disable indevs 
    20242025# mythtv paths
    20252026dvb_path_default="${sysroot}/usr/include"
    20262027x11_path_default="${sysroot}/usr/X11R6/include"
    2027 libcec_path_default="${sysroot}/usr/include/libcec"
     2028libcec_path_default="${sysroot}/usr/include"
    20282029libxml2_path_default="${sysroot}/usr/include/libxml2"
    20292030
    20302031# configurable options
    using namespace std; 
    41334134using namespace CEC;
    41344135#include <libcec/cecloader.h>
    41354136int main(void) {
    4136     if (CEC_LIB_VERSION_MAJOR < 1)
     4137    if (CEC_LIB_VERSION_MAJOR < 1 && CEC_LIB_VERSION_MINOR < 5)
    41374138        return 0;
    4138     return (long) LoadLibCec;
     4139    return (long) LibCecInit;
    41394140}
    41404141EOF
    41414142fi
  • mythtv/libs/libmythui/cecadapter.cpp

    diff --git a/mythtv/libs/libmythui/cecadapter.cpp b/mythtv/libs/libmythui/cecadapter.cpp
    index d8abfe6..edad8f6 100644
    a b  
    1818#define MAX_CEC_DEVICES 10
    1919#define LOC QString("CECAdapter: ")
    2020
    21 #include "cec.h"
    22 #include "cecc.h"
     21#include <libcec/cec.h>
    2322#include <iostream>
    2423using namespace CEC;
    2524using namespace std;
    26 #include "cecloader.h"
     25#include <libcec/cecloader.h>
    2726
    2827QMutex* CECAdapter::gLock = new QMutex(QMutex::Recursive);
    2928