Fri Dec 27 23:54:04 UTC 2013

2 files changed, 33 insertions, 27 deletions

diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 47c271c60..aaeebc1c1 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 196465 2013-10-14 07:07:38Z tpowa $
+# $Id: PKGBUILD 202421 2013-12-21 18:29:42Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgbase=lirc
 pkgbase=lirc-libre
-pkgname=('lirc-libre' 'lirc-utils-libre')
+pkgname=('lirc-libre' 'lirc-libre-utils')
 pkgver=0.9.0
-pkgrel=64
+pkgrel=67
 epoch=1
-_extramodules=extramodules-3.11-LIBRE
+_extramodules=extramodules-3.12-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.11' 'linux-libre<3.12' 'linux-libre-headers>=3.11' 'linux-libre-headers<3.12' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+makedepends=('help2man' 'linux-libre>=3.12' 'linux-libre<3.13' 'linux-libre-headers>=3.12' 'linux-libre-headers<3.13' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2')
 options=('!makeflags' '!strip')
 source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2
         lirc_wpc8769l.patch
@@ -26,9 +26,19 @@ source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar
         lircm.service
         irexec.service
         lirc.tmpfiles)
+md5sums=('b232aef26f23fe33ea8305d276637086'
+         '1cce37e18e3f6f46044abab29016d18f'
+         'b70cc9640505205446ec47b7d4779f38'
+         '1f8b104a2365d9f93404b143f499059b'
+         '087a7d102e1c96bf1179f38db2b0b237'
+         '9ee196bd03ea44af5a752fb0cc6ca96a'
+         '3deb02604b37811d41816e9b4385fcc3'
+         'a9ab637e7207472e61e55a2fa75dc555'
+         '1847b9997685bc3ad2cf11bea4590a92'
+         '07131d117fcfe9dcd50c453c3a5e9531'
+         'febf25c154a7d36f01159e84f26c2d9a')
 
-build() {
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+prepare() {
   cd "${srcdir}/lirc-${pkgver}"
   patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch"
   patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
@@ -47,10 +57,16 @@ build() {
       -e 's/@X_LIBS@//g' \
       -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}"
 
   PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
       --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
@@ -61,13 +77,14 @@ build() {
   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::" \
-      -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile 
+      -e "s:lirc_atiusb::" -e "s:lirc_i2c::" \
+      -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile
   make
 }
 
 package_lirc-libre() {
   pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package)"
-  depends=('lirc-utils-libre' 'linux-libre>=3.11' 'linux-libre<3.12')
+  depends=('lirc-utils-libre' 'linux-libre>=3.12' 'linux-libre<3.13')
   replaces=('lirc' 'lirc+pctv')
   conflicts=('lirc')
   provides=("lirc=$pkgver")
@@ -82,14 +99,14 @@ package_lirc-libre() {
   find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
 }
 
-package_lirc-utils-libre() {
+package_lirc-libre-utils() {
   pkgdesc="Linux Infrared Remote Control utils"
-  depends=('alsa-lib' 'libx11' 'libftdi' 'libirman')
+  depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman')
   optdepends=('python2: pronto2lirc utility')
-  options=('strip' '!libtool')
-  replaces=('lirc-utils')
-  conflicts=('lirc-utils')
-  provides=("lirc-utils=$pkgver")
+  options=('strip')
+  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}"
@@ -109,14 +126,3 @@ package_lirc-utils-libre() {
   # remove built modules
   rm -r "${pkgdir}/usr/lib/modules"
 }
-md5sums=('b232aef26f23fe33ea8305d276637086'
-         '1cce37e18e3f6f46044abab29016d18f'
-         'b70cc9640505205446ec47b7d4779f38'
-         '1f8b104a2365d9f93404b143f499059b'
-         '087a7d102e1c96bf1179f38db2b0b237'
-         '9ee196bd03ea44af5a752fb0cc6ca96a'
-         '3deb02604b37811d41816e9b4385fcc3'
-         'a9ab637e7207472e61e55a2fa75dc555'
-         '1847b9997685bc3ad2cf11bea4590a92'
-         '07131d117fcfe9dcd50c453c3a5e9531'
-         'febf25c154a7d36f01159e84f26c2d9a')
diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install
index 2f46d837b..50e7566f9 100644
--- a/libre/lirc-libre/lirc.install
+++ b/libre/lirc-libre/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.11-LIBRE
+EXTRAMODULES=extramodules-3.12-LIBRE
 
 post_install() {
   # updating module dependencies