lirc build broken [was: [GIT PULL for v5.18-rc1] media updates]

From: Jiri Slaby
Date: Wed May 25 2022 - 02:44:46 EST


On 25. 05. 22, 8:42, Jiri Slaby wrote:
On 22. 03. 22, 10:14, Mauro Carvalho Chehab wrote:
Hi Linus,

Please pull from:
   git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v5.18-1
...
Sean Young (10):
...
       media: lirc: remove unused lirc features

Hi,

this breaks lirc build:
[   59s] lircd.cpp:489:49: error: 'LIRC_CAN_SET_REC_FILTER' was not declared in this scope; did you mean 'LIRC_CAN_SET_REC_CARRIER'?
[   59s]   489 |                     || (curr_driver->features & LIRC_CAN_SET_REC_FILTER)) {
[   59s]       | ^~~~~~~~~~~~~~~~~~~~~~~
[   59s]       | LIRC_CAN_SET_REC_CARRIER
[   59s] lircd.cpp: In function 'void loop()':
[   59s] lircd.cpp:2069:82: error: 'LIRC_CAN_NOTIFY_DECODE' was not declared in this scope; did you mean 'DRVCTL_NOTIFY_DECODE'?
[   59s]  2069 |                         if (curr_driver->drvctl_func && (curr_driver->features & LIRC_CAN_NOTIFY_DECODE))
[   59s] | ^~~~~~~~~~~~~~~~~~~~~~
[   59s] | DRVCTL_NOTIFY_DECODE

So the uapi header defines should be brought back, IMO.

(And lirc fixed at the same time.)

thanks,--
js