diff options
Diffstat (limited to 'abs/core/lirc')
| -rw-r--r-- | abs/core/lirc/0001-doc-Add-Doxyfile-to-tarball.patch | 25 | ||||
| -rw-r--r-- | abs/core/lirc/0002-lirc.pc-Fix-bad-variable-reference-ordering-86.patch | 26 | ||||
| -rw-r--r-- | abs/core/lirc/0004-lirc-lsplugins-Bugfix.patch | 25 | ||||
| -rw-r--r-- | abs/core/lirc/0005-lirc_options.conf-Add-effective-user-to-template.patch | 24 | ||||
| -rw-r--r-- | abs/core/lirc/0006-doc-Clean-up-irsend-1-manpage.patch | 55 | ||||
| -rw-r--r-- | abs/core/lirc/0009-lib-lirc_log-Add-priority-labels-info-error.-to-sysl.patch | 70 | ||||
| -rw-r--r-- | abs/core/lirc/0010-lirc-setup-Fix-remote-config-file-display-problems.patch | 38 | ||||
| -rw-r--r-- | abs/core/lirc/0012-lib-Bad-bugfix-for-finding-.lircrc.patch | 27 | ||||
| -rw-r--r-- | abs/core/lirc/0013-tools-Make-make_rel_symlink.py-use-python3.patch | 42 | ||||
| -rw-r--r-- | abs/core/lirc/PKGBUILD | 125 | ||||
| -rw-r--r-- | abs/core/lirc/__changelog | 13 | ||||
| -rw-r--r-- | abs/core/lirc/irexec.service | 11 | ||||
| -rw-r--r-- | abs/core/lirc/lirc-0.9.1a-fix-segfaults.patch | 79 | ||||
| -rw-r--r-- | abs/core/lirc/lirc-utils.install | 13 | ||||
| -rw-r--r-- | abs/core/lirc/lirc.install | 13 | ||||
| -rw-r--r-- | abs/core/lirc/wpc8769l-build-fix.patch | 90 |
16 files changed, 392 insertions, 284 deletions
diff --git a/abs/core/lirc/0001-doc-Add-Doxyfile-to-tarball.patch b/abs/core/lirc/0001-doc-Add-Doxyfile-to-tarball.patch new file mode 100644 index 0000000..1ca5165 --- /dev/null +++ b/abs/core/lirc/0001-doc-Add-Doxyfile-to-tarball.patch @@ -0,0 +1,25 @@ +From 945e44ffe2296bc37dc58363e5beaf5b4eca73fa Mon Sep 17 00:00:00 2001 +From: Alec Leamas <leamas.alec@gmail.com> +Date: Thu, 11 Dec 2014 05:34:26 +0100 +Subject: [PATCH 01/13] doc: Add Doxyfile to tarball. + +--- + doc/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 8a05a7d..1b6730e 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -3,6 +3,8 @@ ACLOCAL_AMFLAGS = -I m4 + + DISTCLEANFILES = man/* html/* man-html/* + ++EXTRA_DIST = Doxyfile ++ + LIB_SRC = $(srcdir)/../lib + API_SRC = $(LIB_SRC)/*.c \ + $(LIB_SRC)/*.h \ +-- +2.2.2 + diff --git a/abs/core/lirc/0002-lirc.pc-Fix-bad-variable-reference-ordering-86.patch b/abs/core/lirc/0002-lirc.pc-Fix-bad-variable-reference-ordering-86.patch new file mode 100644 index 0000000..b65ab0f --- /dev/null +++ b/abs/core/lirc/0002-lirc.pc-Fix-bad-variable-reference-ordering-86.patch @@ -0,0 +1,26 @@ +From d733314ef8293a447568ef48af8b0ddd83a4ad42 Mon Sep 17 00:00:00 2001 +From: Inando <inand0@users.sf.net> +Date: Mon, 29 Dec 2014 14:45:08 +0100 +Subject: [PATCH 02/13] lirc.pc: Fix bad variable reference/ordering (#86) + +--- + lirc.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lirc.pc.in b/lirc.pc.in +index 43f2b9b..432f51a 100644 +--- a/lirc.pc.in ++++ b/lirc.pc.in +@@ -2,8 +2,8 @@ Name: lirc + Description: LIRC Linux Infrared Control client libs. + Version: @VERSION@ + +-datarootdir=@datarootdir@ + prefix=@prefix@ ++datarootdir=@datarootdir@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ +-- +2.2.2 + diff --git a/abs/core/lirc/0004-lirc-lsplugins-Bugfix.patch b/abs/core/lirc/0004-lirc-lsplugins-Bugfix.patch new file mode 100644 index 0000000..3517e50 --- /dev/null +++ b/abs/core/lirc/0004-lirc-lsplugins-Bugfix.patch @@ -0,0 +1,25 @@ +From ad094a827e37219b76cf6b6bf3d6fab49a32e913 Mon Sep 17 00:00:00 2001 +From: Alec Leamas <leamas.alec@gmail.com> +Date: Fri, 9 Jan 2015 12:46:36 +0100 +Subject: [PATCH 04/13] lirc-lsplugins: Bugfix. + +--- + tools/lirc-lsplugins.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/lirc-lsplugins.c b/tools/lirc-lsplugins.c +index 10403a7..9eceb3b 100644 +--- a/tools/lirc-lsplugins.c ++++ b/tools/lirc-lsplugins.c +@@ -212,7 +212,7 @@ static void line_print_long(const line_t* line) + } + + printf("Plugin path:\t%s\n", line->path); +- printf("Driver name:\t%s\n", line->path ? line->name : "-"); ++ printf("Driver name:\t%s\n", line->name ? line->name : "-"); + printf("Load state:\t%s\n", loadstate); + printf("Timing info:\t%s\n", handles_timing); + printf("Can send:\t%s\n", can_send); +-- +2.2.2 + diff --git a/abs/core/lirc/0005-lirc_options.conf-Add-effective-user-to-template.patch b/abs/core/lirc/0005-lirc_options.conf-Add-effective-user-to-template.patch new file mode 100644 index 0000000..8910905 --- /dev/null +++ b/abs/core/lirc/0005-lirc_options.conf-Add-effective-user-to-template.patch @@ -0,0 +1,24 @@ +From 502af4fcca53c81025446bb73fa29570abb34feb Mon Sep 17 00:00:00 2001 +From: Alec Leamas <leamas.alec@gmail.com> +Date: Thu, 11 Dec 2014 10:28:47 +0100 +Subject: [PATCH 05/13] lirc_options.conf: Add effective-user to template. + +--- + lirc_options.conf | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lirc_options.conf b/lirc_options.conf +index 9dc672a..9346de8 100644 +--- a/lirc_options.conf ++++ b/lirc_options.conf +@@ -12,6 +12,7 @@ plugindir = /usr/lib/lirc/plugins + permission = 666 + allow-simulate = No + repeat-max = 600 ++#effective-user = + #listen = [address:]port + #connect = host[:port] + #debug = 6 +-- +2.2.2 + diff --git a/abs/core/lirc/0006-doc-Clean-up-irsend-1-manpage.patch b/abs/core/lirc/0006-doc-Clean-up-irsend-1-manpage.patch new file mode 100644 index 0000000..1a7f279 --- /dev/null +++ b/abs/core/lirc/0006-doc-Clean-up-irsend-1-manpage.patch @@ -0,0 +1,55 @@ +From ed1eab5e685df76426709b2c12284d61de0470b5 Mon Sep 17 00:00:00 2001 +From: Alec Leamas <leamas.alec@gmail.com> +Date: Tue, 16 Dec 2014 11:18:00 +0100 +Subject: [PATCH 06/13] doc: Clean up irsend(1) manpage. + +--- + doc/man-source/irsend.1 | 18 ++++++++---------- + 1 file changed, 8 insertions(+), 10 deletions(-) + +diff --git a/doc/man-source/irsend.1 b/doc/man-source/irsend.1 +index 51f57ab..12d2db8 100644 +--- a/doc/man-source/irsend.1 ++++ b/doc/man-source/irsend.1 +@@ -1,4 +1,4 @@ +-.TH IRSEND "1" "Last change: Sep 2014" "irsend @version@" "User Commands" ++.TH IRSEND "1" "Last change: Dec 2014" "irsend @version@" "User Commands" + .SH NAME + irsend - basic LIRC program to send infra-red commands + .SH SYNOPSIS +@@ -63,6 +63,12 @@ connect to lircd at this address + .TP + \-# \fB\-\-count\fR=\fIn\fR + send command n times ++ ++.SH ENVIRONMENT ++.TP 4 ++LIRC_SOCKET_PATH ++The lircd socket to connect to, defaults to a hardcoded default value ++usually /var/run/lirc/lircd + .SH FILES + .TP + .I /etc/lirc/lircd.conf +@@ -94,18 +100,10 @@ irsend SIMULATE "0000000000000476 00 OK TECHNISAT_ST3004S" + Drivers are loaded dynamically. The directory used for this is determined by (falling + priority): + .IP \- 2 +-The --plugindir option if available. +-.IP \- 2 + The 'plugindir' entry in the [lircd] section of the lirc_options.conf file. + .IP \- 2 + The environment variable LIRC_PLUGINDIR. + .IP \- 2 + A hardcoded default (usually /usr/lib[64]/lirc/plugins). + .SH "SEE ALSO" +-The documentation for +-.B lirc +-is maintained as html pages. They are located under html/ in the +-documentation directory. +- +-.BR lircd(8), mode2(1), xmode2(1) +-.BR irrecord(1) irw(1), http://www.lirc.org . ++.B lircd(8), mode2(1), xmode2(1), irrecord(1), irw(1) +-- +2.2.2 + diff --git a/abs/core/lirc/0009-lib-lirc_log-Add-priority-labels-info-error.-to-sysl.patch b/abs/core/lirc/0009-lib-lirc_log-Add-priority-labels-info-error.-to-sysl.patch new file mode 100644 index 0000000..c186054 --- /dev/null +++ b/abs/core/lirc/0009-lib-lirc_log-Add-priority-labels-info-error.-to-sysl.patch @@ -0,0 +1,70 @@ +From dfe0f3c3170a029a47edd9adf2a1b9a975d496ae Mon Sep 17 00:00:00 2001 +From: Alec Leamas <leamas.alec@gmail.com> +Date: Sat, 10 Jan 2015 01:30:32 +0100 +Subject: [PATCH 09/13] lib/lirc_log: Add priority labels (info, error...) to + syslog msg (#89). + +--- + lib/lirc_log.c | 23 +++++++---------------- + 1 file changed, 7 insertions(+), 16 deletions(-) + +diff --git a/lib/lirc_log.c b/lib/lirc_log.c +index 307fb77..cf37e6d 100644 +--- a/lib/lirc_log.c ++++ b/lib/lirc_log.c +@@ -2,22 +2,8 @@ + ** lircd.c ***************************************************************** + **************************************************************************** + * +- * lircd - LIRC Decoder Daemon ++ * lirc_log - simple logging module. + * +- * Copyright (C) 1996,97 Ralph Metzler <rjkm@thp.uni-koeln.de> +- * Copyright (C) 1998,99 Christoph Bartelmus <lirc@bartelmus.de> +- * +- * ======= +- * HISTORY +- * ======= +- * +- * 0.1: 03/27/96 decode SONY infra-red signals +- * create mousesystems mouse signals on pipe /dev/lircm +- * 04/07/96 send ir-codes to clients via socket (see irpty) +- * 05/16/96 now using ir_remotes for decoding +- * much easier now to describe new remotes +- * +- * 0.5: 09/02/98 finished (nearly) complete rewrite (Christoph) + * + */ + +@@ -59,6 +45,8 @@ const char *logfile = "syslog"; + char progname[128] = {'?','\0'}; + static int nodaemon = 0; + ++static const int PRIO_LEN = 16; /**< Longest priority label, some margin. */ ++ + + static const char* prio2text(int prio) + { +@@ -246,6 +234,7 @@ void logprintf(loglevel_t prio, const char *format_str, ...) + { + int save_errno = errno; + va_list ap; ++ char buff[PRIO_LEN + strlen(format_str)]; + + #ifdef SYSTEMD_LOGPERROR_FIX + if (nodaemon && prio <= loglevel) { +@@ -258,8 +247,10 @@ void logprintf(loglevel_t prio, const char *format_str, ...) + } + #endif + if (use_syslog) { ++ snprintf(buff, sizeof(buff), ++ "%s: %s", prio2text(prio), format_str); + va_start(ap, format_str); +- vsyslog(prio, format_str, ap); ++ vsyslog(prio, buff, ap); + va_end(ap); + } else if (lf && prio <= loglevel) { + time_t current; +-- +2.2.2 + diff --git a/abs/core/lirc/0010-lirc-setup-Fix-remote-config-file-display-problems.patch b/abs/core/lirc/0010-lirc-setup-Fix-remote-config-file-display-problems.patch new file mode 100644 index 0000000..5f5803d --- /dev/null +++ b/abs/core/lirc/0010-lirc-setup-Fix-remote-config-file-display-problems.patch @@ -0,0 +1,38 @@ +From f3714b04a20069b70b9cbba7558bb3cb5d28caa9 Mon Sep 17 00:00:00 2001 +From: Alec Leamas <leamas.alec@gmail.com> +Date: Wed, 14 Jan 2015 01:13:00 +0100 +Subject: [PATCH 10/13] lirc-setup: Fix remote config file display problems. + +--- + tools/lirc-setup/mvc_control.py | 2 +- + tools/lirc-setup/mvc_view.py | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tools/lirc-setup/mvc_control.py b/tools/lirc-setup/mvc_control.py +index a922df5..8cf216b 100644 +--- a/tools/lirc-setup/mvc_control.py ++++ b/tools/lirc-setup/mvc_control.py +@@ -244,7 +244,7 @@ class Controller(object): + errors='ignore') + except urllib.error.URLError as ex: + text = "Sorry: cannot download: " + uri + ' (' + str(ex) + ')' +- self.view.show_text(text, 'lirc: download error') ++ self.view.show_text(text, 'lirc: Remote config file') + + + def main(): +diff --git a/tools/lirc-setup/mvc_view.py b/tools/lirc-setup/mvc_view.py +index a50ce73..19e8df7 100644 +--- a/tools/lirc-setup/mvc_view.py ++++ b/tools/lirc-setup/mvc_view.py +@@ -156,6 +156,7 @@ class View(baseview.Baseview): + else: + return True + ++ text = text.replace("&", "&") + self.builder.get_object("show_text_label").set_markup(text) + w = self.builder.get_object('view_text_window') + w.set_title(title) +-- +2.2.2 + diff --git a/abs/core/lirc/0012-lib-Bad-bugfix-for-finding-.lircrc.patch b/abs/core/lirc/0012-lib-Bad-bugfix-for-finding-.lircrc.patch new file mode 100644 index 0000000..dc97b13 --- /dev/null +++ b/abs/core/lirc/0012-lib-Bad-bugfix-for-finding-.lircrc.patch @@ -0,0 +1,27 @@ +From 96292ce20b75ef27851ba75aed1aafb15a207a79 Mon Sep 17 00:00:00 2001 +From: Alec Leamas <leamas.alec@gmail.com> +Date: Thu, 15 Jan 2015 02:01:57 +0100 +Subject: [PATCH 12/13] lib: Bad bugfix for finding ~/.lircrc + +Basically, the common library code did not find ~/.lircrc, just +~/.config/lircrc. Fixed. +--- + lib/lirc_client.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/lirc_client.c b/lib/lirc_client.c +index c441803..df2eaef 100644 +--- a/lib/lirc_client.c ++++ b/lib/lirc_client.c +@@ -807,7 +807,7 @@ static char *lirc_getfilename(const char *file, const char *current_file) + if (filename == NULL) { + return NULL; + } +- strcat(filename, LIRCRC_USER_FILE); ++ strcat(filename, "/" LIRCRC_USER_FILE); + } + filename = realloc(filename, strlen(filename) + 1); + } else if (strncmp(file, "~/", 2) == 0) { +-- +2.2.2 + diff --git a/abs/core/lirc/0013-tools-Make-make_rel_symlink.py-use-python3.patch b/abs/core/lirc/0013-tools-Make-make_rel_symlink.py-use-python3.patch new file mode 100644 index 0000000..4ef3c15 --- /dev/null +++ b/abs/core/lirc/0013-tools-Make-make_rel_symlink.py-use-python3.patch @@ -0,0 +1,42 @@ +From 4c30c6f87dda6614978dfab69d417ef3ca83dccf Mon Sep 17 00:00:00 2001 +From: Alec Leamas <leamas.alec@gmail.com> +Date: Thu, 11 Dec 2014 04:44:49 +0100 +Subject: [PATCH 13/13] 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 + diff --git a/abs/core/lirc/PKGBUILD b/abs/core/lirc/PKGBUILD index 0f71eba..6a5f803 100644 --- a/abs/core/lirc/PKGBUILD +++ b/abs/core/lirc/PKGBUILD @@ -1,110 +1,79 @@ -# $Id$ -# Maintainer: Paul Mattal <paul@archlinux.org> +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Paul Mattal <paul@archlinux.org> -pkgbase=lirc -pkgname=('lirc' 'lirc-utils') -_pkgver=0.9.1a +pkgname=lirc +_pkgver=0.9.2 [[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" || pkgver="$_pkgver" -pkgrel=15 +pkgrel=1 epoch=1 -_extramodules=extramodules-3.18-ARCH +pkgdesc="Linux Infrared Remote Control utils" arch=('i686' 'x86_64') url="http://www.lirc.org/" license=('GPL') -# NOTICE: Don't forget to bump version in depends in package_lirc()! -makedepends=('help2man' 'linux>=3.18' 'linux<3.19' 'linux-headers>=3.18' 'linux-headers<3.19' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2' 'iguanair') -options=('!makeflags' '!strip') -source=("http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${_pkgver}.tar.bz2" - wpc8769l-build-fix.patch - lirc-0.9.1a-fix-segfaults.patch +depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'iguanair') +makedepends=('help2man' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2') +#optdepends=('python: for lirc-setup, irdb-get and pronto2lirc') +provides=('lirc-utils') +conflicts=('lirc-utils') +replaces=('lirc-utils') +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-doc-Add-Doxyfile-to-tarball.patch + 0002-lirc.pc-Fix-bad-variable-reference-ordering-86.patch + 0004-lirc-lsplugins-Bugfix.patch + 0005-lirc_options.conf-Add-effective-user-to-template.patch + 0006-doc-Clean-up-irsend-1-manpage.patch + 0009-lib-lirc_log-Add-priority-labels-info-error.-to-sysl.patch + 0010-lirc-setup-Fix-remote-config-file-display-problems.patch + 0012-lib-Bad-bugfix-for-finding-.lircrc.patch lirc.logrotate - irexec.service lirc.tmpfiles) -md5sums=('1f1fac162ed309dd50f307e96a292957' - '9ec33169b3407f74264062d7679dd269' - 'cd00acf480e82a0bf050032732d0d733' +md5sums=('3afc84e79c0839823cc20e7a710dd06d' + '1e1a68f08c2ecb2b766973e4f1721bae' + 'c04b2ed646dbaaec2fa9f4e1ad2cc802' + '2e60e1b3c19b0898d1d5f69e76891a60' + '9fe1e650858ca91e3a0fe4d63ee4b946' + '8b5c11ab325d4bef998c41b5b1160513' + '96475d718dbeb336a3282a5e9f9fdadd' + '308c3e1fd769b38caa6fd548f54f2440' + '497c4bb4ac8fc6febac94abe1922595c' '3deb02604b37811d41816e9b4385fcc3' - '32df3b9bc859565d6acf5f0e5b747083' 'febf25c154a7d36f01159e84f26c2d9a') prepare() { cd "${srcdir}/lirc-${_pkgver}" - patch -Np1 -i "${srcdir}/wpc8769l-build-fix.patch" - patch -Np1 -i "${srcdir}/lirc-0.9.1a-fix-segfaults.patch" + patch -p1 -i ../0001-doc-Add-Doxyfile-to-tarball.patch + patch -p1 -i ../0002-lirc.pc-Fix-bad-variable-reference-ordering-86.patch + patch -p1 -i ../0004-lirc-lsplugins-Bugfix.patch + patch -p1 -i ../0005-lirc_options.conf-Add-effective-user-to-template.patch + patch -p1 -i ../0006-doc-Clean-up-irsend-1-manpage.patch + patch -p1 -i ../0009-lib-lirc_log-Add-priority-labels-info-error.-to-sysl.patch + patch -p1 -i ../0010-lirc-setup-Fix-remote-config-file-display-problems.patch + patch -p1 -i ../0012-lib-Bad-bugfix-for-finding-.lircrc.patch - sed -i '/AC_PATH_XTRA/d' configure.ac - sed -e 's/@X_CFLAGS@//g' \ - -e 's/@X_LIBS@//g' \ - -e 's/@X_PRE_LIBS@//g' \ - -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am - - libtoolize autoreconf } build() { cd "${srcdir}/lirc-${_pkgver}" - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - - PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \ - --with-driver=all --with-kerneldir="/usr/lib/modules/${_kernver}/build/" \ - --with-moduledir="/usr/lib/modules/${_kernver}/kernel/drivers/misc" \ - --sbindir=/usr/bin --with-transmitter - # Remove drivers already in kernel - sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \ - -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \ - -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \ - -e "s:lirc_i2c::" \ - -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile - #removed removing lirc_atiusb which is needed for the firefly - #-e "s:lirc_atiusb::" -e "s:lirc_i2c::" \ - #change include smp_lock.h to smp.h - sed "s:linux/smp_lock.h:linux/smp.h:g" -i drivers/lirc_atiusb/lirc_atiusb.c + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --localstatedir=/var \ + --with-transmitter --enable-sandboxed make } -package_lirc() { - pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" - depends=('lirc-utils' 'linux>=3.18' 'linux<3.19' 'iguanair') - replaces=('lirc+pctv') - install=lirc.install - - cd "${srcdir}/lirc-${_pkgver}/drivers" - - make DESTDIR="${pkgdir}" moduledir="/usr/lib/modules/${_extramodules}" install - gzip -9 "${pkgdir}/usr/lib/modules/${_extramodules}"/*.ko - - # set the kernel we've built for inside the install script - sed -i "s/^EXTRAMODULES=.*$/EXTRAMODULES=${_extramodules}/" "${startdir}/lirc.install" -} - -package_lirc-utils() { - pkgdesc="Linux Infrared Remote Control utils" - depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'iguanair') - optdepends=('python2: pronto2lirc utility') - options=('strip') - backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf' 'etc/lirc/lircmd.conf') - install=lirc-utils.install - +package() { cd "${srcdir}/lirc-${_pkgver}" make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service install -Dm644 "${srcdir}"/lirc.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf + install -Dm644 "${srcdir}"/lirc.logrotate "${pkgdir}"/etc/logrotate.d/lirc - cp -rp remotes "${pkgdir}/usr/share/lirc" - chmod -R go-w "${pkgdir}/usr/share/lirc/" - - # install the logrotate config - install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc" - - # remove built modules - rm -r "${pkgdir}/usr/lib/modules" + # LinHES remotes service uses /etc/lircd.conf so create symlink + ln -s "/etc/lircd.conf" "${pkgdir}/etc/lirc/lircd.conf.d/mv_ir_lircd.conf" - # LinHES remotes service needs etc/lirc/lircd.conf symlinked to etc/lircd.conf - rm -f "${pkgdir}/etc/lirc/lircd.conf" - ln -s "/etc/lircd.conf" "${pkgdir}/etc/lirc/lircd.conf" + rmdir "${pkgdir}"/var/{run/lirc/,run/,} } diff --git a/abs/core/lirc/__changelog b/abs/core/lirc/__changelog index c7649f3..adf4a9c 100644 --- a/abs/core/lirc/__changelog +++ b/abs/core/lirc/__changelog @@ -1,6 +1,7 @@ -PKGBUILD: add 'iguanair' to make depends and package_lirc and package_lirc-utils depends -PKGBUILD: symlink /etc/lircd.conf to package_lirc-utils -PKGBUILD: removed removing lirc_atiusb which is needed for the firefly - -e "s:lirc_atiusb::" -PKGBUILD: #change include smp_lock.h to smp.h - sed "s:linux/smp_lock.h:linux/smp.h:g" -i drivers/lirc_atiusb/lirc_atiusb.c +PKGBUILD: add 'iguanair' to depends +PKGBUILD: change dep python to python2 +PKGBUILD: comment out optdepends +PKGBUILD: don't use 0013-tools-Make-make_rel_symlink.py-use-python3.patch +PKGBUILD: # LinHES remotes service uses /etc/lircd.conf so create symlink + ln -s "/etc/lircd.conf" "${pkgdir}/etc/lirc/lircd.conf.d/mv_ir_lircd.conf" +lirc.install: comment out service message diff --git a/abs/core/lirc/irexec.service b/abs/core/lirc/irexec.service deleted file mode 100644 index dffbbf5..0000000 --- a/abs/core/lirc/irexec.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=LIRC command handler -After=network.target - -[Service] -Type=forking -ExecStart=/usr/bin/irexec --daemon - -[Install] -WantedBy=multi-user.target -Wants=lircd.service diff --git a/abs/core/lirc/lirc-0.9.1a-fix-segfaults.patch b/abs/core/lirc/lirc-0.9.1a-fix-segfaults.patch deleted file mode 100644 index a1f6575..0000000 --- a/abs/core/lirc/lirc-0.9.1a-fix-segfaults.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 8459a881fd53525a47ae2f9180fa3644be5df343 Mon Sep 17 00:00:00 2001 -From: Alec Leamas <leamas@nowhere.net> -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 <leamas@nowhere.net> -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 -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", --- -2.1.0 - - -From 02252a9fe76c4a4fd809966971759c66af707f02 Mon Sep 17 00:00:00 2001 -From: Andreas Bader <andreasbader at badersystems.de> -Date: Tue, 19 Aug 2014 16:58:21 +0200 -Subject: [PATCH 3/3] 0.9.1a: Bugfix: segfault when parsing --connect in config - file. - ---- - daemons/lircd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/daemons/lircd.c b/daemons/lircd.c -index fa8cf17..7af4265 100644 ---- a/daemons/lircd.c -+++ b/daemons/lircd.c -@@ -2311,7 +2311,7 @@ int main(int argc, char **argv) - } - opt = options_getstring("lircd:connect"); - if (opt != NULL) { -- if (!add_peer_connection(optarg)) -+ if (!add_peer_connection(opt)) - return(EXIT_FAILURE); - } - # ifdef DEBUG --- -2.1.0 - diff --git a/abs/core/lirc/lirc-utils.install b/abs/core/lirc/lirc-utils.install deleted file mode 100644 index f7faa07..0000000 --- a/abs/core/lirc/lirc-utils.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - systemd-tmpfiles --create lirc.conf -} - -post_upgrade() { - post_install - - if [[ "$(vercmp $2 1:0.9.1-1)" -lt 0 ]]; then - echo ':: lirc.service and lircm.service have been replaced' - echo ' by the upstream unit files lircd.service and' - echo ' lircmd.service.' - fi -} diff --git a/abs/core/lirc/lirc.install b/abs/core/lirc/lirc.install index 53b1bc7..cc5d931 100644 --- a/abs/core/lirc/lirc.install +++ b/abs/core/lirc/lirc.install @@ -1,14 +1,13 @@ -EXTRAMODULES=extramodules-3.18-ARCH - post_install() { - echo ">>> Updating module dependencies. Please wait ..." - depmod "$(cat /usr/lib/modules/$EXTRAMODULES/version)" >/dev/null 2>&1 + systemd-tmpfiles --create lirc.conf } post_upgrade() { post_install -} -post_remove() { - post_install +# if [[ "$(vercmp $2 1:0.9.1-1)" -lt 0 ]]; then +# echo ':: lirc.service and lircm.service have been replaced' +# echo ' by the upstream unit files lircd.service and' +# echo ' lircmd.service.' +# fi } diff --git a/abs/core/lirc/wpc8769l-build-fix.patch b/abs/core/lirc/wpc8769l-build-fix.patch deleted file mode 100644 index 5e25693..0000000 --- a/abs/core/lirc/wpc8769l-build-fix.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c -index 790efa2..4248fe9 100644 ---- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c -+++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c -@@ -51,17 +51,13 @@ - #include <linux/irq.h> - - #include <linux/acpi.h> -+#include <linux/types.h> - - #include <linux/platform_device.h> -+#include <asm-generic/bitops/find.h> - --#include "drivers/kcompat.h" --#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35) --#include <media/lirc.h> --#include <media/lirc_dev.h> --#else --#include "drivers/lirc.h" --#include "drivers/lirc_dev/lirc_dev.h" --#endif -+#include "media/lirc_dev.h" -+#include "media/lirc.h" - - #include "lirc_wpc8769l.h" - -@@ -105,11 +101,11 @@ static unsigned int baseport2; - static unsigned int irq; - - /* Debugging flag. */ --static int debug; -+static bool debug; - - /* If true, we skip ACPI autodetection and use the parameter-supplied I/O and - * IRQ. */ --static int skip_probe; -+static bool skip_probe; - - /* Whether the device is open or not. */ - static int lirc_wpc8769l_is_open; -@@ -360,14 +356,14 @@ static irqreturn_t irq_handler(int irqno, void *blah, struct pt_regs *regs) - size = count << 3; - - ldata = (unsigned long *) data_buf; -- next_one = generic_find_next_le_bit(ldata, size, 0); -+ next_one = find_next_bit(ldata, size, 0); - - if (next_one > 0) - put_pulse_bit(next_one - * WPC8769L_USECS_PER_BIT); - - while (next_one < size) { -- next_zero = generic_find_next_zero_le_bit(ldata, -+ next_zero = find_next_zero_bit(ldata, - size, next_one + 1); - - put_space_bit( -@@ -375,7 +371,7 @@ static irqreturn_t irq_handler(int irqno, void *blah, struct pt_regs *regs) - * WPC8769L_USECS_PER_BIT); - - if (next_zero < size) { -- next_one = generic_find_next_le_bit(ldata, -+ next_one = find_next_bit(ldata, - size, next_zero + 1); - - put_pulse_bit( -@@ -922,12 +918,12 @@ static int wpc8769l_acpi_detect(void) - #ifdef MODULE - static struct platform_device *lirc_wpc8769l_platform_dev; - --static int __devinit lirc_wpc8769l_probe(struct platform_device *dev) -+static int lirc_wpc8769l_probe(struct platform_device *dev) - { - return 0; - } - --static int __devexit lirc_wpc8769l_remove(struct platform_device *dev) -+static int lirc_wpc8769l_remove(struct platform_device *dev) - { - return 0; - } -@@ -955,7 +951,7 @@ static int lirc_wpc8769l_resume(struct platform_device *dev) - - static struct platform_driver lirc_wpc8769l_platform_driver = { - .probe = lirc_wpc8769l_probe, -- .remove = __devexit_p(lirc_wpc8769l_remove), -+ .remove = lirc_wpc8769l_remove, - .suspend = lirc_wpc8769l_suspend, - .resume = lirc_wpc8769l_resume, - .driver = { |