Merge pull request #2660 from groni/master

lirc version bump
2017-01-29 16:47:37 +01:00
parent a9e19d2d66 5f78f36950
commit 0bef5c406d
6 changed files with 134 additions and 4 deletions
@@ -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")

@@ -0,0 +1,36 @@
+From 0463f56357d1dd223a4d2882dbc460a0a7a7e9ad Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+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])
+ 
+--  
@@ -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 
@@ -0,0 +1,33 @@
+From 33c40d127877179e0cba2f6595816377bb6bcda1 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+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 <sys/poll.h>
+-#elif defined(HAVE_POLL_H)
+#else
+ #include <poll.h>
+ #endif
+ 
+--  
@@ -0,0 +1,21 @@
+From 916a48ffcb9f1c259a0fc778a2de1be729423092 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+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}
+-- 
@@ -13,7 +13,7 @@
        <IsA>service</IsA>
        <Summary>Linux Infrared Remote Control system</Summary>
        <Description>lirc is a package that allows you to decode and send infra-red signals of many (but not all) commonly used remote controls.</Description>
-        <Archive sha1sum="6c1f1daa1fe4c020f4e349f1dd2c7fec759f939a" type="tarbz2">http://downloads.sourceforge.net/project/lirc/LIRC/0.9.3/lirc-0.9.3.tar.bz2</Archive>
+        <Archive sha1sum="e6a04fa7447b2c3bc5bac7658fa2cc377ae133ed" type="tarbz2">https://sourceforge.net/projects/lirc/files/LIRC/0.9.4c/lirc-0.9.4c.tar.bz2</Archive>
        <BuildDependencies>
            <Dependency>alsa-lib-devel</Dependency>
            <Dependency>libftdi-devel</Dependency>
@@ -23,6 +23,12 @@
            <Dependency>doxygen</Dependency>
            <Dependency>python3-devel</Dependency>
        </BuildDependencies>
+        <Patches>
+            <Patch level="1">lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch</Patch>
+            <Patch level="1">lirc-configure-libudev.patch</Patch>
+            <Patch level="1">lirc.pc-Fix-bad-library-specification-236.patch</Patch>
+            <Patch level="1">Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch</Patch>
+        </Patches>
        </Source>

    <Package>
@@ -32,6 +38,9 @@
            <Dependency>libftdi</Dependency>
            <Dependency>libusb-compat</Dependency>
            <Dependency>libX11</Dependency>
+            <Dependency>eudev</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>libusb</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="config">/etc</Path>
@@ -40,8 +49,10 @@
            <Path fileType="library">/usr/lib</Path>
            <Path fileType="executable">/usr/sbin</Path>
            <Path fileType="doc">/usr/share/doc</Path>
-            <Path fileType="man">/usr/share/man</Path>
-            <Path fileType="man">/usr/share/lirc</Path>
+            <Path fileType="man">/usr/share/man/man1</Path>
+            <Path fileType="man">/usr/share/man/man5</Path>
+            <Path fileType="man">/usr/share/man/man8</Path>
+            <Path fileType="data">/usr/share/lirc</Path>
            <Path fileType="data">/run</Path>
        </Files>
        <AdditionalFiles>
@@ -66,6 +77,13 @@
    </Package>

    <History>
+        <Update release="4">
+            <Date>2017-01-29</Date>
+            <Version>0.9.4c</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Stefan Gronewold(groni)</Name>
+            <Email>groni@pisilinux.org</Email>
+        </Update>
        <Update release="3">
            <Date>2016-06-09</Date>
            <Version>0.9.3</Version>