lirc: update to 0.9.2

1 files changed, 47 insertions, 78 deletions

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/,}
 }