Sat Dec 29 02:10:20 PST 2012

7 files changed, 76 insertions, 23 deletions

diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD
index d27cd5ed8..d577eeb1b 100644
--- a/extra/lirc/PKGBUILD
+++ b/extra/lirc/PKGBUILD
@@ -1,38 +1,30 @@
-# $Id: PKGBUILD 161828 2012-06-15 08:18:10Z tpowa $
+# $Id: PKGBUILD 170041 2012-10-31 07:25:00Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgbase=lirc
 pkgname=('lirc' 'lirc-utils')
 pkgver=0.9.0
-pkgrel=18
+pkgrel=34
 epoch=1
-_extramodules=extramodules-3.4-ARCH
+_extramodules=extramodules-3.6-ARCH
 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-headers>=3.4' 'linux-headers<3.5' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+makedepends=('help2man' 'linux-headers>=3.6' 'linux-headers<3.7' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
 options=('!makeflags' '!strip')
 source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
         lirc_wpc8769l.patch
         lircd-handle-large-config.patch
         lirc_atiusb-kfifo.patch
         kernel-2.6.39.patch
-	lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd)
-md5sums=('b232aef26f23fe33ea8305d276637086'
-         '1cce37e18e3f6f46044abab29016d18f'
-         'b70cc9640505205446ec47b7d4779f38'
-         '1f8b104a2365d9f93404b143f499059b'
-         '087a7d102e1c96bf1179f38db2b0b237'
-         '8d0e238dc0eda95e340fe570605da492'
-         '85f7fdac55e5256967241864049bf5e9'
-         '3deb02604b37811d41816e9b4385fcc3'
-         '5b1f8c9cd788a39a6283f93302ce5c6e'
-         'f0c0ac930326168035f0c8e24357ae55'
-         '69d099e6deedfa3c1ee2b6e82d9b8bfb')
+	lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd
+	lirc.service lircm.service irexec.service
+	lirc.tmpfiles
+	)
 
 build() {
-  _kernver="$(cat /lib/modules/${_extramodules}/version)"
+  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
   cd "${srcdir}/lirc-${pkgver}"
   patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch"
   patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
@@ -49,7 +41,7 @@ build() {
 
   PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
       --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
-      --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \
+      --with-moduledir=/usr/lib/modules/${_kernver}/kernel/drivers/misc \
       --with-transmitter
 
   # Remove drivers already in kernel
@@ -62,12 +54,12 @@ build() {
 
 package_lirc() {
   pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
-  depends=('lirc-utils' 'linux>=3.4' 'linux<3.5')
+  depends=('lirc-utils' 'linux>=3.6' 'linux<3.7')
   replaces=('lirc+pctv')
   install=lirc.install
 
   cd "${srcdir}/lirc-${pkgver}/drivers"
-  make DESTDIR="${pkgdir}" moduledir="/lib/modules/${_extramodules}" install
+  make DESTDIR="${pkgdir}" moduledir="/usr/lib/modules/${_extramodules}" install
 
   # set the kernel we've built for inside the install script
   sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install"
@@ -81,11 +73,16 @@ package_lirc-utils() {
   optdepends=('python2: pronto2lirc utility')
   options=('strip' '!libtool')
   backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf')
+  install=lirc-utils.install
 
   cd "${srcdir}/lirc-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d"
   cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d"
+  install -D -m644 "${srcdir}"/lirc.service "${pkgdir}"/usr/lib/systemd/system/lirc.service
+  install -D -m644 "${srcdir}"/lircm.service "${pkgdir}"/usr/lib/systemd/system/lircm.service
+  install -D -m644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service
+  install -D -m644 "${srcdir}"/lirc.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf
   cp -rp remotes "${pkgdir}/usr/share/lirc"
   chmod -R go-w "${pkgdir}/usr/share/lirc/"
 
@@ -101,5 +98,20 @@ package_lirc-utils() {
   install -d "${pkgdir}/etc/lirc"
   
   # remove built modules
-  rm -r "${pkgdir}/lib/"
+  rm -r "${pkgdir}/usr/lib/modules"
 }
+md5sums=('b232aef26f23fe33ea8305d276637086'
+         '1cce37e18e3f6f46044abab29016d18f'
+         'b70cc9640505205446ec47b7d4779f38'
+         '1f8b104a2365d9f93404b143f499059b'
+         '087a7d102e1c96bf1179f38db2b0b237'
+         '8d0e238dc0eda95e340fe570605da492'
+         '85f7fdac55e5256967241864049bf5e9'
+         '3deb02604b37811d41816e9b4385fcc3'
+         '5b1f8c9cd788a39a6283f93302ce5c6e'
+         'f0c0ac930326168035f0c8e24357ae55'
+         '69d099e6deedfa3c1ee2b6e82d9b8bfb'
+         'dab8a73bcc5fd5479d8750493d8d97dc'
+         'c2e20fe68b034df752dba2773db16ebe'
+         '07131d117fcfe9dcd50c453c3a5e9531'
+         'febf25c154a7d36f01159e84f26c2d9a')
diff --git a/extra/lirc/irexec.service b/extra/lirc/irexec.service
new file mode 100644
index 000000000..5d7915b29
--- /dev/null
+++ b/extra/lirc/irexec.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=IR Exec
+After=lirc.service
+Wants=lirc.service
+
+[Service]
+ExecStart=/usr/bin/irexec --daemon
+Type=forking
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/lirc/lirc-utils.install b/extra/lirc/lirc-utils.install
new file mode 100644
index 000000000..293d1ed7c
--- /dev/null
+++ b/extra/lirc/lirc-utils.install
@@ -0,0 +1,7 @@
+post_install() {
+	systemd-tmpfiles --create lirc.conf
+}
+
+post_upgrade() {
+  post_install
+}
diff --git a/extra/lirc/lirc.install b/extra/lirc/lirc.install
index 4551e88dc..a9f1c5cd6 100644
--- a/extra/lirc/lirc.install
+++ b/extra/lirc/lirc.install
@@ -1,9 +1,9 @@
-EXTRAMODULES=extramodules-3.4-ARCH
+EXTRAMODULES=extramodules-3.6-ARCH
 
 post_install() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  depmod $(cat /lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
+  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
 }
 
 post_upgrade() {
diff --git a/extra/lirc/lirc.service b/extra/lirc/lirc.service
new file mode 100644
index 000000000..953601fd3
--- /dev/null
+++ b/extra/lirc/lirc.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Linux Infrared Remote Control
+
+[Service]
+ExecStartPre=/usr/bin/ln -sf /run/lirc/lircd /dev/lircd
+ExecStart=/usr/sbin/lircd --pidfile=/run/lirc/lircd.pid
+Type=forking
+PIDFile=/run/lirc/lircd.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/lirc/lirc.tmpfiles b/extra/lirc/lirc.tmpfiles
new file mode 100644
index 000000000..0b80e2e47
--- /dev/null
+++ b/extra/lirc/lirc.tmpfiles
@@ -0,0 +1 @@
+d /run/lirc 0755 root root -
diff --git a/extra/lirc/lircm.service b/extra/lirc/lircm.service
new file mode 100644
index 000000000..6b258e312
--- /dev/null
+++ b/extra/lirc/lircm.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=LIRC Mouse
+After=lirc.service
+Wants=lirc.service
+
+[Service]
+ExecStart=/usr/sbin/lircmd -u
+Type=forking
+
+[Install]
+WantedBy=multi-user.target