Permalink
Browse files

Fix libcec configure to work with v1.5

The detection code contained within the mythtv/configure script is mismatched
to the implementation code contained within libs/libmythui/cecadapter.cpp.

The configure script also checks for the deprecated LoadLibCec() function,
which has been removed from libcec version 1.5 whereas
libs/libmythui/cecadapter.cpp has already been switched to use the new
LibCecInit() function.

Increases the minimum version of libcec to 1.5.

Fixes #10366

Signed-off-by: Gavin Hurlbut <ghurlbut@mythtv.org>
  • Loading branch information...
1 parent f16048b commit 20d6852d905476a0cae3587db04e13a2a33bddbf Peter Stokes committed with Beirdo Mar 2, 2012
Showing with 7 additions and 7 deletions.
  1. +5 −4 mythtv/configure
  2. +2 −3 mythtv/libs/libmythui/cecadapter.cpp
View
@@ -107,7 +107,8 @@ Advanced options (experts only):
--disable-joystick-menu disable joystick menu
--disable-libcec disable libCEC device support
--libcec-path=HDRLOC location of directory containing
- cec.h [$libcec_path_default]
+ 'libcec/cec.h', not the directory
+ with 'cec.h' [$libcec_path_default]
--disable-firewire disable support for FireWire cable boxes
--disable-iptv disable support for recording RTSP/UDP/RTP streams
--disable-hdhomerun disable support for HDHomeRun boxes
@@ -2024,7 +2025,7 @@ disable indevs
# mythtv paths
dvb_path_default="${sysroot}/usr/include"
x11_path_default="${sysroot}/usr/X11R6/include"
-libcec_path_default="${sysroot}/usr/include/libcec"
+libcec_path_default="${sysroot}/usr/include"
libxml2_path_default="${sysroot}/usr/include/libxml2"
# configurable options
@@ -4138,9 +4139,9 @@ using namespace std;
using namespace CEC;
#include <libcec/cecloader.h>
int main(void) {
- if (CEC_LIB_VERSION_MAJOR < 1)
+ if (CEC_LIB_VERSION_MAJOR < 1 && CEC_LIB_VERSION_MINOR < 5)
return 0;
- return (long) LoadLibCec;
+ return (long) LibCecInit;
}
EOF
fi
@@ -18,12 +18,11 @@
#define MAX_CEC_DEVICES 10
#define LOC QString("CECAdapter: ")
-#include "cec.h"
-#include "cecc.h"
+#include <libcec/cec.h>
#include <iostream>
using namespace CEC;
using namespace std;
-#include "cecloader.h"
+#include <libcec/cecloader.h>
QMutex* CECAdapter::gLock = new QMutex(QMutex::Recursive);

0 comments on commit 20d6852

Please sign in to comment.