diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-10 10:04:03 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-10 10:04:03 +0200 |
commit | db5f9e94c74935ba2d3f3e5267f5184f78303e15 (patch) | |
tree | 5ffa37eab5f2f7a1afa9f4eedc7f05636668f8de /extra/lirc | |
parent | 7d166e43d693278dc2585521d147f2b972e8a40c (diff) | |
parent | 223ca251f3ce07eb5484be845e631d6ca645b263 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/erlang/PKGBUILD
community/bird/PKGBUILD
community/chmsee/PKGBUILD
extra/avahi/PKGBUILD
extra/lirc/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
testing/btrfs-progs/PKGBUILD
testing/gcc/PKGBUILD
Diffstat (limited to 'extra/lirc')
-rw-r--r-- | extra/lirc/PKGBUILD | 13 | ||||
-rw-r--r-- | extra/lirc/lirc.install | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD index d282ae30d..808fd41bf 100644 --- a/extra/lirc/PKGBUILD +++ b/extra/lirc/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 152026 2012-03-04 13:12:52Z tpowa $ +# $Id: PKGBUILD 155878 2012-04-08 11:00:49Z ibiru $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgbase=lirc pkgname=('lirc' 'lirc-utils') pkgver=0.9.0 -pkgrel=12 +pkgrel=15 epoch=1 -_extramodules=extramodules-3.2-LIBRE -_kernver="$(cat /lib/modules/${_extramodules}/version)" +_extramodules=extramodules-3.3-ARCH arch=('i686' 'x86_64' 'mips64el') url="http://www.lirc.org/" license=('GPL') -makedepends=('help2man' 'linux-headers>=3.2' 'linux-headers<3.3' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') +### NOTICE don't forget to bump version in depends in package_lirc +makedepends=('help2man' 'linux-headers>=3.3' 'linux-headers<3.4' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch @@ -32,6 +32,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086' '69d099e6deedfa3c1ee2b6e82d9b8bfb') build() { + _kernver="$(cat /lib/modules/${_extramodules}/version)" cd "${srcdir}/lirc-${pkgver}" patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch" patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch" @@ -61,7 +62,7 @@ build() { package_lirc() { pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" - depends=('lirc-utils' 'linux>=3.2' 'linux<3.3') + depends=('lirc-utils' 'linux>=3.3' 'linux<3.4') replaces=('lirc+pctv') install=lirc.install diff --git a/extra/lirc/lirc.install b/extra/lirc/lirc.install index 9bf905742..4339aaf45 100644 --- a/extra/lirc/lirc.install +++ b/extra/lirc/lirc.install @@ -1,4 +1,4 @@ -EXTRAMODULES=extramodules-3.2-ARCH +EXTRAMODULES=extramodules-3.3-ARCH post_install() { # updating module dependencies |