lirc-libre-1:0.9.1-1: updating version

1 files changed, 25 insertions, 48 deletions

diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 947e4a2c2..6a8a1f207 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,56 +1,35 @@
-# $Id: PKGBUILD 217013 2014-07-18 09:27:57Z tpowa $
+# $Id: PKGBUILD 219356 2014-08-06 11:45:19Z lfleischer $
 # Maintainer (Arch): Paul Mattal <paul@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-libre-utils')
-pkgver=0.9.0
-pkgrel=75
+pkgver=0.9.1
+pkgrel=1
 epoch=1
-_extramodules=extramodules-3.15-libre
+_extramodules=extramodules-3.16-libre
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lirc.org/"
 license=('GPL')
-### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux-libre>=3.15' 'linux-libre<3.16' 'linux-libre-headers>=3.15' 'linux-libre-headers<3.16' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2')
+# NOTICE: Don't forget to bump version in depends in package_lirc()!
+makedepends=('help2man' 'linux-libre>=3.16' 'linux-libre<3.17' 'linux-libre-headers>=3.16' 'linux-libre-headers<3.17' 'alsa-lib' 'libx11' 'libftdi-compat' '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
-        linux-3.8.patch
+source=("http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2"
+	"wpc8769l-build-fix.patch"
         lirc.logrotate
-        lirc.service
-        lircm.service
         irexec.service
         lirc.tmpfiles)
-md5sums=('b232aef26f23fe33ea8305d276637086'
-         '1cce37e18e3f6f46044abab29016d18f'
-         'b70cc9640505205446ec47b7d4779f38'
-         '1f8b104a2365d9f93404b143f499059b'
-         '087a7d102e1c96bf1179f38db2b0b237'
-         '9ee196bd03ea44af5a752fb0cc6ca96a'
+md5sums=('3b78c3cc872d5e2fa78b796c2efd46db'
+         '9ec33169b3407f74264062d7679dd269'
          '3deb02604b37811d41816e9b4385fcc3'
-         'a9ab637e7207472e61e55a2fa75dc555'
-         '1847b9997685bc3ad2cf11bea4590a92'
-         '07131d117fcfe9dcd50c453c3a5e9531'
+         '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
-
-  # 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"
 
   sed -i '/AC_PATH_XTRA/d' configure.ac
   sed -e 's/@X_CFLAGS@//g' \
@@ -58,19 +37,17 @@ 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() {
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
   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 \
+      --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
@@ -84,19 +61,19 @@ build() {
 
 package_lirc-libre() {
   pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package)"
-  depends=('lirc-libre-utils' 'linux-libre>=3.15' 'linux-libre<3.16')
+  depends=('lirc-libre-utils' 'linux-libre>=3.16' 'linux-libre<3.17')
   replaces=('lirc' 'lirc+pctv')
   conflicts=('lirc')
   provides=("lirc=$pkgver")
   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 -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-libre-utils() {
@@ -104,25 +81,25 @@ package_lirc-libre-utils() {
   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')
   replaces=('lirc-utils' 'lirc-utils-libre')
   conflicts=('lirc-utils' 'lirc-utils-libre')
   provides=("lirc-utils=$pkgver" 'lirc-utils-libre')
   install=lirc-utils.install
 
   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"
 }