Merge pull request LibreELEC#1101 from Kwiboo/lirc-python

Update lirc

packages/devel/libirman/patches/libirman-0001-fix-poll-include.patch

@@ -0,0 +1,35 @@
+diff -Naur a/config.h.in b/config.h.in
+--- a/config.h.in	2016-05-18 18:19:56.000000000 +0200
++++ b/config.h.in	2016-12-26 22:49:43.514203152 +0100
+@@ -21,6 +21,9 @@
+ /* Define to 1 if you have the `mkfifo' function. */
+ #undef HAVE_MKFIFO
+
++/* defined if poll.h is available */
++#undef HAVE_POLL_H
++
+ /* Define to 1 if you have the `select' function. */
+ #undef HAVE_SELECT
+
+@@ -48,6 +51,9 @@
+ /* Define to 1 if you have the <sys/file.h> header file. */
+ #undef HAVE_SYS_FILE_H
+
++/* defined if sys/poll.h is available */
++#undef HAVE_SYS_POLL_H
++
+ /* Define to 1 if you have the <sys/stat.h> header file. */
+ #undef HAVE_SYS_STAT_H
+
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac	2016-05-18 18:19:41.000000000 +0200
++++ b/configure.ac	2016-12-26 22:48:40.190031280 +0100
+@@ -20,7 +20,7 @@
+
+ dnl Checks for header files.
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h termios.h memory.hi sys/file.h)
++AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h termios.h memory.hi sys/file.h poll.h sys/poll.h)
+
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_TYPE_PID_T

packages/sysutils/eventlircd/udev.d/98-eventlircd.rules

@@ -30,6 +30,9 @@ ATTRS{name}=="eventlircd", GOTO="end"
 ATTRS{name}=="lircd", \
   ENV{eventlircd_enable}="true"
 
+ATTRS{name}=="lircd-uinput", \
+  ENV{eventlircd_enable}="true"
+
 #-------------------------------------------------------------------------------
 # Ask eventlircd to handle input event devices created by bdremoteng. For this
 # to work, bdremoteng must be configured to output Linux input events and must

packages/sysutils/lirc/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="lirc"
-PKG_VERSION="0.9.4"
+PKG_VERSION="0.9.4c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -31,19 +31,14 @@ PKG_LONGDESC="LIRC is a package that allows you to decode and send infra-red sig
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-PKG_CONFIGURE_OPTS_TARGET="ac_cv_path_LIBUSB_CONFIG= /
-                           ac_cv_func_forkpty=no \
+PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_forkpty=no \
                            ac_cv_lib_util_forkpty=no \
                            ac_cv_prog_HAVE_PYTHON3=no \
                            --localstatedir=/ \
                            --with-gnu-ld \
                            --without-x"
 
 post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin/pronto2lirc
-  rm -rf $INSTALL/usr/bin/lirc-setup
-  rm -rf $INSTALL/usr/sbin/lircd-setup
-  rm -rf $INSTALL/usr/lib/python3.4
   rm -rf $INSTALL/usr/lib/systemd
   rm -rf $INSTALL/lib
   rm -rf $INSTALL/usr/share

packages/sysutils/lirc/patches/lirc-0002-disable-python3.patch

@@ -1,38 +1,43 @@
 diff -Naur a/configure.ac b/configure.ac
 --- a/configure.ac	2016-06-08 13:06:09.757102470 -0700
 +++ b/configure.ac	2016-06-08 13:07:04.620705345 -0700
-@@ -41,8 +41,8 @@
+@@ -40,9 +40,9 @@
+ AM_CONDITIONAL(HAVE_DOXYGEN, test x$DOXYGEN = xyes)
  AC_PROG_LN_S
  LT_INIT([disable-static])
- AM_PATH_PYTHON([3.1],,)
+-AM_PATH_PYTHON([3.1],,)
 -AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != ""])
 -AC_CHECK_PROG([HAVE_PYTHON3],[python3],[yes],[no])
-+AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" == ""])
++AM_PATH_PYTHON([3.1],,[:])
++AM_CONDITIONAL([HAVE_PYTHON], [false])
 +AC_CHECK_PROG([HAVE_PYTHON3],[python3],[no],[no])
  LIBUSB_CONFIG="pkg-config libusb"
 
  dnl Checks for header files.
 diff -Naur a/tools/Makefile.am b/tools/Makefile.am
 --- a/tools/Makefile.am	2016-05-23 10:18:48.000000000 -0700
 +++ b/tools/Makefile.am	2016-06-08 13:15:25.711341537 -0700
-@@ -114,19 +114,12 @@
+@@ -114,22 +114,7 @@
 
  install-exec-hook:
  	$(SED) -i -e 's/@version@/$(VERSION)/' \
 -	    $(DESTDIR)$(bindir)/lirc-config-tool \
 -	    $(DESTDIR)$(bindir)/irdb-get
-+	    $(DESTDIR)$(bindir)/lirc-config-tool
- 	rm -f $(DESTDIR)/$(bindir)/lirc-setup
- 	$(srcdir)/make_rel_symlink.py \
- 	    $(DESTDIR)/$(pkgpythondir)/lirc-setup \
- 	    $(DESTDIR)/$(bindir)/lirc-setup
-
+-	rm -f $(DESTDIR)/$(bindir)/lirc-setup
+-	$(srcdir)/make_rel_symlink.py \
+-	    $(DESTDIR)/$(pkgpythondir)/lirc-setup \
+-	    $(DESTDIR)/$(bindir)/lirc-setup
+-
 -install-data-hook:
 -	rm -f $(DESTDIR)/$(pkgpythondir)/configs
 -	$(srcdir)/make_rel_symlink.py \
 -	    $(DESTDIR)$(pkgdatadir)/configs \
 -	    $(DESTDIR)$(pkgpythondir)/configs
 -
- uninstall-hook:
- 	rm -f $(DESTDIR)/$(bindir)/lirc-setup \
- 	      $(DESTDIR)/$(pkgpythondir)/configs
+-uninstall-hook:
+-	rm -f $(DESTDIR)/$(bindir)/lirc-setup \
+-	      $(DESTDIR)/$(pkgpythondir)/configs
++	    $(DESTDIR)$(bindir)/lirc-config-tool
+
+ clean-local:
+ 	-find . -name __pycache__ -exec rm -r {} \;