diff --git a/hardware/irda/lirc/actions.py b/hardware/irda/lirc/actions.py index 33c536f15f..67435337ad 100644 --- a/hardware/irda/lirc/actions.py +++ b/hardware/irda/lirc/actions.py @@ -43,5 +43,5 @@ def install(): pisitools.rename("/%s/%s" % (get.docDIR(), get.srcNAME()), "lirc") pisitools.insinto("/%s/lirc/contrib" % get.docDIR(), "contrib/*") - pisitools.insinto("/lib/udev/rules.d", "contrib/lirc.rules", "10-lirc.rules") + pisitools.insinto("/lib/udev/rules.d", "contrib/*.rules", "60-lirc.rules") diff --git a/hardware/irda/lirc/files/Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch b/hardware/irda/lirc/files/Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch new file mode 100644 index 0000000000..bb880efc9a --- /dev/null +++ b/hardware/irda/lirc/files/Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch @@ -0,0 +1,36 @@ +From 0463f56357d1dd223a4d2882dbc460a0a7a7e9ad Mon Sep 17 00:00:00 2001 +From: Alec Leamas +Date: Sat, 29 Oct 2016 11:06:50 +0200 +Subject: [PATCH 07/10] Build: Use HAVE_UINPUT=1 to force building uinput code + (#238). + +--- + configure.ac | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index cde9813..08e2c8e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -33,7 +33,7 @@ if test x$XSLTPROC != "xyes"; then + AC_MSG_ERROR([ + xsltproc is required to build. It usually comes with libxml]) + fi +-AM_CONDITIONAL(HAVE_UINPUT, test -e /dev/uinput) ++AM_CONDITIONAL(HAVE_UINPUT, test -n "$HAVE_UINPUT" -o -e /dev/uinput) + AC_CHECK_PROG([MAN2HTML],[man2html],[yes],[no]) + AM_CONDITIONAL(HAVE_MAN2HTML, test x$MAN2HTML = xyes) + AC_CHECK_PROG([DOXYGEN],[doxygen],[yes],[no]) +@@ -446,6 +446,11 @@ AM_CONDITIONAL(NEED_PYTHON3, [test "x$enable_python3_fix" = "xyes"]) + AC_ARG_VAR(HAVE_WORKING_POLL,[ + On cross-compile: Target has a working poll(2) implementation]) + ++AC_ARG_VAR(HAVE_UINPUT,[ ++ If not-empty, assume uinput is available despite missing /dev/uinput ++]) ++ ++ + suffix=$(echo "$VERSION" | sed 's/.*-//') + AM_CONDITIONAL(DEVEL, [test x$suffix = xdevel]) + +-- diff --git a/hardware/irda/lirc/files/lirc-configure-libudev.patch b/hardware/irda/lirc/files/lirc-configure-libudev.patch new file mode 100644 index 0000000000..bcca38a664 --- /dev/null +++ b/hardware/irda/lirc/files/lirc-configure-libudev.patch @@ -0,0 +1,22 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -48,7 +48,7 @@ + dnl Checks for header files. + AC_HEADER_STDC + AC_HEADER_TIME +-AC_CHECK_HEADERS([fcntl.h limits.h poll.h sys/ioctl.h sys/poll.h sys/time.h ]) ++AC_CHECK_HEADERS([fcntl.h libudev.h limits.h poll.h sys/ioctl.h sys/poll.h sys/time.h ]) + AC_CHECK_HEADERS([syslog.h unistd.h util.h libutil.h pty.h]) + + dnl Checks for typedefs, structures, and compiler characteristics. +@@ -390,6 +390,10 @@ + AC_DEFINE(HAVE_SYSTEMD) + fi + ++PKG_CHECK_MODULES([LIBUDEV],[libudev],,[true]) ++CFLAGS="$CFLAGS $LIBUDEV_CFLAGS" ++LIBS="$LIBS $LIBUDEV_LIBS" ++ + dnl Ubuntu's systemd pkg-config seems broken beyond repair. So: + kernelversion=`cat /proc/version || echo "non-linux"` + case $kernelversion in diff --git a/hardware/irda/lirc/files/lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch b/hardware/irda/lirc/files/lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch new file mode 100644 index 0000000000..a9003f2850 --- /dev/null +++ b/hardware/irda/lirc/files/lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch @@ -0,0 +1,33 @@ +From 33c40d127877179e0cba2f6595816377bb6bcda1 Mon Sep 17 00:00:00 2001 +From: Alec Leamas +Date: Tue, 25 Oct 2016 10:28:14 +0200 +Subject: [PATCH 05/10] lib: curl_poll.h: Ensure build on unconfiguredclients. + +--- + lib/curl_poll.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/curl_poll.h b/lib/curl_poll.h +index 6144c42..af25381 100644 +--- a/lib/curl_poll.h ++++ b/lib/curl_poll.h +@@ -21,7 +21,9 @@ + * KIND, either express or implied. + * + ***************************************************************************/ ++#ifdef HAVE_CONFIG_H + #include "config.h" ++#endif + + #ifdef __cplusplus + extern "C" { +@@ -29,7 +31,7 @@ extern "C" { + + #ifdef HAVE_SYS_POLL_H + #include +-#elif defined(HAVE_POLL_H) ++#else + #include + #endif + +-- diff --git a/hardware/irda/lirc/files/lirc.pc-Fix-bad-library-specification-236.patch b/hardware/irda/lirc/files/lirc.pc-Fix-bad-library-specification-236.patch new file mode 100644 index 0000000000..951d896203 --- /dev/null +++ b/hardware/irda/lirc/files/lirc.pc-Fix-bad-library-specification-236.patch @@ -0,0 +1,21 @@ +From 916a48ffcb9f1c259a0fc778a2de1be729423092 Mon Sep 17 00:00:00 2001 +From: Alec Leamas +Date: Tue, 25 Oct 2016 21:29:27 +0200 +Subject: [PATCH 06/10] lirc.pc: Fix bad library specification (#236). + +--- + lirc.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lirc.pc.in b/lirc.pc.in +index 802f00e..5ed7c1c 100644 +--- a/lirc.pc.in ++++ b/lirc.pc.in +@@ -10,5 +10,5 @@ includedir=@includedir@ + pkgdatadir=@datadir@/lirc + plugindir=${libdir}/lirc/plugins + +-Libs: -L${libdir} -llirc ++Libs: -L${libdir} -llirc_client + Cflags: -I${includedir} +-- diff --git a/hardware/irda/lirc/pspec.xml b/hardware/irda/lirc/pspec.xml index 8fb577ca2a..937f0ffb17 100644 --- a/hardware/irda/lirc/pspec.xml +++ b/hardware/irda/lirc/pspec.xml @@ -13,7 +13,7 @@ service Linux Infrared Remote Control system lirc is a package that allows you to decode and send infra-red signals of many (but not all) commonly used remote controls. - http://downloads.sourceforge.net/project/lirc/LIRC/0.9.3/lirc-0.9.3.tar.bz2 + https://sourceforge.net/projects/lirc/files/LIRC/0.9.4c/lirc-0.9.4c.tar.bz2 alsa-lib-devel libftdi-devel @@ -23,6 +23,12 @@ doxygen python3-devel + + lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch + lirc-configure-libudev.patch + lirc.pc-Fix-bad-library-specification-236.patch + Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch + @@ -32,6 +38,9 @@ libftdi libusb-compat libX11 + eudev + libgcc + libusb /etc @@ -40,8 +49,10 @@ /usr/lib /usr/sbin /usr/share/doc - /usr/share/man - /usr/share/lirc + /usr/share/man/man1 + /usr/share/man/man5 + /usr/share/man/man8 + /usr/share/lirc /run @@ -66,6 +77,13 @@ + + 2017-01-29 + 0.9.4c + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + 2016-06-09 0.9.3