libCEC 7.0.0 - Merge branch 'master' into release.

Author: opdenkamp

.gitignore

@@ -1,3 +1,4 @@
+/.vscode
 /build
 /cmake-build
 /.cproject
@@ -17,6 +18,7 @@
 *.suo
 *.user
 *.aps
+*.swp
 env.h
 version.h
 .vs
@@ -25,6 +27,8 @@ AssemblyInfo.cs
 AssemblyInfo.cpp
 
 *~
+tags
+cscope.*
 
 /support/private
 

CMakeLists.txt

@@ -1,9 +1,9 @@
-project(libcec)
 cmake_minimum_required(VERSION 3.12.0)
+project(libcec)
 
-set(LIBCEC_VERSION_MAJOR 6)
+set(LIBCEC_VERSION_MAJOR 7)
 set(LIBCEC_VERSION_MINOR 0)
-set(LIBCEC_VERSION_PATCH 2)
+set(LIBCEC_VERSION_PATCH 0)
 
 # cec-client
 add_subdirectory(src/cec-client)

COPYING LICENSE.md

@@ -0,0 +1,7 @@
+if(WIN32)
+  if (MSVC)
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_HAS_ITERATOR_DEBUGGING=1 /D_SECURE_SCL=1")
+    add_compile_definitions($<$<CONFIG:Debug>:_ITERATOR_DEBUG_LEVEL=2>)
+    add_compile_definitions($<$<CONFIG:Debug>:_HAS_ITERATOR_DEBUGGING=1>)
+  endif(MSVC)
+endif(WIN32)

cmake/WindowsDebug.cmake

@@ -1,3 +1,83 @@
+libcec (7.0.0.1~#DIST#) #DIST#; urgency=medium
+
+  [ Lars Op den Kamp ]
+  * modernise CMakeLists.txt
+  * Use cmake TIMESTAMP function to be more portable and to allow for reproducible builds
+  * fixed: potential null deref. closes #556
+  * python 3.13 compatibility
+  * added: vs2022 support
+  * fixed: creating (unsigned) windows installer
+  * fixed: nsis installer not creating start menu icons and uninstaller
+  * bump to .net framework 4.5 and .net 8.0
+  * fixed: null terminate .net device language field. added CecLogicalAddresses::Unset()
+  * fixed: don't call the config updated callback if nothing has changed. auto set wake devices or activate source so these values match what happens on the tv
+  * fixed: tv would power on even if the options to power on were disabled in cec-tray
+  * changed/fixed: windows installer, eventghost plugin, .net libraries, python imports, debug builds
+  * fixed: use input() for python3 and raw_input() for python2
+  * changed: debian python install to match arch specific too
+  * fixed: libusb0.dll wasn't included in the installer
+  * fixed: remove call to PyEcal_InitThreads(). swig already includes SWIG_PYTHON_INITIALIZE_THREADS in SWIG_init()
+
+  [ Evgeny Grin ]
+  * CheckPlatformSupport.cmake: really use cache for HAVE_DRM_EDID_PARSER
+  * CheckPlatformSupport.cmake: don't override HAVE_LIBUDEV variable, Mark HAVE_P8_USB_DETECT as internal (no way to define it externally), Always enable HAVE_P8_USB_DETECT on linux (for SYSFS detection), Fixed CMAKE_REQUIRED_LIBRARIES if libudev is used.
+  * CheckPlatformSupport.cmake: don't override defined HAVE_RANDR
+  * CheckPlatformSupport.cmake: don't override cache var HAVE_RPI_API
+  * CheckPlatformSupport.cmake: don't override cache var HAVE_TDA995X_API
+  * CheckPlatformSupport.cmake: fixed HAVE_EXYNOS_API usage Avoid resolving variable otherwise variable content could be treated as name of another variable
+  * CheckPlatformSupport.cmake: fixed HAVE_LINUX_API usage, fixed misleading description "Linux supported: no" description could mislead users
+  * CheckPlatformSupport.cmake: fixed usage of HAVE_AOCEC_API var
+  * CheckPlatformSupport.cmake: fixed usage of HAVE_IMX_API, marked as CACHE var, added description
+  * CheckPlatformSupport.cmake: unified LIB_INFO assignment
+  * CheckPlatformSupport.cmake: removed duplicated definition of RPI_{LIB,INCLUDE}_DIR
+  * cmake files: improved and unified descriptions and reporting
+  * CheckPlatformSupport.cmake: corrected comments to properly document real behaviour
+
+  [ Tore Sinding Bekkedal ]
+  * Ease copy-paste by invoking apt noninteractively
+  * Update and robustify
+
+  [ Hedda ]
+  * Rename COPYING to LICENSE.md so follow standard naming conversion
+
+  [ psykose ]
+  * cecloader.h: fix null return
+
+  [ Colin Foster ]
+  * gitignore: add vim swap files to gitignore
+
+  [ Teyut ]
+  * Mark all devices as inactive when new active source is unknown
+
+  [ Guy Martin ]
+  * Fix use after free in callbacks with results.
+  * Add a commandHandler callback to allow external libs to handle CEC commands themselves.
+  * Remove debug printfs.
+  * Attempt to fix race condition when freeing the callback wrapper.
+  * Allow command handler callback to intercept broadcast messages and fix inconsistent callback wrapper deletion again.
+  * Remove useless mutex.
+  * Remove useless 'keepResult' parameter and make sure the CCallbackWrap is only deleted once even in case of timeout.
+
+  [ Alberto Fanjul ]
+  * Fix module import
+  * Remove useless print
+
+  [ Rudi Heitbaum ]
+  * fix assert issue with systemd udev
+
+  [ Anish Sane ]
+  * tegra-cec support. closes #636
+
+  [ DDS Central ]
+  * Add support for Windows ARM64.
+  * Fix CMakeLists.txt files for Windows ARM64 support.
+  * Add arm64 to available architecture list in visual-studio.cmd and build-lib.cmd. build-all.cmd: add runtime arch detection for Windows ARM64.
+  * src/libcec/LibCEC.cpp: Add Windows ARM64 host type.
+  * Disable building of LibCecSharp and .NET applications on ARM64.
+  * build-all.cmd: Move toolchain setup outside of ARM64 .NET disable clause.
+
+ -- Lars Op den Kamp <[email protected]>  Wed, 26 Feb 2025 08:50:56 +0100
+
 libcec (6.0.2.1~#DIST#) #DIST#; urgency=medium
 
   * added:

debian/changelog.in

@@ -1,2 +1,2 @@
-usr/lib/python*/dist-packages/*
+usr/lib*{/*,}/python*/dist-packages/cec/*
 usr/bin/pyCecClient

debian/python-libcec.install

@@ -1,7 +1,7 @@
 ### Debian
 Use the following commands to create a Debian package:
 ```
-source /etc/lsb-release
-sed "s/#DIST#/${DISTRIB_CODENAME}/g" debian/changelog.in > debian/changelog
-dpkg-buildpackage
+sudo apt-get build-dep . # to install build dependencies
+sed "s/#DIST#/$(lsb_release -cs)/g" debian/changelog.in > debian/changelog
+dpkg-buildpackage --no-sign # omit this argument if you have a private key to sign with
 ```

docs/README.debian.md

@@ -21,7 +21,7 @@ cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/CrossCompile.cmake \
 To compile libCEC on a new Raspbian installation, follow these instructions:
 ```
 sudo apt-get update
-sudo apt-get install cmake libudev-dev libxrandr-dev python3-dev swig git
+sudo apt-get -y install cmake libudev-dev libxrandr-dev python3-dev swig git
 cd
 git clone https://github.com/Pulse-Eight/platform.git
 mkdir platform/build

docs/README.raspberrypi.md

@@ -34,7 +34,7 @@
 #include "cecc.h"
 
 #include <stdio.h>
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(_M_ARM64)
 #include <windows.h>
 #include <conio.h>
 typedef HINSTANCE libcecc_lib_instance_t;
@@ -217,7 +217,7 @@ static int libcecc_resolve_all(void* lib, libcec_interface_t* iface)
 static libcecc_lib_instance_t libcecc_load_library(const char* strLib)
 {
   libcecc_lib_instance_t lib;
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(_M_ARM64)
   lib = LoadLibrary(strLib ? strLib : "cec.dll");
   if (lib == NULL)
     printf("failed to load cec.dll\n");
@@ -235,7 +235,7 @@ static libcecc_lib_instance_t libcecc_load_library(const char* strLib)
 
 static void libcecc_close_library(libcecc_lib_instance_t lib)
 {
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(_M_ARM64)
   FreeLibrary(lib);
 #else
   dlclose(lib);
@@ -244,7 +244,7 @@ static void libcecc_close_library(libcecc_lib_instance_t lib)
 
 static void* libcecc_resolve(void* lib, const char* name)
 {
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(_M_ARM64)
   return GetProcAddress(lib, name);
 #else
   return dlsym(lib, name);

include/ceccloader.h

@@ -31,7 +31,7 @@
  *     http://www.pulse-eight.net/
  */
 
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(_M_ARM64)
 #include <windows.h>
 #include <conio.h>
 
@@ -172,7 +172,7 @@ bool LibCecBootloader(const char *strLib = NULL)
     if (!g_libCEC)
     {
       std::cout << dlerror() << std::endl;
-      return NULL;
+      return false;
     }
   }
 
@@ -181,7 +181,7 @@ bool LibCecBootloader(const char *strLib = NULL)
   if (!LibCecBootloader)
   {
     std::cout << "cannot find CECStartBootloader" << std::endl;
-    return NULL;
+    return false;
   }
 
   bool bReturn = LibCecBootloader();

include/cecloader.h

@@ -38,14 +38,14 @@
 #include <stdint.h>
 #include <string.h>
 
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(_M_ARM64)
 #define CEC_CDECL    __cdecl
 #else
 #define CEC_CDECL
 #endif
 
 #if !defined(DECLSPEC)
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64) || defined(_M_ARM64)
 #include <windows.h>
 #if defined DLL_EXPORT
 #define DECLSPEC __declspec(dllexport)
@@ -887,7 +887,8 @@ typedef enum cec_adapter_type
   ADAPTERTYPE_EXYNOS           = 0x300,
   ADAPTERTYPE_LINUX            = 0x400,
   ADAPTERTYPE_AOCEC            = 0x500,
-  ADAPTERTYPE_IMX              = 0x600
+  ADAPTERTYPE_IMX              = 0x600,
+  ADAPTERTYPE_TEGRA            = 0x700
 } cec_adapter_type;
 
 /** force exporting through swig */
@@ -1450,6 +1451,15 @@ typedef struct ICECCallbacks
    */
   void (CEC_CDECL* sourceActivated)(void* cbParam, const cec_logical_address logicalAddress, const uint8_t bActivated);
 
+  /*!
+   * @brief Allow the client handle a CEC command instead of libcec.
+   * @param cbparam             Callback parameter provided when the callbacks were set up
+   * @param command             The command to handle.
+   *
+   * @return 1 if the command has been handled and if libCEC should not take any action
+   */
+  int (CEC_CDECL* commandHandler)(void* cbparam, const cec_command* command);
+
 #ifdef __cplusplus
    ICECCallbacks(void) { Clear(); }
   ~ICECCallbacks(void) { Clear(); };
@@ -1463,6 +1473,7 @@ typedef struct ICECCallbacks
     alert                = nullptr;
     menuStateChanged     = nullptr;
     sourceActivated      = nullptr;
+    commandHandler       = nullptr;
   }
 #endif
 } ICECCallbacks;

include/cectypes.h

@@ -0,0 +1,58 @@
+;libCEC EventGhost Plugin installer
+;Copyright (C) 2025 Pulse-Eight Ltd.
+;http://www.pulse-eight.com/
+
+XPStyle on
+RequestExecutionLevel user
+SetCompressor /SOLID lzma
+
+!include "LogicLib.nsh"
+!include "MUI2.nsh"
+!include "nsDialogs.nsh"
+!include "nsis\libcec-version.nsh"
+
+Name "Pulse-Eight libCEC v${LIBCEC_VERSION_STRING} EventGhost Plugin"
+OutFile "..\build\libcec-eventghost-plugin-${LIBCEC_VERSION_STRING}.exe"
+InstType "Full installation"
+
+Var EventGhostLocation
+
+Section "EventGhost plugin" SecEvGhostCec
+	SetShellVarContext current
+	SectionIn 1
+	SectionIn RO
+
+	SetOutPath "$%TEMP%\"
+	File "..\build\EventGhost\pulse_eight.egplugin"
+
+	ExecWait '"$EventGhostLocation\eventghost.exe" "$%TEMP%\pulse_eight.egplugin"'
+	Delete "$%TEMP%\pulse_eight.egplugin"
+SectionEnd
+
+Function EventGhost
+	ReadRegDword $1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\EventGhost_is1" "InstallLocation"
+	${If} $1 != ""
+		StrCpy $EventGhostLocation "$1"
+	${Else}
+		MessageBox MB_OK "EventGhost is not installed. Exiting."
+		Quit
+	${Endif}
+FunctionEnd
+
+!define MUI_FINISHPAGE_LINK "Visit https://libcec.pulse-eight.com/ for more information."
+!define MUI_FINISHPAGE_LINK_LOCATION "https://libcec.pulse-eight.com/"
+!define MUI_ABORTWARNING
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "..\LICENSE.md"
+!insertmacro MUI_PAGE_COMPONENTS
+
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_LANGUAGE "English"
+
+Function .onInit
+	; check for EventGhost
+	Call EventGhost
+FunctionEnd