[arch-commits] Commit in lirc/trunk (3 files)

Jan Steffens heftig at archlinux.org
Sat Dec 17 18:59:40 UTC 2016


    Date: Saturday, December 17, 2016 @ 18:59:39
  Author: heftig
Revision: 284273

Add patches from http://pkgs.fedoraproject.org/cgit/rpms/lirc.git

Added:
  lirc/trunk/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
  lirc/trunk/0006-lirc.pc-Fix-bad-library-specification-236.patch
  lirc/trunk/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch

-----------------------------------------------------------------+
 0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch  |   35 +++++++++
 0006-lirc.pc-Fix-bad-library-specification-236.patch            |   23 ++++++
 0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch |   38 ++++++++++
 3 files changed, 96 insertions(+)

Added: 0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
===================================================================
--- 0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch	                        (rev 0)
+++ 0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch	2016-12-17 18:59:39 UTC (rev 284273)
@@ -0,0 +1,35 @@
+From 33c40d127877179e0cba2f6595816377bb6bcda1 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec at 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
+ 
+-- 
+2.5.5
+

Added: 0006-lirc.pc-Fix-bad-library-specification-236.patch
===================================================================
--- 0006-lirc.pc-Fix-bad-library-specification-236.patch	                        (rev 0)
+++ 0006-lirc.pc-Fix-bad-library-specification-236.patch	2016-12-17 18:59:39 UTC (rev 284273)
@@ -0,0 +1,23 @@
+From 916a48ffcb9f1c259a0fc778a2de1be729423092 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec at 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}
+-- 
+2.5.5
+

Added: 0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
===================================================================
--- 0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch	                        (rev 0)
+++ 0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch	2016-12-17 18:59:39 UTC (rev 284273)
@@ -0,0 +1,38 @@
+From 0463f56357d1dd223a4d2882dbc460a0a7a7e9ad Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec at 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])
+ 
+-- 
+2.5.5
+



More information about the arch-commits mailing list