This commit is contained in:
Mario Fetka
2023-04-06 11:47:15 +02:00
parent 011cd6e696
commit 1f44a2d3b4
96 changed files with 3912 additions and 51 deletions

View File

@@ -0,0 +1,24 @@
src/libcec/cmake/CheckPlatformSupport.cmake | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake
index 5d423df..9e77924 100644
--- a/src/libcec/cmake/CheckPlatformSupport.cmake
+++ b/src/libcec/cmake/CheckPlatformSupport.cmake
@@ -90,6 +90,7 @@ else()
check_function_exists(flock HAVE_FLOCK)
# udev
+ if (${HAVE_LIBUDEV})
pkg_check_modules(UDEV udev)
if (UDEV_FOUND)
set(PLATFORM_LIBREQUIRES "${PLATFORM_LIBREQUIRES} ${UDEV_LIBRARIES}")
@@ -106,6 +107,7 @@ else()
list(APPEND CMAKE_REQUIRED_LIBRARIES "${UDEV_LIBRARIES}")
set(HAVE_P8_USB_DETECT ON CACHE BOOL "p8 usb-cec detection supported" FORCE)
endif()
+ endif()
# xrandr
check_include_files("X11/Xlib.h;X11/Xatom.h;X11/extensions/Xrandr.h" HAVE_RANDR_HEADERS)

View File

@@ -0,0 +1,29 @@
https://github.com/Pulse-Eight/libcec/pull/599
From 452b2049b2ee3e73968c603e5524b2d349ac0c3e Mon Sep 17 00:00:00 2001
From: psykose <alice@ayaya.dev>
Date: Sat, 9 Apr 2022 17:59:11 +0000
Subject: [PATCH] cecloader.h: fix null return
returning NULL is invalid for a return type of bool when NULL is defined
as `nullptr` instead of 0L
--- a/include/cecloader.h
+++ b/include/cecloader.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();