[arch-commits] Commit in lirc/trunk (PKGBUILD lirc.service lircm.service)

[Tobias Powalowski]

Date: Tuesday, October 8, 2013 @ 16:19:09
  Author: tpowa
Revision: 196212

upgpkg: lirc 1:0.9.0-63

fix #31890 #30912 #33956

Modified:
  lirc/trunk/PKGBUILD
  lirc/trunk/lirc.service
  lirc/trunk/lircm.service

---+
 PKGBUILD  |   23 +--
 lirc.service  |5 +++--
 lircm.service |7 ---
 3 files changed, 28 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-08 13:40:18 UTC (rev 196211)
+++ PKGBUILD2013-10-08 14:19:09 UTC (rev 196212)
@@ -4,7 +4,7 @@
 pkgbase=lirc
 pkgname=('lirc' 'lirc-utils')
 pkgver=0.9.0
-pkgrel=62
+pkgrel=63
 epoch=1
 _extramodules=extramodules-3.11-ARCH
 arch=('i686' 'x86_64')
@@ -20,7 +20,9 @@
 kernel-2.6.39.patch
 linux-3.8.patch
 lirc.logrotate
-lirc.service lircm.service irexec.service
+lirc.service 
+lircm.service 
+irexec.service
 lirc.tmpfiles)
 
 build() {
@@ -32,6 +34,12 @@
   patch -Np1 -i ${srcdir}/kernel-2.6.39.patch
   patch -Np1 -i ${srcdir}/linux-3.8.patch
 
+  # use fixed instead of Courier w/xmode2, should be more prevalent on linux 
boxen
+  sed -i -e 's|char.*font1_name.*Courier.*$|char   
font1_name[]=-misc-fixed-*-r-*-*-12-*-*-*-*-*-iso8859-1;|g' tools/xmode2.c
+
+  # use /dev/lirc0 by default instead of /dev/lirc
+  sed -i -e 's|#define DEV_LIRClirc|#define DEV_LIRC lirc0|' 
config.h.in
+
   sed -i '/AC_PATH_XTRA/d' configure.ac
   sed -e 's/@X_CFLAGS@//g' \
   -e 's/@X_LIBS@//g' \
@@ -105,3 +113,14 @@
  '121283a6de274e52ed86522aecd0f6e5'
  '07131d117fcfe9dcd50c453c3a5e9531'
  'febf25c154a7d36f01159e84f26c2d9a')
+md5sums=('b232aef26f23fe33ea8305d276637086'
+ '1cce37e18e3f6f46044abab29016d18f'
+ 'b70cc9640505205446ec47b7d4779f38'
+ '1f8b104a2365d9f93404b143f499059b'
+ '087a7d102e1c96bf1179f38db2b0b237'
+ '9ee196bd03ea44af5a752fb0cc6ca96a'
+ '3deb02604b37811d41816e9b4385fcc3'
+ 'a9ab637e7207472e61e55a2fa75dc555'
+ '1847b9997685bc3ad2cf11bea4590a92'
+ '07131d117fcfe9dcd50c453c3a5e9531'
+ 'febf25c154a7d36f01159e84f26c2d9a')

Modified: lirc.service
===
--- lirc.service2013-10-08 13:40:18 UTC (rev 196211)
+++ lirc.service2013-10-08 14:19:09 UTC (rev 196212)
@@ -1,11 +1,12 @@
 [Unit]
 Description=Linux Infrared Remote Control
+After=network.target
 
 [Service]
-ExecStartPre=/usr/bin/ln -sf /run/lirc/lircd /dev/lircd
-ExecStart=/usr/bin/lircd --pidfile=/run/lirc/lircd.pid
 Type=forking
 PIDFile=/run/lirc/lircd.pid
+ExecStart=/usr/sbin/lircd --driver=default --device=/dev/lirc0 
 
 [Install]
 WantedBy=multi-user.target
+

Modified: lircm.service
===
--- lircm.service   2013-10-08 13:40:18 UTC (rev 196211)
+++ lircm.service   2013-10-08 14:19:09 UTC (rev 196212)
@@ -1,11 +1,12 @@
 [Unit]
 Description=LIRC Mouse
-After=lirc.service
-Wants=lirc.service
+Requires=lirc.service
+After=network.target lirc.service
 
 [Service]
-ExecStart=/usr/bin/lircmd -u
 Type=forking
+ExecStart=/usr/sbin/lircmd 
 
 [Install]
 WantedBy=multi-user.target
+

[arch-commits] Commit in lirc/trunk (PKGBUILD lirc.service lircm.service)

[Tobias Powalowski]

Date: Sunday, May 26, 2013 @ 17:38:01
  Author: tpowa
Revision: 186445

upgpkg: lirc 1:0.9.0-45

rebuild against 3.9.4, move daemons to /usr/bin

Modified:
  lirc/trunk/PKGBUILD
  lirc/trunk/lirc.service
  lirc/trunk/lircm.service

---+
 PKGBUILD  |6 +++---
 lirc.service  |2 +-
 lircm.service |2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-26 15:37:51 UTC (rev 186444)
+++ PKGBUILD2013-05-26 15:38:01 UTC (rev 186445)
@@ -45,7 +45,7 @@
   PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
   --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
   --with-moduledir=/usr/lib/modules/${_kernver}/kernel/drivers/misc \
-  --with-transmitter
+  --sbindir=/usr/bin --with-transmitter
 
   # Remove drivers already in kernel
   sed -e s:lirc_dev:: -e s:lirc_bt829:: -e s:lirc_igorplugusb:: \
@@ -101,7 +101,7 @@
  '087a7d102e1c96bf1179f38db2b0b237'
  '9ee196bd03ea44af5a752fb0cc6ca96a'
  '3deb02604b37811d41816e9b4385fcc3'
- 'dab8a73bcc5fd5479d8750493d8d97dc'
- 'c2e20fe68b034df752dba2773db16ebe'
+ '1c7ceace42da44f41e5a42b4dd3b3d76'
+ '121283a6de274e52ed86522aecd0f6e5'
  '07131d117fcfe9dcd50c453c3a5e9531'
  'febf25c154a7d36f01159e84f26c2d9a')

Modified: lirc.service
===
--- lirc.service2013-05-26 15:37:51 UTC (rev 186444)
+++ lirc.service2013-05-26 15:38:01 UTC (rev 186445)
@@ -3,7 +3,7 @@
 
 [Service]
 ExecStartPre=/usr/bin/ln -sf /run/lirc/lircd /dev/lircd
-ExecStart=/usr/sbin/lircd --pidfile=/run/lirc/lircd.pid
+ExecStart=/usr/bin/lircd --pidfile=/run/lirc/lircd.pid
 Type=forking
 PIDFile=/run/lirc/lircd.pid
 

Modified: lircm.service
===
--- lircm.service   2013-05-26 15:37:51 UTC (rev 186444)
+++ lircm.service   2013-05-26 15:38:01 UTC (rev 186445)
@@ -4,7 +4,7 @@
 Wants=lirc.service
 
 [Service]
-ExecStart=/usr/sbin/lircmd -u
+ExecStart=/usr/bin/lircmd -u
 Type=forking
 
 [Install]