[arch-commits] Commit in lirc/trunk (3 files)
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
+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
+
+--
+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.patch2016-12-17
18:59:39 UTC (rev 284273)
@@ -0,0 +1,23 @@
+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}
+--
+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
+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
+
[arch-commits] Commit in lirc/trunk (3 files)
Date: Friday, January 16, 2015 @ 00:18:24
Author: lfleischer
Revision: 229105
lirc: Replace custom patch with upstream patch
Added:
lirc/trunk/0001-tools-Make-make_rel_symlink.py-use-python3.patch
Modified:
lirc/trunk/PKGBUILD
Deleted:
lirc/trunk/0001-make_rel_symlink.py-Fix-Python-3-compatibility.patch
---+
0001-make_rel_symlink.py-Fix-Python-3-compatibility.patch | 36 --
0001-tools-Make-make_rel_symlink.py-use-python3.patch | 42
PKGBUILD |4 -
3 files changed, 44 insertions(+), 38 deletions(-)
Deleted: 0001-make_rel_symlink.py-Fix-Python-3-compatibility.patch
===
--- 0001-make_rel_symlink.py-Fix-Python-3-compatibility.patch 2015-01-15
22:44:04 UTC (rev 229104)
+++ 0001-make_rel_symlink.py-Fix-Python-3-compatibility.patch 2015-01-15
23:18:24 UTC (rev 229105)
@@ -1,36 +0,0 @@
-From 2628ddc723eb8c9209c3d34bed4752fdfbe88115 Mon Sep 17 00:00:00 2001
-From: Lukas Fleischer
-Date: Thu, 15 Jan 2015 21:39:11 +0100
-Subject: [PATCH] make_rel_symlink.py: Fix Python 3 compatibility
-
- tools/make_rel_symlink.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tools/make_rel_symlink.py b/tools/make_rel_symlink.py
-index 5c89305..ff0403a 100755
a/tools/make_rel_symlink.py
-+++ b/tools/make_rel_symlink.py
-@@ -32,16 +32,16 @@ if sys.argv[1] == "-p":
- sys.argv = sys.argv[ 1:]
-
- if len( sys.argv ) != 3:
--print USAGE
-+print(USAGE)
- sys.exit( 1 )
-
- if os.path.isdir( sys.argv[2] ):
--print "Removing link target dir:" + sys.argv[2]
-+print("Removing link target dir:" + sys.argv[2])
- shutil.rmtree( sys.argv[2])
-
- link_path = relative_ln_s( sys.argv[1], sys.argv[2] )
- if just_print:
--print link_path
-+print(link_path)
- else:
- os.chdir( os.path.dirname( sys.argv[2]))
- target = os.path.basename( sys.argv[2])
---
-2.2.2
-
Added: 0001-tools-Make-make_rel_symlink.py-use-python3.patch
===
--- 0001-tools-Make-make_rel_symlink.py-use-python3.patch
(rev 0)
+++ 0001-tools-Make-make_rel_symlink.py-use-python3.patch 2015-01-15
23:18:24 UTC (rev 229105)
@@ -0,0 +1,42 @@
+From 4c30c6f87dda6614978dfab69d417ef3ca83dccf Mon Sep 17 00:00:00 2001
+From: Alec Leamas
+Date: Thu, 11 Dec 2014 04:44:49 +0100
+Subject: [PATCH] tools: Make make_rel_symlink.py use python3.
+
+---
+ tools/make_rel_symlink.py | 8
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tools/make_rel_symlink.py b/tools/make_rel_symlink.py
+index 5c89305..896637f 100755
+--- a/tools/make_rel_symlink.py
b/tools/make_rel_symlink.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+
+ import os
+ import os.path
+@@ -32,16 +32,16 @@ if sys.argv[1] == "-p":
+ sys.argv = sys.argv[ 1:]
+
+ if len( sys.argv ) != 3:
+-print USAGE
++print(USAGE)
+ sys.exit( 1 )
+
+ if os.path.isdir( sys.argv[2] ):
+-print "Removing link target dir:" + sys.argv[2]
++print("Removing link target dir:" + sys.argv[2])
+ shutil.rmtree( sys.argv[2])
+
+ link_path = relative_ln_s( sys.argv[1], sys.argv[2] )
+ if just_print:
+-print link_path
++print(link_path)
+ else:
+ os.chdir( os.path.dirname( sys.argv[2]))
+ target = os.path.basename( sys.argv[2])
+--
+2.2.2
+
Modified: PKGBUILD
===
--- PKGBUILD2015-01-15 22:44:04 UTC (rev 229104)
+++ PKGBUILD2015-01-15 23:18:24 UTC (rev 229105)
@@ -18,7 +18,7 @@
backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf'
'etc/lirc/lircmd.conf')
install=lirc.install
source=("http://prdownloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2";
-0001-make_rel_symlink.py-Fix-Python-3-compatibility.patch
+0001-tools-Make-make_rel_symlink.py-use-python3.patch
lirc.logrotate
irexec.service
lirc.tmpfiles)
@@ -30,7 +30,7 @@
prepare() {
cd "${srcdir}/lirc-${_pkgver}"
- patch -p1 -i ../0001-make_rel_symlink.py-Fix-Python-3-compatibility.patch
+ patch -p1 -i 0001-tools-Make-make_rel_symlink.py-use-python3.patch
}
build() {
[arch-commits] Commit in lirc/trunk (3 files)
Date: Wednesday, August 20, 2014 @ 11:20:55
Author: lfleischer
Revision: 220265
upgpkg: lirc 1:0.9.1.a-3
Fix another segfault.
Added:
lirc/trunk/lirc-0.9.1a-fix-segfaults.patch
Modified:
lirc/trunk/PKGBUILD
Deleted:
lirc/trunk/lirc-0.9.1a-fix-segfault.patch
-+
PKGBUILD|8 +--
lirc-0.9.1a-fix-segfault.patch | 41 ---
lirc-0.9.1a-fix-segfaults.patch | 79 ++
3 files changed, 83 insertions(+), 45 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-08-20 08:32:35 UTC (rev 220264)
+++ PKGBUILD2014-08-20 09:20:55 UTC (rev 220265)
@@ -5,7 +5,7 @@
pkgname=('lirc' 'lirc-utils')
_pkgver=0.9.1a
[[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" ||
pkgver="$_pkgver"
-pkgrel=2
+pkgrel=3
epoch=1
_extramodules=extramodules-3.16-ARCH
arch=('i686' 'x86_64')
@@ -16,13 +16,13 @@
options=('!makeflags' '!strip')
source=("http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${_pkgver}.tar.bz2";
wpc8769l-build-fix.patch
-lirc-0.9.1a-fix-segfault.patch
+lirc-0.9.1a-fix-segfaults.patch
lirc.logrotate
irexec.service
lirc.tmpfiles)
md5sums=('1f1fac162ed309dd50f307e96a292957'
'9ec33169b3407f74264062d7679dd269'
- '13bfc8dbf1a9e30f8ed21ac6c099a676'
+ 'cd00acf480e82a0bf050032732d0d733'
'3deb02604b37811d41816e9b4385fcc3'
'32df3b9bc859565d6acf5f0e5b747083'
'febf25c154a7d36f01159e84f26c2d9a')
@@ -31,7 +31,7 @@
cd "${srcdir}/lirc-${_pkgver}"
patch -Np1 -i "${srcdir}/wpc8769l-build-fix.patch"
- patch -Np1 -i "${srcdir}/lirc-0.9.1a-fix-segfault.patch"
+ patch -Np1 -i "${srcdir}/lirc-0.9.1a-fix-segfaults.patch"
sed -i '/AC_PATH_XTRA/d' configure.ac
sed -e 's/@X_CFLAGS@//g' \
Deleted: lirc-0.9.1a-fix-segfault.patch
===
--- lirc-0.9.1a-fix-segfault.patch 2014-08-20 08:32:35 UTC (rev 220264)
+++ lirc-0.9.1a-fix-segfault.patch 2014-08-20 09:20:55 UTC (rev 220265)
@@ -1,41 +0,0 @@
-commit 4a9b45822890f50c5ed36660468e0a99cd4531e0
-Author: Alec Leamas
-Date: Mon Aug 18 10:05:44 2014 +0200
-
-lircd: Fix bad default for lircdfile.
-
-diff --git a/daemons/lircd.c b/daemons/lircd.c
-index db8ea13..fa8cf17 100644
a/daemons/lircd.c
-+++ b/daemons/lircd.c
-@@ -2147,7 +2147,7 @@ static void lircd_add_defaults(void)
- "lircd:device", LIRC_DRIVER_DEVICE,
- "lircd:listen", NULL ,
- "lircd:connect",NULL,
-- "lircd:output", LIRCD,
-+ "lircd:lircdfile", LIRCD,
- "lircd:pidfile",PIDFILE,
- "lircd:logfile",LOGFILE,
- "lircd:debug", "False",
-
-commit 8459a881fd53525a47ae2f9180fa3644be5df343
-Author: Alec Leamas
-Date: Mon Aug 18 10:00:49 2014 +0200
-
-Fix segfault when starting lircd (AUR 41581)
-
-See https://bugs.archlinux.org/task/41581
-
-diff --git a/lirc_options.conf b/lirc_options.conf
-index d8ddedd..11293e2 100644
a/lirc_options.conf
-+++ b/lirc_options.conf
-@@ -7,7 +7,7 @@ nodaemon= False
- permission = 666
- driver = default
- device = /dev/lirc0
--output = /var/run/lirc/lircd
-+lircdfile = /var/run/lirc/lircd
- pidfile = /var/run/lirc/lircd.pid
- plugindir = /usr/lib/lirc/plugins
- allow-simulate = No
Added: lirc-0.9.1a-fix-segfaults.patch
===
--- lirc-0.9.1a-fix-segfaults.patch (rev 0)
+++ lirc-0.9.1a-fix-segfaults.patch 2014-08-20 09:20:55 UTC (rev 220265)
@@ -0,0 +1,79 @@
+From 8459a881fd53525a47ae2f9180fa3644be5df343 Mon Sep 17 00:00:00 2001
+From: Alec Leamas
+Date: Mon, 18 Aug 2014 10:00:49 +0200
+Subject: [PATCH 1/3] Fix segfault when starting lircd (AUR 41581)
+
+See https://bugs.archlinux.org/task/41581
+---
+ lirc_options.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lirc_options.conf b/lirc_options.conf
+index d8ddedd..11293e2 100644
+--- a/lirc_options.conf
b/lirc_options.conf
+@@ -7,7 +7,7 @@ nodaemon= False
+ permission = 666
+ driver = default
+ device = /dev/lirc0
+-output = /var/run/lirc/lircd
++lircdfile = /var/run/lirc/lircd
+ pidfile = /var/run/lirc/lircd.pid
+ plugindir = /usr/lib/lirc/plugins
+ allow-simulate = No
+--
+2.1.0
+
+
+From 4a9b45822890f50c5ed36660468e0a99cd4531e0 Mon Sep 17 00:00:00 2001
+From: Alec Leamas
+Date: Mon, 18 Aug 2014 10:05:44 +0200
+Subject: [PATCH 2/3] lircd: Fix bad default for lircdfile.
+
+---
+ daemons/lircd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/daemons/lircd.c b/daemons/lircd.c
+ind
