diff options
author | Lars Op den Kamp <lars@opdenkamp.eu> | 2012-11-15 02:17:17 +0100 |
---|---|---|
committer | Lars Op den Kamp <lars@opdenkamp.eu> | 2013-02-28 20:14:23 +0100 |
commit | 59171c7a030f8a9c913abbce931967a6a8ff6897 (patch) | |
tree | e8cc5774655fed8e13874fc847d1d9d4d0524a97 /configure.in | |
parent | 8d2e0fe0d3cd5592765910de545ff471c90cea8c (diff) |
[cec] get the CEC devices that are connected to the system from libCEC, rather than getting them from usb device scanning (or other methods). this way all adapters that libCEC supports are automatically supported by XBMC, without the need for specific device scanning code. bumped libCEC to 2.1.0
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 40 |
1 files changed, 2 insertions, 38 deletions
diff --git a/configure.in b/configure.in index b1769193bf..7837c2d6d9 100644 --- a/configure.in +++ b/configure.in @@ -159,8 +159,6 @@ libusb_disabled="== libusb disabled. Plug and play USB device support will not b libusb_disabled_udev_found="== libusb disabled. ==" libcec_enabled="== libcec enabled. ==" libcec_disabled="== libcec disabled. CEC adapter support will not be available. ==" -libcec_disabled_missing_libs="== libcec disabled because it either needs libudev, or libusb a compatible version of the RPi API. CEC adapter support will not be available. ==" -cec_rpi_api_missing="== no compatible RPi API found ==" # External library message strings external_libraries_enabled="== Use of all supported external libraries enabled. ==" @@ -1497,46 +1495,18 @@ fi # libcec USE_LIBCEC=0 -USE_CEC_RPI_API=0 -use_rpi_cec_api="auto" if test "x$use_libcec" != "xno"; then - case "${host_cpu}" in - arm*) - echo "will check for RPi support" - AC_CHECK_HEADER(interface/vmcs_host/vc_cec.h,,use_rpi_cec_api="no") - ;; - *) - echo "will not check for RPi support (unsupported cpu: ${host_cpu})" - use_rpi_cec_api="no" - ;; - esac - - # libcec needs libudev, libusb or the RPi API under linux, or the device will never be detected. - if test "$host_vendor" != "apple" && test "$use_libusb" = "no" && test "$use_libudev" = "no" && test "$use_rpi_cec_api" = "no"; then - if test "x$use_libcec" != "xauto"; then - AC_MSG_ERROR($libcec_disabled_missing_libs) - else - use_libcec="no" - AC_MSG_NOTICE($libcec_disabled_missing_libs) - fi - fi - # libcec is dyloaded, so we need to check for its headers and link any depends. if test "x$use_libcec" != "xno"; then if test "x$use_libcec" != "xauto"; then - PKG_CHECK_MODULES([CEC],[libcec >= 2.0.0],,[use_libcec="no";AC_MSG_ERROR($libcec_disabled)]) + PKG_CHECK_MODULES([CEC],[libcec >= 2.1.0],,[use_libcec="no";AC_MSG_ERROR($libcec_disabled)]) else - PKG_CHECK_MODULES([CEC],[libcec >= 2.0.0],,[use_libcec="no";AC_MSG_RESULT($libcec_disabled)]) + PKG_CHECK_MODULES([CEC],[libcec >= 2.1.0],,[use_libcec="no";AC_MSG_RESULT($libcec_disabled)]) fi if test "x$use_libcec" != "xno"; then INCLUDES="$INCLUDES $CEC_CFLAGS" USE_LIBCEC=1;AC_DEFINE([HAVE_LIBCEC],[1],["Define to 1 if libcec is installed"]) - if test "x$use_rpi_cec_api" != "xno"; then - LIBS+=" -lvcos -lvchiq_arm" - AC_DEFINE([HAVE_CEC_RPI_API],[1],["Define to 1 if the CEC RPi API is installed"]) - USE_CEC_RPI_API=1 - fi XB_FIND_SONAME([LIBCEC],[cec],[use_libcec]) AC_MSG_NOTICE($libcec_enabled) else @@ -2289,11 +2259,6 @@ fi if test "x$use_libcec" != "xno"; then final_message="$final_message\n libcec support:\tYes" - if test "x$use_rpi_cec_api" != "xno"; then - final_message="$final_message\n libcec RPi support:\tYes" - else - final_message="$final_message\n libcec RPi support:\tNo" - fi else final_message="$final_message\n libcec support:\tNo" fi @@ -2487,7 +2452,6 @@ AC_SUBST(USE_AIRTUNES) AC_SUBST(USE_LIBUDEV) AC_SUBST(USE_LIBUSB) AC_SUBST(USE_LIBCEC) -AC_SUBST(USE_CEC_RPI_API) AC_SUBST(USE_MYSQL) AC_SUBST(USE_WEB_SERVER) AC_SUBST(USE_UPNP) |