mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
libcec: update to libcec-3.0.0
This commit is contained in:
parent
678af3f01f
commit
7ad4458244
@ -17,46 +17,49 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="libcec"
|
PKG_NAME="libcec"
|
||||||
PKG_VERSION="2.2.0"
|
PKG_VERSION="3.0.0"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="http://libcec.pulse-eight.com/"
|
PKG_SITE="http://libcec.pulse-eight.com/"
|
||||||
PKG_URL="http://mirrors.xbmc.org/build-deps/sources/$PKG_NAME-$PKG_VERSION-3.tar.gz"
|
PKG_URL="http://mirrors.xbmc.org/build-deps/sources/$PKG_NAME-$PKG_VERSION-6.tar.gz"
|
||||||
PKG_DEPENDS_TARGET="toolchain systemd lockdev"
|
PKG_DEPENDS_TARGET="toolchain systemd lockdev platform"
|
||||||
PKG_PRIORITY="optional"
|
PKG_PRIORITY="optional"
|
||||||
PKG_SECTION="system"
|
PKG_SECTION="system"
|
||||||
PKG_SHORTDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor"
|
PKG_SHORTDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor"
|
||||||
PKG_LONGDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor."
|
PKG_LONGDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor."
|
||||||
|
|
||||||
PKG_IS_ADDON="no"
|
PKG_IS_ADDON="no"
|
||||||
PKG_AUTORECONF="yes"
|
PKG_AUTORECONF="no"
|
||||||
|
|
||||||
PKG_CONFIGURE_OPTS_TARGET="--disable-cubox --disable-exynos"
|
|
||||||
|
|
||||||
if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then
|
if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then
|
||||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver"
|
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver"
|
||||||
|
|
||||||
export CFLAGS="$CFLAGS \
|
|
||||||
-I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \
|
|
||||||
-I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux"
|
|
||||||
export CXXFLAGS="$CXXFLAGS \
|
|
||||||
-I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \
|
|
||||||
-I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux"
|
|
||||||
|
|
||||||
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-rpi \
|
|
||||||
--with-rpi-include-path=$SYSROOT_PREFIX/usr/include \
|
|
||||||
--with-rpi-lib-path=$SYSROOT_PREFIX/usr/lib"
|
|
||||||
else
|
|
||||||
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-rpi"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$KODIPLAYER_DRIVER" = "libfslvpuwrap" ]; then
|
if [ "$KODIPLAYER_DRIVER" = "libfslvpuwrap" ]; then
|
||||||
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-imx6"
|
EXTRA_CMAKE_OPTS="-DHAVE_IMX_API=1"
|
||||||
else
|
else
|
||||||
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-imx6"
|
EXTRA_CMAKE_OPTS="-DHAVE_IMX_API=0"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
configure_target() {
|
||||||
|
if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then
|
||||||
|
export CXXFLAGS="$CXXFLAGS \
|
||||||
|
-I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads/ \
|
||||||
|
-I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux"
|
||||||
|
|
||||||
# dont use some optimizations because of build problems
|
# detecting RPi support fails without -lvchiq_arm
|
||||||
export LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
|
export LDFLAGS="$LDFLAGS -lvchiq_arm"
|
||||||
|
fi
|
||||||
|
|
||||||
|
cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
|
||||||
|
-DBUILD_SHARED_LIBS=1 \
|
||||||
|
-DSKIP_PYTHON_WRAPPER:STRING=1 \
|
||||||
|
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||||
|
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
|
||||||
|
-DCMAKE_INSTALL_LIBDIR_NOARCH=/usr/lib \
|
||||||
|
-DCMAKE_INSTALL_PREFIX_TOOLCHAIN=$SYSROOT_PREFIX/usr \
|
||||||
|
-DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
|
||||||
|
$EXTRA_CMAKE_OPTS \
|
||||||
|
..
|
||||||
|
}
|
||||||
|
@ -1,43 +1,33 @@
|
|||||||
diff -Naur libcec-2.2.0/configure.ac libcec-2.2.0.patch/configure.ac
|
From a7f3315333c1a79259a763c6542a6cd71855b357 Mon Sep 17 00:00:00 2001
|
||||||
--- libcec-2.2.0/configure.ac 2014-11-01 01:51:37.000000000 +0100
|
From: Stefan Saraev <stefan@saraev.ca>
|
||||||
+++ libcec-2.2.0.patch/configure.ac 2014-11-10 23:14:45.210162950 +0100
|
Date: Thu, 7 May 2015 11:35:04 +0300
|
||||||
@@ -100,6 +100,14 @@
|
Subject: [PATCH] imx support
|
||||||
esac
|
|
||||||
fi
|
note. I am NOT the author of the patch. just rebased it
|
||||||
|
---
|
||||||
+## i.MX6 support
|
include/cectypes.h | 14 +-
|
||||||
+AC_ARG_ENABLE([imx6],
|
src/libcec/CECTypeUtils.h | 2 +
|
||||||
+ [AS_HELP_STRING([--enable-imx6],
|
src/libcec/adapter/AdapterFactory.cpp | 29 +-
|
||||||
+ [enable support for freescale i.MX6 (default is no)])],
|
src/libcec/adapter/IMX/AdapterMessageQueue.h | 134 +++++++++
|
||||||
+ [use_imx6=$enableval],
|
.../adapter/IMX/IMXCECAdapterCommunication.cpp | 328 +++++++++++++++++++++
|
||||||
+ [use_imx6=no])
|
.../adapter/IMX/IMXCECAdapterCommunication.h | 119 ++++++++
|
||||||
+
|
src/libcec/adapter/IMX/IMXCECAdapterDetection.cpp | 42 +++
|
||||||
+
|
src/libcec/adapter/IMX/IMXCECAdapterDetection.h | 36 +++
|
||||||
## add the top dir and include to the include path, so we can include config.h and cec.h
|
src/libcec/cmake/CheckPlatformSupport.cmake | 10 +
|
||||||
CPPFLAGS="$CPPFLAGS -I\$(abs_top_srcdir)/src -I\$(abs_top_srcdir)/include"
|
src/libcec/cmake/DisplayPlatformSupport.cmake | 6 +
|
||||||
|
src/libcec/env.h.in | 3 +
|
||||||
@@ -306,6 +314,17 @@
|
11 files changed, 720 insertions(+), 3 deletions(-)
|
||||||
fi
|
create mode 100644 src/libcec/adapter/IMX/AdapterMessageQueue.h
|
||||||
|
create mode 100644 src/libcec/adapter/IMX/IMXCECAdapterCommunication.cpp
|
||||||
|
create mode 100644 src/libcec/adapter/IMX/IMXCECAdapterCommunication.h
|
||||||
+## mark i.MX6 support as available
|
create mode 100644 src/libcec/adapter/IMX/IMXCECAdapterDetection.cpp
|
||||||
+if test "x$use_imx6" != "xno"; then
|
create mode 100644 src/libcec/adapter/IMX/IMXCECAdapterDetection.h
|
||||||
+ AC_DEFINE([HAVE_IMX_API],[1],[Define to 1 to include i.MX6 support])
|
|
||||||
+ AM_CONDITIONAL(USE_IMX_API, true)
|
diff --git a/include/cectypes.h b/include/cectypes.h
|
||||||
+ features="$features\n i.MX6 support :\t\t\tyes"
|
index acff259..0cfee8c 100644
|
||||||
+ LIB_INFO="$LIB_INFO 'i.MX6'"
|
--- a/include/cectypes.h
|
||||||
+else
|
+++ b/include/cectypes.h
|
||||||
+ AM_CONDITIONAL(USE_IMX_API, false)
|
@@ -309,6 +309,17 @@ namespace CEC {
|
||||||
+ features="$features\n i.MX6 support :\t\t\tno"
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
## check if our build system is complete
|
|
||||||
AC_CHECK_HEADER(algorithm,,AC_MSG_ERROR($msg_required_header_missing))
|
|
||||||
AC_CHECK_HEADER(ctype.h,,AC_MSG_ERROR($msg_required_header_missing))
|
|
||||||
diff -Naur libcec-2.2.0/include/cectypes.h libcec-2.2.0.patch/include/cectypes.h
|
|
||||||
--- libcec-2.2.0/include/cectypes.h 2014-10-28 16:20:50.000000000 +0100
|
|
||||||
+++ libcec-2.2.0.patch/include/cectypes.h 2014-11-10 23:21:37.347945493 +0100
|
|
||||||
@@ -307,6 +307,17 @@
|
|
||||||
#define CEC_EXYNOS_VIRTUAL_COM "Exynos"
|
#define CEC_EXYNOS_VIRTUAL_COM "Exynos"
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@ -54,8 +44,8 @@ diff -Naur libcec-2.2.0/include/cectypes.h libcec-2.2.0.patch/include/cectypes.h
|
|||||||
+/*!
|
+/*!
|
||||||
* Mimimum client version
|
* Mimimum client version
|
||||||
*/
|
*/
|
||||||
#define CEC_MIN_LIB_VERSION 2
|
#define CEC_MIN_LIB_VERSION 3
|
||||||
@@ -888,7 +899,8 @@
|
@@ -876,7 +887,8 @@ typedef enum cec_adapter_type
|
||||||
ADAPTERTYPE_P8_DAUGHTERBOARD = 0x2,
|
ADAPTERTYPE_P8_DAUGHTERBOARD = 0x2,
|
||||||
ADAPTERTYPE_RPI = 0x100,
|
ADAPTERTYPE_RPI = 0x100,
|
||||||
ADAPTERTYPE_TDA995x = 0x200,
|
ADAPTERTYPE_TDA995x = 0x200,
|
||||||
@ -64,11 +54,25 @@ diff -Naur libcec-2.2.0/include/cectypes.h libcec-2.2.0.patch/include/cectypes.h
|
|||||||
+ ADAPTERTYPE_IMX = 0x400
|
+ ADAPTERTYPE_IMX = 0x400
|
||||||
} cec_adapter_type;
|
} cec_adapter_type;
|
||||||
|
|
||||||
typedef struct cec_menu_language
|
/** force exporting through swig */
|
||||||
diff -Naur libcec-2.2.0/src/lib/adapter/AdapterFactory.cpp libcec-2.2.0.patch/src/lib/adapter/AdapterFactory.cpp
|
diff --git a/src/libcec/CECTypeUtils.h b/src/libcec/CECTypeUtils.h
|
||||||
--- libcec-2.2.0/src/lib/adapter/AdapterFactory.cpp 2014-10-28 16:20:50.000000000 +0100
|
index fd8046a..48cb215 100644
|
||||||
+++ libcec-2.2.0.patch/src/lib/adapter/AdapterFactory.cpp 2014-11-10 23:18:08.761485552 +0100
|
--- a/src/libcec/CECTypeUtils.h
|
||||||
@@ -57,6 +57,11 @@
|
+++ b/src/libcec/CECTypeUtils.h
|
||||||
|
@@ -765,6 +765,8 @@ namespace CEC
|
||||||
|
return "Raspberry Pi";
|
||||||
|
case ADAPTERTYPE_TDA995x:
|
||||||
|
return "TDA995x";
|
||||||
|
+ case ADAPTERTYPE_IMX:
|
||||||
|
+ return "i.MX";
|
||||||
|
default:
|
||||||
|
return "unknown";
|
||||||
|
}
|
||||||
|
diff --git a/src/libcec/adapter/AdapterFactory.cpp b/src/libcec/adapter/AdapterFactory.cpp
|
||||||
|
index da05725..92e378b 100644
|
||||||
|
--- a/src/libcec/adapter/AdapterFactory.cpp
|
||||||
|
+++ b/src/libcec/adapter/AdapterFactory.cpp
|
||||||
|
@@ -58,6 +58,11 @@
|
||||||
#include "Exynos/ExynosCECAdapterCommunication.h"
|
#include "Exynos/ExynosCECAdapterCommunication.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -77,10 +81,10 @@ diff -Naur libcec-2.2.0/src/lib/adapter/AdapterFactory.cpp libcec-2.2.0.patch/sr
|
|||||||
+#include "IMX/IMXCECAdapterCommunication.h"
|
+#include "IMX/IMXCECAdapterCommunication.h"
|
||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
using namespace std;
|
|
||||||
using namespace CEC;
|
using namespace CEC;
|
||||||
|
|
||||||
@@ -127,7 +132,22 @@
|
int8_t CAdapterFactory::FindAdapters(cec_adapter *deviceList, uint8_t iBufSize, const char *strDevicePath /* = NULL */)
|
||||||
|
@@ -127,7 +132,22 @@ int8_t CAdapterFactory::DetectAdapters(cec_adapter_descriptor *deviceList, uint8
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
@ -104,7 +108,7 @@ diff -Naur libcec-2.2.0/src/lib/adapter/AdapterFactory.cpp libcec-2.2.0.patch/sr
|
|||||||
#error "libCEC doesn't have support for any type of adapter. please check your build system or configuration"
|
#error "libCEC doesn't have support for any type of adapter. please check your build system or configuration"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -151,11 +171,16 @@
|
@@ -151,11 +171,16 @@ IAdapterCommunication *CAdapterFactory::GetInstance(const char *strPort, uint16_
|
||||||
return new CRPiCECAdapterCommunication(m_lib->m_cec);
|
return new CRPiCECAdapterCommunication(m_lib->m_cec);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -122,9 +126,11 @@ diff -Naur libcec-2.2.0/src/lib/adapter/AdapterFactory.cpp libcec-2.2.0.patch/sr
|
|||||||
return NULL;
|
return NULL;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
diff -Naur libcec-2.2.0/src/lib/adapter/IMX/AdapterMessageQueue.h libcec-2.2.0.patch/src/lib/adapter/IMX/AdapterMessageQueue.h
|
diff --git a/src/libcec/adapter/IMX/AdapterMessageQueue.h b/src/libcec/adapter/IMX/AdapterMessageQueue.h
|
||||||
--- libcec-2.2.0/src/lib/adapter/IMX/AdapterMessageQueue.h 1970-01-01 01:00:00.000000000 +0100
|
new file mode 100644
|
||||||
+++ libcec-2.2.0.patch/src/lib/adapter/IMX/AdapterMessageQueue.h 2014-11-10 23:14:45.214162390 +0100
|
index 0000000..af6742c
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/libcec/adapter/IMX/AdapterMessageQueue.h
|
||||||
@@ -0,0 +1,134 @@
|
@@ -0,0 +1,134 @@
|
||||||
+#pragma once
|
+#pragma once
|
||||||
+/*
|
+/*
|
||||||
@ -159,7 +165,7 @@ diff -Naur libcec-2.2.0/src/lib/adapter/IMX/AdapterMessageQueue.h libcec-2.2.0.p
|
|||||||
+ * http://www.pulse-eight.net/
|
+ * http://www.pulse-eight.net/
|
||||||
+ */
|
+ */
|
||||||
+
|
+
|
||||||
+#include "lib/platform/threads/mutex.h"
|
+#include "platform/threads/mutex.h"
|
||||||
+
|
+
|
||||||
+namespace CEC
|
+namespace CEC
|
||||||
+{
|
+{
|
||||||
@ -260,9 +266,11 @@ diff -Naur libcec-2.2.0/src/lib/adapter/IMX/AdapterMessageQueue.h libcec-2.2.0.p
|
|||||||
+ };
|
+ };
|
||||||
+
|
+
|
||||||
+};
|
+};
|
||||||
diff -Naur libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp libcec-2.2.0.patch/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp
|
diff --git a/src/libcec/adapter/IMX/IMXCECAdapterCommunication.cpp b/src/libcec/adapter/IMX/IMXCECAdapterCommunication.cpp
|
||||||
--- libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp 1970-01-01 01:00:00.000000000 +0100
|
new file mode 100644
|
||||||
+++ libcec-2.2.0.patch/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp 2014-11-10 23:14:45.217161982 +0100
|
index 0000000..2daa8cb
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/libcec/adapter/IMX/IMXCECAdapterCommunication.cpp
|
||||||
@@ -0,0 +1,328 @@
|
@@ -0,0 +1,328 @@
|
||||||
+/*
|
+/*
|
||||||
+ * This file is part of the libCEC(R) library.
|
+ * This file is part of the libCEC(R) library.
|
||||||
@ -296,11 +304,11 @@ diff -Naur libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp libce
|
|||||||
+#if defined(HAVE_IMX_API)
|
+#if defined(HAVE_IMX_API)
|
||||||
+#include "IMXCECAdapterCommunication.h"
|
+#include "IMXCECAdapterCommunication.h"
|
||||||
+
|
+
|
||||||
+#include "lib/CECTypeUtils.h"
|
+#include "CECTypeUtils.h"
|
||||||
+#include "lib/LibCEC.h"
|
+#include "LibCEC.h"
|
||||||
+#include "lib/platform/sockets/cdevsocket.h"
|
+#include "platform/sockets/cdevsocket.h"
|
||||||
+#include "lib/platform/util/StdString.h"
|
+#include "platform/util/StdString.h"
|
||||||
+#include "lib/platform/util/buffer.h"
|
+#include "platform/util/buffer.h"
|
||||||
+
|
+
|
||||||
+/*
|
+/*
|
||||||
+ * Ioctl definitions from kernel header
|
+ * Ioctl definitions from kernel header
|
||||||
@ -592,9 +600,11 @@ diff -Naur libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterCommunication.cpp libce
|
|||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+#endif // HAVE_IMX_API
|
+#endif // HAVE_IMX_API
|
||||||
diff -Naur libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterCommunication.h libcec-2.2.0.patch/src/lib/adapter/IMX/IMXCECAdapterCommunication.h
|
diff --git a/src/libcec/adapter/IMX/IMXCECAdapterCommunication.h b/src/libcec/adapter/IMX/IMXCECAdapterCommunication.h
|
||||||
--- libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterCommunication.h 1970-01-01 01:00:00.000000000 +0100
|
new file mode 100644
|
||||||
+++ libcec-2.2.0.patch/src/lib/adapter/IMX/IMXCECAdapterCommunication.h 2014-11-10 23:14:45.217161982 +0100
|
index 0000000..9e899a3
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/libcec/adapter/IMX/IMXCECAdapterCommunication.h
|
||||||
@@ -0,0 +1,119 @@
|
@@ -0,0 +1,119 @@
|
||||||
+#pragma once
|
+#pragma once
|
||||||
+/*
|
+/*
|
||||||
@ -626,10 +636,10 @@ diff -Naur libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterCommunication.h libcec-
|
|||||||
+
|
+
|
||||||
+#if defined(HAVE_IMX_API)
|
+#if defined(HAVE_IMX_API)
|
||||||
+
|
+
|
||||||
+#include "lib/platform/threads/mutex.h"
|
+#include "platform/threads/mutex.h"
|
||||||
+#include "lib/platform/threads/threads.h"
|
+#include "platform/threads/threads.h"
|
||||||
+#include "lib/platform/sockets/socket.h"
|
+#include "platform/sockets/socket.h"
|
||||||
+#include "lib/adapter/AdapterCommunication.h"
|
+#include "adapter/AdapterCommunication.h"
|
||||||
+#include <map>
|
+#include <map>
|
||||||
+
|
+
|
||||||
+#define IMX_ADAPTER_VID 0x0471 /*FIXME TBD*/
|
+#define IMX_ADAPTER_VID 0x0471 /*FIXME TBD*/
|
||||||
@ -715,9 +725,11 @@ diff -Naur libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterCommunication.h libcec-
|
|||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
+#endif
|
+#endif
|
||||||
diff -Naur libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp libcec-2.2.0.patch/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp
|
diff --git a/src/libcec/adapter/IMX/IMXCECAdapterDetection.cpp b/src/libcec/adapter/IMX/IMXCECAdapterDetection.cpp
|
||||||
--- libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp 1970-01-01 01:00:00.000000000 +0100
|
new file mode 100644
|
||||||
+++ libcec-2.2.0.patch/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp 2014-11-10 23:14:45.215162253 +0100
|
index 0000000..6c93c45
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/libcec/adapter/IMX/IMXCECAdapterDetection.cpp
|
||||||
@@ -0,0 +1,42 @@
|
@@ -0,0 +1,42 @@
|
||||||
+/*
|
+/*
|
||||||
+ * This file is part of the libCEC(R) library.
|
+ * This file is part of the libCEC(R) library.
|
||||||
@ -761,9 +773,11 @@ diff -Naur libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterDetection.cpp libcec-2.
|
|||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+#endif
|
+#endif
|
||||||
diff -Naur libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterDetection.h libcec-2.2.0.patch/src/lib/adapter/IMX/IMXCECAdapterDetection.h
|
diff --git a/src/libcec/adapter/IMX/IMXCECAdapterDetection.h b/src/libcec/adapter/IMX/IMXCECAdapterDetection.h
|
||||||
--- libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterDetection.h 1970-01-01 01:00:00.000000000 +0100
|
new file mode 100644
|
||||||
+++ libcec-2.2.0.patch/src/lib/adapter/IMX/IMXCECAdapterDetection.h 2014-11-10 23:14:45.215162253 +0100
|
index 0000000..d54891d
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/libcec/adapter/IMX/IMXCECAdapterDetection.h
|
||||||
@@ -0,0 +1,36 @@
|
@@ -0,0 +1,36 @@
|
||||||
+#pragma once
|
+#pragma once
|
||||||
+/*
|
+/*
|
||||||
@ -801,31 +815,65 @@ diff -Naur libcec-2.2.0/src/lib/adapter/IMX/IMXCECAdapterDetection.h libcec-2.2.
|
|||||||
+ static bool FindAdapter(void);
|
+ static bool FindAdapter(void);
|
||||||
+ };
|
+ };
|
||||||
+}
|
+}
|
||||||
diff -Naur libcec-2.2.0/src/lib/CECTypeUtils.h libcec-2.2.0.patch/src/lib/CECTypeUtils.h
|
diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake
|
||||||
--- libcec-2.2.0/src/lib/CECTypeUtils.h 2014-10-28 16:20:50.000000000 +0100
|
index 828cdb2..8b47795 100644
|
||||||
+++ libcec-2.2.0.patch/src/lib/CECTypeUtils.h 2014-11-10 23:14:45.212162668 +0100
|
--- a/src/libcec/cmake/CheckPlatformSupport.cmake
|
||||||
@@ -877,6 +877,8 @@
|
+++ b/src/libcec/cmake/CheckPlatformSupport.cmake
|
||||||
return "Raspberry Pi";
|
@@ -8,6 +8,7 @@
|
||||||
case ADAPTERTYPE_TDA995x:
|
# HAVE_RANDR 1 if xrandr is supported
|
||||||
return "TDA995x";
|
# HAVE_LIBUDEV 1 if udev is supported
|
||||||
+ case ADAPTERTYPE_IMX:
|
# HAVE_RPI_API 1 if Raspberry Pi is supported
|
||||||
+ return "i.MX";
|
+# HAVE_IMX_API 1 if i.MX is supported
|
||||||
default:
|
# HAVE_TDA995X_API 1 if TDA995X is supported
|
||||||
return "unknown";
|
# HAVE_EXYNOS_API 1 if Exynos is supported
|
||||||
}
|
# HAVE_P8_USB_DETECT 1 if Pulse-Eight devices can be auto-detected
|
||||||
diff -Naur libcec-2.2.0/src/lib/Makefile.am libcec-2.2.0.patch/src/lib/Makefile.am
|
@@ -87,6 +88,15 @@ else()
|
||||||
--- libcec-2.2.0/src/lib/Makefile.am 2014-10-28 16:20:50.000000000 +0100
|
list(APPEND CEC_SOURCES ${CEC_SOURCES_ADAPTER_RPI})
|
||||||
+++ libcec-2.2.0.patch/src/lib/Makefile.am 2014-11-10 23:20:02.597700521 +0100
|
endif()
|
||||||
@@ -63,6 +63,12 @@
|
|
||||||
adapter/TDA995x/TDA995xCECAdapterCommunication.cpp
|
|
||||||
endif
|
|
||||||
|
|
||||||
+## i.MX6 support
|
+ # i.MX
|
||||||
+if USE_IMX_API
|
+ if (HAVE_IMX_API)
|
||||||
+libcec_la_SOURCES += adapter/IMX/IMXCECAdapterDetection.cpp \
|
+ set(LIB_INFO "${LIB_INFO}, 'IMX'")
|
||||||
+ adapter/IMX/IMXCECAdapterCommunication.cpp
|
+ set(CEC_SOURCES_ADAPTER_IMX adapter/IMX/IMXCECAdapterDetection.cpp
|
||||||
+endif
|
+ adapter/IMX/IMXCECAdapterCommunication.cpp)
|
||||||
|
+ source_group("Source Files\\adapter\\IMX" FILES ${CEC_SOURCES_ADAPTER_IMX})
|
||||||
|
+ list(APPEND CEC_SOURCES ${CEC_SOURCES_ADAPTER_IMX})
|
||||||
|
+ endif()
|
||||||
+
|
+
|
||||||
## Exynos support
|
# TDA995x
|
||||||
if USE_EXYNOS_API
|
check_include_files("tda998x_ioctl.h;comps/tmdlHdmiCEC/inc/tmdlHdmiCEC_Types.h" HAVE_TDA995X_API)
|
||||||
libcec_la_SOURCES += adapter/Exynos/ExynosCECAdapterDetection.cpp \
|
if (HAVE_TDA995X_API)
|
||||||
|
diff --git a/src/libcec/cmake/DisplayPlatformSupport.cmake b/src/libcec/cmake/DisplayPlatformSupport.cmake
|
||||||
|
index feee111..0309c56 100644
|
||||||
|
--- a/src/libcec/cmake/DisplayPlatformSupport.cmake
|
||||||
|
+++ b/src/libcec/cmake/DisplayPlatformSupport.cmake
|
||||||
|
@@ -32,6 +32,12 @@ else()
|
||||||
|
message(STATUS "Raspberry Pi support: no")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
+if (HAVE_IMX_API)
|
||||||
|
+ message(STATUS "i.MX support: yes")
|
||||||
|
+else()
|
||||||
|
+ message(STATUS "i.MX support: no")
|
||||||
|
+endif()
|
||||||
|
+
|
||||||
|
if (HAVE_TDA995X_API)
|
||||||
|
message(STATUS "TDA995x support: yes")
|
||||||
|
else()
|
||||||
|
diff --git a/src/libcec/env.h.in b/src/libcec/env.h.in
|
||||||
|
index a1a1f26..f90e729 100644
|
||||||
|
--- a/src/libcec/env.h.in
|
||||||
|
+++ b/src/libcec/env.h.in
|
||||||
|
@@ -60,6 +60,9 @@
|
||||||
|
/* Define to 1 for Raspberry Pi support */
|
||||||
|
#cmakedefine HAVE_RPI_API @HAVE_RPI_API@
|
||||||
|
|
||||||
|
+/* Define to 1 for IMX support */
|
||||||
|
+#cmakedefine HAVE_IMX_API @HAVE_IMX_API@
|
||||||
|
+
|
||||||
|
/* Define to 1 for TDA995x support */
|
||||||
|
#cmakedefine HAVE_TDA995X_API @HAVE_TDA995X_API@
|
||||||
|
|
||||||
|
--
|
||||||
|
2.1.4
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user