From: Sean Young <sean@mess.org>
To: Jiri Slaby <jirislaby@kernel.org>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
Linux Media Mailing List <linux-media@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL for v5.18-rc1] media updates
Date: Wed, 25 May 2022 09:49:36 +0100 [thread overview]
Message-ID: <Yo3toKslhxi24w3p@gofer.mess.org> (raw)
In-Reply-To: <8093277c-5098-e5e3-f606-486de5b2f67b@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 379 bytes --]
On Wed, May 25, 2022 at 10:09:38AM +0200, Jiri Slaby wrote:
> Be it umaintained or not, it's still in distributions (the above is from
> opensuse build system) and it is broken now. Every single distributor now
> would have to go and fix this.
I am happy to help out with this issue, since lircd upstream does not accept
patches. I've attached a patch for your perusal.
Sean
[-- Attachment #2: lirc.patch --]
[-- Type: text/x-diff, Size: 1899 bytes --]
diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp
index 4cceab7e..9f4ee0cc 100644
--- a/daemons/lircd.cpp
+++ b/daemons/lircd.cpp
@@ -488,9 +488,8 @@ static int setup_hardware(void)
if (curr_driver->fd != -1 && curr_driver->drvctl_func) {
if ((curr_driver->features & LIRC_CAN_SET_REC_CARRIER)
- || (curr_driver->features & LIRC_CAN_SET_REC_TIMEOUT)
- || (curr_driver->features & LIRC_CAN_SET_REC_FILTER)) {
- ret = setup_frequency() && setup_timeout();
+ || (curr_driver->features & LIRC_CAN_SET_REC_TIMEOUT)) {
+ ret = setup_frequency() && setup_timeout();
}
}
return ret;
@@ -2180,13 +2177,6 @@ void loop(void)
const char* button_name;
int reps;
- if (curr_driver->drvctl_func
- && (curr_driver->features & LIRC_CAN_NOTIFY_DECODE)
- ) {
- curr_driver->drvctl_func(DRVCTL_NOTIFY_DECODE,
- NULL);
- }
-
get_release_data(&remote_name, &button_name, &reps);
input_message(message, remote_name, button_name, reps);
diff --git a/tools/lirc-lsplugins.cpp b/tools/lirc-lsplugins.cpp
index ba67a3cb..6251ac65 100644
--- a/tools/lirc-lsplugins.cpp
+++ b/tools/lirc-lsplugins.cpp
@@ -57,8 +57,7 @@
"# c: LIRC_CAN_SET_SEND_CARRIER\n" \
"# d: LIRC_CAN_SET_SEND_DUTY_CYCLE\n" \
"# t: LIRC_CAN_SET_TRANSMITTER_MASK\n" \
- "# C: LIRC_CAN_MEASURE_CARRIER\n" \
- "# D: LIRC_CAN_NOTIFY_DECODE\n"
+ "# C: LIRC_CAN_MEASURE_CARRIER\n"
const struct option options[] = {
{ "plugindir", required_argument, NULL, 'U' },
@@ -303,8 +302,7 @@ static void format_features(struct driver* hw, line_t* line)
get(LIRC_CAN_SET_SEND_CARRIER, 'c', hw),
get(LIRC_CAN_SET_SEND_DUTY_CYCLE, 'd', hw),
get(LIRC_CAN_SET_TRANSMITTER_MASK, 't', hw),
- get(LIRC_CAN_MEASURE_CARRIER, 'C', hw),
- get(LIRC_CAN_NOTIFY_DECODE, 'D', hw)
+ get(LIRC_CAN_MEASURE_CARRIER, 'C', hw)
);
line->features = strdup(buff);
}
next prev parent reply other threads:[~2022-05-25 8:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-22 9:14 [GIT PULL for v5.18-rc1] media updates Mauro Carvalho Chehab
2022-03-23 23:36 ` pr-tracker-bot
2022-05-25 6:42 ` Jiri Slaby
2022-05-25 6:44 ` lirc build broken [was: [GIT PULL for v5.18-rc1] media updates] Jiri Slaby
2022-05-25 8:57 ` Sean Young
2022-05-25 7:40 ` [GIT PULL for v5.18-rc1] media updates Sean Young
2022-05-25 8:09 ` Jiri Slaby
2022-05-25 8:49 ` Sean Young [this message]
2022-05-25 9:10 ` Sean Young
2022-05-25 10:46 ` Jiri Slaby
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Yo3toKslhxi24w3p@gofer.mess.org \
--to=sean@mess.org \
--cc=akpm@linux-foundation.org \
--cc=gregkh@linuxfoundation.org \
--cc=jirislaby@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).