cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

lirc: adapt to linux-headers-5.18

Browse source 
Without the change update to linux-header-5.18 causes build failure as:

    lircd.cpp: In function 'int setup_hardware()':
    lircd.cpp:492:49: error: 'LIRC_CAN_SET_REC_FILTER' was not declared in this scope; did you mean 'LIRC_CAN_SET_REC_CARRIER'?
      492 |                     || (curr_driver->features & LIRC_CAN_SET_REC_FILTER)) {
          |                                                 ^~~~~~~~~~~~~~~~~~~~~~~
          |                                                 LIRC_CAN_SET_REC_CARRIER
This commit is contained in:
Sergei Trofimovich 2022-05-25 21:59:44 +01:00
parent f905feccd0
commit 026cf7ac48
2 changed files with 46 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/libraries/lirc/default.nix
View file

@ -10,11 +10,17 @@ stdenv.mkDerivation rec {
sha256 = "1whlyifvvc7w04ahq07nnk1h18wc8j7c6wnvlb6mszravxh3qxcb";
};
# Fix installation of Python bindings
patches = [ (fetchpatch {
url = "https://sourceforge.net/p/lirc/tickets/339/attachment/0001-Fix-Python-bindings.patch";
sha256 = "088a39x8c1qd81qwvbiqd6crb2lk777wmrs8rdh1ga06lglyvbly";
}) ];
patches = [
# Fix installation of Python bindings
(fetchpatch {
url = "https://sourceforge.net/p/lirc/tickets/339/attachment/0001-Fix-Python-bindings.patch";
sha256 = "088a39x8c1qd81qwvbiqd6crb2lk777wmrs8rdh1ga06lglyvbly";
})
# Add a workaround for linux-headers-5.18 until upstream adapts:
# https://sourceforge.net/p/lirc/git/merge-requests/45/
./linux-headers-5.18.patch
];
postPatch = ''
patchShebangs .

35
pkgs/development/libraries/lirc/linux-headers-5.18.patch Normal file
View file

@ -0,0 +1,35 @@
--- a/daemons/lircd.cpp
+++ b/daemons/lircd.cpp
@@ -110,6 +110,17 @@ int clock_gettime(int clk_id, struct timespec *t){
#endif
#define WHITE_SPACE " \t"
+/* Defines removed in linux-headers-5.18:
+ https://sourceforge.net/p/lirc/git/merge-requests/45/
+ */
+#ifndef LIRC_CAN_SET_REC_FILTER
+# define LIRC_CAN_SET_REC_FILTER 0x08000000
+#endif
+
+#ifndef LIRC_CAN_NOTIFY_DECODE
+# define LIRC_CAN_NOTIFY_DECODE 0x01000000
+#endif
+
static const logchannel_t logchannel = LOG_APP;
/** How long we sleep while waiting for busy write sockets. */
--- a/tools/lirc-lsplugins.cpp
+++ b/tools/lirc-lsplugins.cpp
@@ -21,6 +21,12 @@
#include "config.h"
#include "lirc_private.h"
+/* Defines removed in linux-headers-5.18:
+ https://sourceforge.net/p/lirc/git/merge-requests/45/
+ */
+#ifndef LIRC_CAN_NOTIFY_DECODE
+# define LIRC_CAN_NOTIFY_DECODE 0x01000000
+#endif
#define USAGE \
"\nSynopsis:\n" \