rpms/libcec
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add patch to fix crash in libudev >= 256 ( https://github.com/LibreELEC/LibreELEC.tv/pull/8982 ) [release 6.0.2-5mamba;Wed Dec 25 2024]

Browse Source
This commit is contained in:
Silvan Calarco 2024-12-26 01:14:58 +01:00
parent e55d380488
commit 928e52d5d7
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libcec-6.0.2-libudev-256.patch Normal file
View File

@ -0,0 +1,30 @@
From 898177b5ccf81a91bb3d73196b544c132a16a496 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 12 Jun 2024 12:03:50 +0000
Subject: [PATCH] fix assert issue with systemd udev
---
src/libcec/adapter/Pulse-Eight/USBCECAdapterDetection.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/libcec/adapter/Pulse-Eight/USBCECAdapterDetection.cpp b/src/libcec/adapter/Pulse-Eight/USBCECAdapterDetection.cpp
index 3cb49dd..27c8269 100644
--- a/src/libcec/adapter/Pulse-Eight/USBCECAdapterDetection.cpp
+++ b/src/libcec/adapter/Pulse-Eight/USBCECAdapterDetection.cpp
@@ -370,7 +370,12 @@ uint8_t CUSBCECAdapterDetection::FindAdaptersUdev(cec_adapter_descriptor *device
if (!dev)
continue;
- pdev = udev_device_get_parent(udev_device_get_parent(dev));
+ // do not call udev_device_get_parent(udev_device_get_parent(dev))
+ // directly as a null reurn on the parent will cause an assert in
+ // udev_device_get_parent
+ pdev = udev_device_get_parent(dev);
+ if (pdev)
+ pdev = udev_device_get_parent(pdev);
if (!pdev || !udev_device_get_sysattr_value(pdev, "idVendor") || !udev_device_get_sysattr_value(pdev, "idProduct"))
{
udev_device_unref(dev);
--
2.43.0

10
libcec.spec
View File

@ -1,7 +1,7 @@
Name: libcec Name: libcec
Epoch: 1 Epoch: 1
Version: 6.0.2 Version: 6.0.2
Release: 4mamba Release: 5mamba
Summary: USB CEC Adaptor communication Library Summary: USB CEC Adaptor communication Library
Group: System/Kernel and Hardware Group: System/Kernel and Hardware
Vendor: openmamba Vendor: openmamba
@ -10,6 +10,7 @@ Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://libcec.pulse-eight.com/ URL: https://libcec.pulse-eight.com/
Source: https://github.com/Pulse-Eight/libcec/archive/libcec-%{version}.tar.gz Source: https://github.com/Pulse-Eight/libcec/archive/libcec-%{version}.tar.gz
Patch1: libcec-6.0.2-pythonlib.patch Patch1: libcec-6.0.2-pythonlib.patch
Patch2: libcec-6.0.2-libudev-256.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -64,11 +65,13 @@ This package contains libraries and header files for developing applications tha
%setup -q -n libcec-libcec-%{version} %setup -q -n libcec-libcec-%{version}
#-D -T #-D -T
#:<< _EOF #:<< _EOF
%patch1 -p1 %patch 1 -p1
%patch 2 -p1 -b .libudev-256
%build %build
#:<< _EOF #:<< _EOF
%cmake -d build \ %cmake -d build \
-DHAVE_LINUX_API=1 \
-DPYTHON_INCLUDE_DIR=%{python3_inc} \ -DPYTHON_INCLUDE_DIR=%{python3_inc} \
-DPYTHON_LIBRARY=%{_libdir}/libpython%{python3_version}.so \ -DPYTHON_LIBRARY=%{_libdir}/libpython%{python3_version}.so \
%ifarch arm aarch64 %ifarch arm aarch64
@ -118,6 +121,9 @@ This package contains libraries and header files for developing applications tha
%{python3_sitearch}/cec/cec.py %{python3_sitearch}/cec/cec.py
%changelog %changelog
* Wed Dec 25 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 6.0.2-5mamba
- add patch to fix crash in libudev >= 256 ( https://github.com/LibreELEC/LibreELEC.tv/pull/8982 )
* Sun Nov 10 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 6.0.2-4mamba * Sun Nov 10 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 6.0.2-4mamba
- updated URL; close #1 - updated URL; close #1