diff options
| author | Ewout van Mansom | 2023-05-03 02:13:42 +0200 |
|---|---|---|
| committer | Ewout van Mansom | 2023-05-03 02:13:42 +0200 |
| commit | 4f305cf54ac12a0aa22dc0fa9befd5c052634aa0 (patch) | |
| tree | 6eefe66a592bcc8b9bf161db74ca838e5c054c38 | |
| parent | be73eb618da1b9d577bdcaf749a9514e4c1dd1e0 (diff) | |
| download | aur-4f305cf54ac12a0aa22dc0fa9befd5c052634aa0.tar.gz | |
remove merged patch for libcec workaround
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | pr6.patch | 155 |
3 files changed, 4 insertions, 166 deletions
@@ -1,7 +1,7 @@ pkgbase = cecdaemon-devel pkgdesc = CEC Daemon for linux media centers (development version) pkgver = r4.444ee75 - pkgrel = 4 + pkgrel = 5 url = https://github.com/simons-public/cecdaemon arch = any license = BSD @@ -19,12 +19,9 @@ pkgbase = cecdaemon-devel backup = etc/cecdaemon.conf source = cecdaemon-devel::git+https://github.com/simons-public/cecdaemon.git source = modules-load.conf - source = pr6.patch::https://patch-diff.githubusercontent.com/raw/simons-public/cecdaemon/pull/6.patch sha256sums = SKIP sha256sums = a771c9695d7283f7771adc00b680bd27391e6ac00e9fd026f4796067ee9a87eb - sha256sums = 3474724afc77ac73032e26e53a0e0a3a20ab18044baa5f023e586162e669212c b2sums = SKIP b2sums = 4f298ba1d1fdc19f5b90ea8d9292be9a44c85567995ea14136e401d39ce3c159b43be50f0043d1f10bed6892d24d8f7a6bf04f5a448ee2044f43b07c4c66cee0 - b2sums = f33b961af8870c7091570f225c2cc1e3be0671290202123534cf38eaf418bb94c114ccd07cdd126ef8da400ef26eaf0f877e06f5c7a565d0c48200351b2f99b1 pkgname = cecdaemon-devel @@ -3,7 +3,7 @@ pkgname=cecdaemon-devel pkgver=r4.444ee75 -pkgrel=4 +pkgrel=5 pkgdesc="CEC Daemon for linux media centers (development version)" arch=('any') url="https://github.com/simons-public/cecdaemon" @@ -15,20 +15,16 @@ makedepends=('git' 'python-setuptools') source=( 'cecdaemon-devel::git+https://github.com/simons-public/cecdaemon.git' 'modules-load.conf' - 'pr6.patch::https://patch-diff.githubusercontent.com/raw/simons-public/cecdaemon/pull/6.patch' ) sha256sums=('SKIP' - 'a771c9695d7283f7771adc00b680bd27391e6ac00e9fd026f4796067ee9a87eb' - '3474724afc77ac73032e26e53a0e0a3a20ab18044baa5f023e586162e669212c') + 'a771c9695d7283f7771adc00b680bd27391e6ac00e9fd026f4796067ee9a87eb') b2sums=('SKIP' - '4f298ba1d1fdc19f5b90ea8d9292be9a44c85567995ea14136e401d39ce3c159b43be50f0043d1f10bed6892d24d8f7a6bf04f5a448ee2044f43b07c4c66cee0' - 'f33b961af8870c7091570f225c2cc1e3be0671290202123534cf38eaf418bb94c114ccd07cdd126ef8da400ef26eaf0f877e06f5c7a565d0c48200351b2f99b1') + '4f298ba1d1fdc19f5b90ea8d9292be9a44c85567995ea14136e401d39ce3c159b43be50f0043d1f10bed6892d24d8f7a6bf04f5a448ee2044f43b07c4c66cee0') backup=(etc/cecdaemon.conf) prepare() { cd "${pkgname}" sed -i 's/cec.conf/cecdaemon.conf/' 'examples/cecdaemon.service-example' - patch --forward --strip=1 --input="${srcdir}/pr6.patch" } pkgver() { diff --git a/pr6.patch b/pr6.patch deleted file mode 100644 index e29773f832eb..000000000000 --- a/pr6.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 6a5efeba398383ab40d7aef3a02ad646ad78c850 Mon Sep 17 00:00:00 2001 -From: Ewout van Mansom <ewout@vanmansom.name> -Date: Mon, 1 May 2023 21:02:19 +0200 -Subject: [PATCH] Add workaround utility function to support new Linux CEC - kernel subsystem - ---- - cecdaemon/cecdaemon.py | 3 ++- - cecdaemon/cecusercodes.py | 4 ++-- - cecdaemon/util.py | 20 ++++++++++++++++++++ - requirements.txt | 1 + - tests/remotetest.py | 3 ++- - tests/triggertest.py | 3 ++- - tests/tvtest.py | 3 ++- - 7 files changed, 31 insertions(+), 6 deletions(-) - create mode 100644 cecdaemon/util.py - -diff --git a/cecdaemon/cecdaemon.py b/cecdaemon/cecdaemon.py -index fc7b887..f7665ef 100644 ---- a/cecdaemon/cecdaemon.py -+++ b/cecdaemon/cecdaemon.py -@@ -13,6 +13,7 @@ - from .remote import Remote - from .tv import Tv - from .trigger import Trigger -+from .util import cec_init - - - class CecDaemon(): -@@ -25,7 +26,7 @@ def __init__(self): - self._parse_args() - self._setup_logging() - logging.info('Initializing CEC device, please wait...') -- cec.init() -+ cec_init() - logging.info('CEC Initialized') - - if os.path.isfile(self.args.conffile): -diff --git a/cecdaemon/cecusercodes.py b/cecdaemon/cecusercodes.py -index 1024397..8443581 100644 ---- a/cecdaemon/cecusercodes.py -+++ b/cecdaemon/cecusercodes.py -@@ -6,7 +6,7 @@ - from time import sleep - import cec - from cecdaemon.const import USER_CONTROL_CODES -- -+from .util import cec_init - - def print_keycode(event, *data): - """ Takes a python-cec cec.EVENT_COMMAND callback and prints the user control code -@@ -32,7 +32,7 @@ def main(): - """ - print('Initializing CEC, please wait...') - print('If this takes too long ensure the device is not already in use') -- cec.init() -+ cec_init() - cec.add_callback(print_keycode, 2) - print('CEC device initialized, press remote keys or hit ^C to quit') - -diff --git a/cecdaemon/util.py b/cecdaemon/util.py -new file mode 100644 -index 0000000..8afe024 ---- /dev/null -+++ b/cecdaemon/util.py -@@ -0,0 +1,20 @@ -+""" Utility functions -+""" -+ -+import pyudev -+import cec -+ -+def cec_init(): -+ """ libcec gained support for the new CEC Linux kernel subsystem. However, -+ it currently doesn't use this by default. So we check for the existence -+ of the device created by the new kernel module and then tell libcec -+ to specifically use the new "Linux" interface. -+ """ -+ -+ context = pyudev.Context() -+ devices = list(context.list_devices(subsystem='cec')) -+ -+ if len(devices) > 0: -+ cec.init('Linux') -+ else: -+ cec.init() -\ No newline at end of file -diff --git a/requirements.txt b/requirements.txt -index 7dbebc7..ef4a9b0 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,2 +1,3 @@ - python-uinput>=0.11.2 - cec>=0.2.6 -+pyudev>=0.8 -\ No newline at end of file -diff --git a/tests/remotetest.py b/tests/remotetest.py -index 7538112..95d3363 100755 ---- a/tests/remotetest.py -+++ b/tests/remotetest.py -@@ -5,6 +5,7 @@ - from time import sleep - import cec - from cecdaemon.remote import Remote -+from cecdaemon.util import cec_init - - CONF = { - '0': 'KEY_ENTER', -@@ -16,7 +17,7 @@ - - logging.basicConfig(stream=sys.stdout, level=logging.DEBUG) - --cec.init() -+cec_init() - - remote = Remote(cec, CONF) - -diff --git a/tests/triggertest.py b/tests/triggertest.py -index 4be7672..1a4b1ad 100755 ---- a/tests/triggertest.py -+++ b/tests/triggertest.py -@@ -5,12 +5,13 @@ - from time import sleep - import cec - from cecdaemon.trigger import Trigger -+from cecdaemon.util import cec_init - - CONF = {'standby': '/usr/bin/whoami', 'wake': '/usr/bin/whoami',} - logging.basicConfig(stream=sys.stdout, level=logging.DEBUG) - - trigger = Trigger(cec, CONF) --cec.init() -+cec_init() - - while True: - sleep(1) -diff --git a/tests/tvtest.py b/tests/tvtest.py -index a5b6687..d56f2b0 100755 ---- a/tests/tvtest.py -+++ b/tests/tvtest.py -@@ -6,12 +6,13 @@ - from time import sleep - import cec - from cecdaemon.tv import Tv -+from cecdaemon.util import cec_init - - CONF = {'name': 'TESTSAT'} - - logging.basicConfig(stream=sys.stdout, level=logging.DEBUG) - --cec.init() -+cec_init() - television = Tv(cec, CONF) - - while True: |