lirc: update to 0.9.1a; build for kernel 3.18.1

1 files changed, 36 insertions, 56 deletions

diff --git a/abs/core/lirc/PKGBUILD b/abs/core/lirc/PKGBUILD
index e77de3a..c79cf09 100644
--- a/abs/core/lirc/PKGBUILD
+++ b/abs/core/lirc/PKGBUILD
@@ -3,41 +3,35 @@
 
 pkgbase=lirc
 pkgname=('lirc' 'lirc-utils')
-pkgver=0.9.0
-pkgrel=74
-#epoch=1
-_extramodules=extramodules-3.13-ARCH
+_pkgver=0.9.1a
+[[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" || pkgver="$_pkgver"
+pkgrel=11
+epoch=1
+_extramodules=extramodules-3.18-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>=3.13' 'linux<3.14' 'linux-headers>=3.13' 'linux-headers<3.14' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2' 'iguanair')
+# 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
-        lirc_wpc8769l.patch
-        lircd-handle-large-config.patch
-        lirc_atiusb-kfifo.patch
-        kernel-2.6.39.patch
-        linux-3.8.patch
+source=("http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${_pkgver}.tar.bz2"
+        wpc8769l-build-fix.patch
+        lirc-0.9.1a-fix-segfaults.patch
         lirc.logrotate
-        lirc.service 
-        lircm.service 
         irexec.service
         lirc.tmpfiles)
+md5sums=('1f1fac162ed309dd50f307e96a292957'
+         '9ec33169b3407f74264062d7679dd269'
+         'cd00acf480e82a0bf050032732d0d733'
+         '3deb02604b37811d41816e9b4385fcc3'
+         '32df3b9bc859565d6acf5f0e5b747083'
+         'febf25c154a7d36f01159e84f26c2d9a')
 
 prepare() {
-  cd "${srcdir}/lirc-${pkgver}"
-  patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch"
-  patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
-  patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch"
-  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
+  cd "${srcdir}/lirc-${_pkgver}"
 
-  # use /dev/lirc0 by default instead of /dev/lirc
-  sed -i -e 's|#define DEV_LIRC	"lirc"|#define DEV_LIRC	"lirc0"|' config.h.in
+  patch -Np1 -i "${srcdir}/wpc8769l-build-fix.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' \
@@ -45,78 +39,64 @@ prepare() {
       -e 's/@X_PRE_LIBS@//g' \
       -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
 
-  # fix for new automake #33497
-  sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac
   libtoolize
   autoreconf
 }
 
 build() {
+  cd "${srcdir}/lirc-${_pkgver}"
   _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-  cd "${srcdir}/lirc-${pkgver}"
 
   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 \
+      --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_atiusb::" -e "s:lirc_i2c::" \
       -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile
   make
-      #removed removing    lirc_atiusb which is needed for the firefly 
-      #-e "s:lirc_atiusb::" -e "s:lirc_i2c::" \
 }
 
 package_lirc() {
   pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
-  depends=('lirc-utils' 'linux>=3.13' 'linux<3.14')
+  depends=('lirc-utils' 'linux>=3.18' 'linux<3.19' 'iguanair')
   replaces=('lirc+pctv')
   install=lirc.install
 
-  cd "${srcdir}/lirc-${pkgver}/drivers"
+  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 -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install"
-  # gzip -9 modules
-  find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+  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')
+  depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman')
   optdepends=('python2: pronto2lirc utility')
   options=('strip')
+  backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf' 'etc/lirc/lircmd.conf')
   install=lirc-utils.install
 
-  cd "${srcdir}/lirc-${pkgver}"
+  cd "${srcdir}/lirc-${_pkgver}"
+
   make DESTDIR="${pkgdir}" install
-  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
+
+  install -Dm644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service
+  install -Dm644 "${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/"
 
   # install the logrotate config
   install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc"
     
-  install -d "${pkgdir}/etc/lirc"
-  
   # remove built modules
   rm -r "${pkgdir}/usr/lib/modules"
 }
-md5sums=('b232aef26f23fe33ea8305d276637086'
-         '1cce37e18e3f6f46044abab29016d18f'
-         'b70cc9640505205446ec47b7d4779f38'
-         '1f8b104a2365d9f93404b143f499059b'
-         '087a7d102e1c96bf1179f38db2b0b237'
-         '9ee196bd03ea44af5a752fb0cc6ca96a'
-         '3deb02604b37811d41816e9b4385fcc3'
-         'a9ab637e7207472e61e55a2fa75dc555'
-         '1847b9997685bc3ad2cf11bea4590a92'
-         '07131d117fcfe9dcd50c453c3a5e9531'
-         'febf25c154a7d36f01159e84f26c2d9a')