lirc-tools: no need to check for clock_gettime

Buildroot no longer supports toolchains with glibc older than 2.17, so there
is no need to check whether librt is required for clock_* system calls.

Cc: Rhys Williams <github@wilberforce.co.nz>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/lirc-tools/0002-configure-check-for-clock_gettime-in-librt.patch b/package/lirc-tools/0002-configure-check-for-clock_gettime-in-librt.patch
deleted file mode 100644 (file)
index 710dfd3..0000000
--- a/package/lirc-tools/0002-configure-check-for-clock_gettime-in-librt.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From e654ae139cec42a6f1b5684261787d0c241cfd3b Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Fri, 19 Aug 2016 15:25:48 +0200
-Subject: [PATCH] configure: check for clock_gettime in librt
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure.ac        | 3 +++
- daemons/Makefile.am | 2 +-
- plugins/Makefile.am | 1 +
- 3 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 73340c7..466e638 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -67,6 +67,9 @@ AC_CHECK_FUNCS(gethostname gettimeofday mkfifo select socket strdup \
- AC_SEARCH_LIBS([dlopen], [dl dld], [], [
-   AC_MSG_ERROR([unable to find the dlopen() function])
- ])
-+# glibc < 2.17 needs librt for clock_gettime()
-+AC_CHECK_LIB(rt, clock_gettime, LIBCLOCK_GETTIME="-lrt")
-+AC_SUBST(LIBCLOCK_GETTIME)
- AC_CHECK_FUNCS(daemon)
- if test "$ac_cv_func_daemon" != yes; then
-   daemon=""
-diff --git a/daemons/Makefile.am b/daemons/Makefile.am
-index 5625627..85a28f3 100644
---- a/daemons/Makefile.am
-+++ b/daemons/Makefile.am
-@@ -21,7 +21,7 @@ sbin_PROGRAMS           += lircd-uinput
- endif
- 
- lircd_SOURCES           = lircd.cpp
--lircd_LDADD             = ../lib/liblirc.la
-+lircd_LDADD             = ../lib/liblirc.la @LIBCLOCK_GETTIME@
- 
- lircd_uinput_SOURCES    = lircd-uinput.cpp
- lircd_uinput_LDADD     = ../lib/liblirc.la
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index ddff01d..45c012a 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -127,6 +127,7 @@ zotac_la_SOURCES            = zotac.c
- 
- plugin_LTLIBRARIES          += mplay.la
- mplay_la_SOURCES            = mplay.c
-+mplay_la_LIBADD             = @LIBCLOCK_GETTIME@
- endif
- 
- $(srcdir)/pluginlist.am:
--- 
-2.7.4
-

diff --git a/package/lirc-tools/0002-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch b/package/lirc-tools/0002-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
new file mode 100644 (file)
index 0000000..9fe5256
--- /dev/null
+++ b/package/lirc-tools/0002-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
@@ -0,0 +1,105 @@
+From 45c590f64dd79e8e1704d5c94ce3456a5cdbfa5f Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Fri, 19 Aug 2016 04:48:02 +0200
+Subject: [PATCH] lircd: Remove use of functions killed in kernel 4.8.0
+
+From 4.8.0 the kernel no longer supports LIRC_NOTIFY_DECODE,
+LIRC_SETUP_START/LIRC_SETUP_END and several constants related
+to initiating filters. Remove corresponding calls from lircd.
+
+[baruch: move DRVCTL_NOTIFY_DECODE into lircd.cpp]
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Patch status: backported from upstream 31fcc8aa39f62c5c
+---
+ daemons/lircd.cpp | 53 ++++-------------------------------------------------
+ 1 file changed, 4 insertions(+), 49 deletions(-)
+
+diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp
+index 782b6d3f8342..d778aa19308b 100644
+--- a/daemons/lircd.cpp
++++ b/daemons/lircd.cpp
+@@ -78,6 +78,8 @@
+ #define lirc_gid gid_t
+ #endif
+ 
++#define DRVCTL_NOTIFY_DECODE          7
++
+ #ifdef DARWIN
+ #include <mach/mach_time.h>
+ #define CLOCK_REALTIME 0
+@@ -462,50 +464,6 @@ static int setup_timeout(void)
+ }
+ 
+ 
+-static int setup_filter(void)
+-{
+-      int ret1, ret2;
+-      lirc_t min_pulse_supported = 0, max_pulse_supported = 0;
+-      lirc_t min_space_supported = 0, max_space_supported = 0;
+-
+-      if (!(curr_driver->features & LIRC_CAN_SET_REC_FILTER))
+-              return 1;
+-      if (curr_driver->drvctl_func(LIRC_GET_MIN_FILTER_PULSE,
+-                                   &min_pulse_supported) == -1 ||
+-          curr_driver->drvctl_func(LIRC_GET_MAX_FILTER_PULSE, &max_pulse_supported) == -1
+-          || curr_driver->drvctl_func(LIRC_GET_MIN_FILTER_SPACE, &min_space_supported) == -1
+-          || curr_driver->drvctl_func(LIRC_GET_MAX_FILTER_SPACE, &max_space_supported) == -1) {
+-              log_error("could not get filter range");
+-              log_perror_err(__func__);
+-      }
+-
+-      if (setup_min_pulse > max_pulse_supported)
+-              setup_min_pulse = max_pulse_supported;
+-      else if (setup_min_pulse < min_pulse_supported)
+-              setup_min_pulse = 0;    /* disable filtering */
+-
+-      if (setup_min_space > max_space_supported)
+-              setup_min_space = max_space_supported;
+-      else if (setup_min_space < min_space_supported)
+-              setup_min_space = 0;    /* disable filtering */
+-
+-      ret1 = curr_driver->drvctl_func(LIRC_SET_REC_FILTER_PULSE, &setup_min_pulse);
+-      ret2 = curr_driver->drvctl_func(LIRC_SET_REC_FILTER_SPACE, &setup_min_space);
+-      if (ret1 == -1 || ret2 == -1) {
+-              if (curr_driver->
+-                  drvctl_func(LIRC_SET_REC_FILTER,
+-                              setup_min_pulse < setup_min_space ? &setup_min_pulse : &setup_min_space) == -1) {
+-                      log_error("could not set filter");
+-                      log_perror_err(__func__);
+-                      return 0;
+-              }
+-      }
+-      return 1;
+-}
+-
+-
+-
+-
+ static int setup_hardware(void)
+ {
+       int ret = 1;
+@@ -514,10 +472,7 @@ static int setup_hardware(void)
+               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)) {
+-                      (void)curr_driver->drvctl_func(LIRC_SETUP_START, NULL);
+-                      ret = setup_frequency() && setup_timeout()
+-                            && setup_filter();
+-                      (void)curr_driver->drvctl_func(LIRC_SETUP_END, NULL);
++                              ret = setup_frequency() && setup_timeout();
+               }
+       }
+       return ret;
+@@ -2162,7 +2117,7 @@ void loop(void)
+                       int reps;
+ 
+                       if (curr_driver->drvctl_func && (curr_driver->features & LIRC_CAN_NOTIFY_DECODE))
+-                              curr_driver->drvctl_func(LIRC_NOTIFY_DECODE, NULL);
++                              curr_driver->drvctl_func(DRVCTL_NOTIFY_DECODE, NULL);
+ 
+                       get_release_data(&remote_name, &button_name, &reps);
+ 
+-- 
+2.9.3
+

diff --git a/package/lirc-tools/0003-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch b/package/lirc-tools/0003-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
deleted file mode 100644 (file)
index 9fe5256..0000000
--- a/package/lirc-tools/0003-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 45c590f64dd79e8e1704d5c94ce3456a5cdbfa5f Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Fri, 19 Aug 2016 04:48:02 +0200
-Subject: [PATCH] lircd: Remove use of functions killed in kernel 4.8.0
-
-From 4.8.0 the kernel no longer supports LIRC_NOTIFY_DECODE,
-LIRC_SETUP_START/LIRC_SETUP_END and several constants related
-to initiating filters. Remove corresponding calls from lircd.
-
-[baruch: move DRVCTL_NOTIFY_DECODE into lircd.cpp]
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Patch status: backported from upstream 31fcc8aa39f62c5c
----
- daemons/lircd.cpp | 53 ++++-------------------------------------------------
- 1 file changed, 4 insertions(+), 49 deletions(-)
-
-diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp
-index 782b6d3f8342..d778aa19308b 100644
---- a/daemons/lircd.cpp
-+++ b/daemons/lircd.cpp
-@@ -78,6 +78,8 @@
- #define lirc_gid gid_t
- #endif
- 
-+#define DRVCTL_NOTIFY_DECODE          7
-+
- #ifdef DARWIN
- #include <mach/mach_time.h>
- #define CLOCK_REALTIME 0
-@@ -462,50 +464,6 @@ static int setup_timeout(void)
- }
- 
- 
--static int setup_filter(void)
--{
--      int ret1, ret2;
--      lirc_t min_pulse_supported = 0, max_pulse_supported = 0;
--      lirc_t min_space_supported = 0, max_space_supported = 0;
--
--      if (!(curr_driver->features & LIRC_CAN_SET_REC_FILTER))
--              return 1;
--      if (curr_driver->drvctl_func(LIRC_GET_MIN_FILTER_PULSE,
--                                   &min_pulse_supported) == -1 ||
--          curr_driver->drvctl_func(LIRC_GET_MAX_FILTER_PULSE, &max_pulse_supported) == -1
--          || curr_driver->drvctl_func(LIRC_GET_MIN_FILTER_SPACE, &min_space_supported) == -1
--          || curr_driver->drvctl_func(LIRC_GET_MAX_FILTER_SPACE, &max_space_supported) == -1) {
--              log_error("could not get filter range");
--              log_perror_err(__func__);
--      }
--
--      if (setup_min_pulse > max_pulse_supported)
--              setup_min_pulse = max_pulse_supported;
--      else if (setup_min_pulse < min_pulse_supported)
--              setup_min_pulse = 0;    /* disable filtering */
--
--      if (setup_min_space > max_space_supported)
--              setup_min_space = max_space_supported;
--      else if (setup_min_space < min_space_supported)
--              setup_min_space = 0;    /* disable filtering */
--
--      ret1 = curr_driver->drvctl_func(LIRC_SET_REC_FILTER_PULSE, &setup_min_pulse);
--      ret2 = curr_driver->drvctl_func(LIRC_SET_REC_FILTER_SPACE, &setup_min_space);
--      if (ret1 == -1 || ret2 == -1) {
--              if (curr_driver->
--                  drvctl_func(LIRC_SET_REC_FILTER,
--                              setup_min_pulse < setup_min_space ? &setup_min_pulse : &setup_min_space) == -1) {
--                      log_error("could not set filter");
--                      log_perror_err(__func__);
--                      return 0;
--              }
--      }
--      return 1;
--}
--
--
--
--
- static int setup_hardware(void)
- {
-       int ret = 1;
-@@ -514,10 +472,7 @@ static int setup_hardware(void)
-               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)) {
--                      (void)curr_driver->drvctl_func(LIRC_SETUP_START, NULL);
--                      ret = setup_frequency() && setup_timeout()
--                            && setup_filter();
--                      (void)curr_driver->drvctl_func(LIRC_SETUP_END, NULL);
-+                              ret = setup_frequency() && setup_timeout();
-               }
-       }
-       return ret;
-@@ -2162,7 +2117,7 @@ void loop(void)
-                       int reps;
- 
-                       if (curr_driver->drvctl_func && (curr_driver->features & LIRC_CAN_NOTIFY_DECODE))
--                              curr_driver->drvctl_func(LIRC_NOTIFY_DECODE, NULL);
-+                              curr_driver->drvctl_func(DRVCTL_NOTIFY_DECODE, NULL);
- 
-                       get_release_data(&remote_name, &button_name, &reps);
- 
--- 
-2.9.3
-

diff --git a/package/lirc-tools/lirc-tools.mk b/package/lirc-tools/lirc-tools.mk
index 6fd6434ef822da4e4b2c22408c383664a9ec9133..f0eff91f5f4f408d62813c8fd76605e98d84a42f 100644 (file)
--- a/package/lirc-tools/lirc-tools.mk
+++ b/package/lirc-tools/lirc-tools.mk
@@ -11,8 +11,6 @@ LIRC_TOOLS_LICENSE = GPL-2.0+
 LIRC_TOOLS_LICENSE_FILES = COPYING
 LIRC_TOOLS_DEPENDENCIES = host-libxslt host-pkgconf host-python3
 LIRC_TOOLS_INSTALL_STAGING = YES
-# 0002-configure-check-for-clock_gettime-in-librt.patch
-LIRC_TOOLS_AUTORECONF = YES
 
 LIRC_TOOLS_CONF_ENV = XSLTPROC=yes
 LIRC_TOOLS_CONF_OPTS = --without-x