Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
libcec3: Bump to version 3.1.0
  • Loading branch information
warped-rudi committed Apr 23, 2016
1 parent a92020f commit 7c39685
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 27 deletions.
1 change: 1 addition & 0 deletions packages/libs/libcec3/build
Expand Up @@ -29,6 +29,7 @@ esac

cd $PKG_BUILD_DIR

export CFLAGS="$CFLAGS $EXTRA_INCLUDES"
export CXXFLAGS="$CXXFLAGS $EXTRA_INCLUDES"

do_cmake_build \
Expand Down
6 changes: 3 additions & 3 deletions packages/libs/libcec3/meta
@@ -1,8 +1,8 @@
PKG_NAME=libcec3

PKG_URL_PROTO=git
PKG_URL_REV="1~e8506b3"
PKG_VERSION="3.0.1+${PKG_URL_REV}"
PKG_URL_REV="1~6d68d21"
PKG_VERSION="3.1.0+${PKG_URL_REV}"
PKG_URL="https://github.com/Pulse-Eight/libcec.git"

PKG_USE="xrandr"
Expand All @@ -12,7 +12,7 @@ PKG_DEPENDS_xrandr="libXrandr"
PKG_REV=1
PKG_RUN_DEPENDS="$TARGET_LIBC"
PKG_DEPENDS="systemd liblockdev"
PKG_BUILD_DEPENDS="toolchain cmake Python swig platform"
PKG_BUILD_DEPENDS="toolchain cmake Python swig p8-platform"
PKG_PRIORITY=optional
PKG_SECTION=libs
PKG_SHORTDESC="library designed for communicating with the Pulse-Eight USB - HDMI CEC Adaptor"
Expand Down
37 changes: 18 additions & 19 deletions packages/libs/libcec3/patches/0001-add-imx-support-1.diff
Expand Up @@ -146,11 +146,11 @@ index 0000000..c8bcf71
+ */
+
+#include "env.h"
+#include "platform/threads/mutex.h"
+#include "p8-platform/threads/mutex.h"
+
+namespace CEC
+{
+ using namespace PLATFORM;
+ using namespace P8PLATFORM;
+
+ class CAdapterMessageQueueEntry
+ {
Expand Down Expand Up @@ -239,9 +239,9 @@ index 0000000..c8bcf71
+
+ private:
+ bool m_bWaiting; /**< true while a thread is waiting or when it hasn't started waiting yet */
+ PLATFORM::CCondition<bool> m_condition; /**< the condition to wait on */
+ PLATFORM::CMutex m_mutex; /**< mutex for changes to this class */
+ uint32_t m_hash;
+ P8PLATFORM::CCondition<bool> m_condition; /**< the condition to wait on */
+ P8PLATFORM::CMutex m_mutex; /**< mutex for changes to this class */
+ uint32_t m_hash;
+ uint32_t m_retval;
+ bool m_bSucceeded;
+ };
Expand All @@ -252,7 +252,7 @@ new file mode 100644
index 0000000..1f70989
--- /dev/null
+++ b/src/libcec/adapter/IMX/IMXCECAdapterCommunication.cpp
@@ -0,0 +1,326 @@
@@ -0,0 +1,325 @@
+/*
+ * This file is part of the libCEC(R) library.
+ *
Expand Down Expand Up @@ -285,7 +285,7 @@ index 0000000..1f70989
+#if defined(HAVE_IMX6_API)
+#include "IMXCECAdapterCommunication.h"
+
+#include "platform/sockets/cdevsocket.h"
+#include "p8-platform/sockets/cdevsocket.h"
+#include "CECTypeUtils.h"
+#include "LibCEC.h"
+
Expand Down Expand Up @@ -315,7 +315,7 @@ index 0000000..1f70989
+
+using namespace std;
+using namespace CEC;
+using namespace PLATFORM;
+using namespace P8PLATFORM;
+
+#include "AdapterMessageQueue.h"
+
Expand Down Expand Up @@ -529,7 +529,6 @@ index 0000000..1f70989
+
+void *CIMXCECAdapterCommunication::Process(void)
+{
+ bool bHandled;
+ hdmi_cec_event event;
+ int ret;
+
Expand Down Expand Up @@ -615,9 +614,9 @@ index 0000000..ce5c4cb
+
+#if defined(HAVE_IMX6_API)
+
+#include "platform/threads/mutex.h"
+#include "platform/threads/threads.h"
+#include "platform/sockets/socket.h"
+#include "p8-platform/threads/mutex.h"
+#include "p8-platform/threads/threads.h"
+#include "p8-platform/sockets/socket.h"
+#include "adapter/AdapterCommunication.h"
+#include <map>
+
Expand All @@ -626,7 +625,7 @@ index 0000000..ce5c4cb
+
+
+
+namespace PLATFORM
+namespace P8PLATFORM
+{
+ class CCDevSocket;
+};
Expand All @@ -636,7 +635,7 @@ index 0000000..ce5c4cb
+{
+ class CAdapterMessageQueueEntry;
+
+ class CIMXCECAdapterCommunication : public IAdapterCommunication, public PLATFORM::CThread
+ class CIMXCECAdapterCommunication : public IAdapterCommunication, public P8PLATFORM::CThread
+ {
+ public:
+ /*!
Expand Down Expand Up @@ -677,7 +676,7 @@ index 0000000..ce5c4cb
+ bool RegisterLogicalAddress(const cec_logical_address address);
+ ///}
+
+ /** @name PLATFORM::CThread implementation */
+ /** @name P8PLATFORM::CThread implementation */
+ ///{
+ void *Process(void);
+ ///}
Expand All @@ -688,15 +687,15 @@ index 0000000..ce5c4cb
+
+ std::string m_strError; /**< current error message */
+
+ //cec_logical_addresses m_logicalAddresses;
+ //cec_logical_addresses m_logicalAddresses;
+ cec_logical_address m_logicalAddress;
+
+ PLATFORM::CMutex m_mutex;
+ PLATFORM::CCDevSocket *m_dev; /**< the device connection */
+ P8PLATFORM::CMutex m_mutex;
+ P8PLATFORM::CCDevSocket *m_dev; /**< the device connection */
+ bool m_bLogicalAddressRegistered;
+ bool m_bInitialised;
+
+ PLATFORM::CMutex m_messageMutex;
+ P8PLATFORM::CMutex m_messageMutex;
+ uint32_t m_iNextMessage;
+ std::map<uint32_t, CAdapterMessageQueueEntry *> m_messages;
+ };
Expand Down
10 changes: 5 additions & 5 deletions packages/libs/libcec3/patches/0002-add-imx-support-2.diff
Expand Up @@ -13,13 +13,13 @@
--- a/src/libcec/cmake/CheckPlatformSupport.cmake 2015-05-21 16:09:28.778514006 +0200
+++ b/src/libcec/cmake/CheckPlatformSupport.cmake 2015-05-21 16:19:42.733309082 +0200
@@ -10,6 +10,7 @@
# HAVE_RPI_API 1 if Raspberry Pi is supported
# HAVE_TDA995X_API 1 if TDA995X is supported
# HAVE_EXYNOS_API 1 if Exynos is supported
# HAVE_RPI_API 1 if Raspberry Pi is supported
# HAVE_TDA995X_API 1 if TDA995X is supported
# HAVE_EXYNOS_API 1 if Exynos is supported
+# HAVE_IMX6_API 1 if iMX.6 is supported
# HAVE_P8_USB 1 if Pulse-Eight devices are supported
# HAVE_P8_USB_DETECT 1 if Pulse-Eight devices can be auto-detected
#

# HAVE_DRM_EDID_PARSER 1 if DRM EDID parsing is supported
@@ -119,6 +120,18 @@
else()
set(HAVE_EXYNOS_API 0)
Expand Down
13 changes: 13 additions & 0 deletions packages/libs/libcec3/patches/0003-tda995x-platform-detect.diff
@@ -0,0 +1,13 @@
--- a/src/libcec/cmake/CheckPlatformSupport.cmake 2016-04-23 10:28:27.310704724 +0200
+++ b/src/libcec/cmake/CheckPlatformSupport.cmake 2016-04-23 10:28:27.334704725 +0200
@@ -112,8 +112,8 @@
endif()

# TDA995x
- check_include_files("tda998x_ioctl.h;comps/tmdlHdmiCEC/inc/tmdlHdmiCEC_Types.h" HAVE_TDA995X_API)
- if (HAVE_TDA995X_API)
+ check_include_files("tda998x_ioctl.h;comps/tmdlHdmiCEC/inc/tmdlHdmiCEC_Types.h" HAVE_TDA995X_API_INC)
+ if (HAVE_TDA995X_API_INC)
set(HAVE_TDA995X_API 1)
set(LIB_INFO "${LIB_INFO}, TDA995x")
set(CEC_SOURCES_ADAPTER_TDA995x adapter/TDA995x/TDA995xCECAdapterDetection.cpp

0 comments on commit 7c39685

Please sign in to comment.