From 55365f9398ded52e8a352079cba0787866e58153 Mon Sep 17 00:00:00 2001 From: James Meyer <james.meyer@operamail.com> Date: Sat, 6 Nov 2010 18:42:39 +0000 Subject: lirc: update to 0.8.7 ref #574 ref #647 closes #599 --- abs/core/lirc/PKGBUILD | 49 ++++++++++++++++++++++++---------------------- abs/core/lirc/lirc.install | 6 +++--- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/abs/core/lirc/PKGBUILD b/abs/core/lirc/PKGBUILD index 8c3b5a6..a99f7fb 100644 --- a/abs/core/lirc/PKGBUILD +++ b/abs/core/lirc/PKGBUILD @@ -1,52 +1,55 @@ -# $Id: PKGBUILD 80419 2010-05-17 08:09:39Z tpowa $ +# $Id: PKGBUILD 97714 2010-11-01 14:32:08Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=lirc -pkgver=0.8.6 -pkgrel=5 -_kernver=2.6.34-LinHES +pkgver=0.8.7 +pkgrel=1 +_kernver=2.6.36-LinHES pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" arch=('i686' 'x86_64') url="http://www.lirc.org/" license=('GPL') -depends=('lirc-utils=0.8.6' 'kernel26>=2.6.34' 'kernel26<2.6.35') -makedepends=('help2man' 'kernel26-headers>=2.6.34' 'kernel26-headers<2.6.35') +depends=('lirc-utils=0.8.7' 'kernel26>=2.6.36' 'kernel26<2.6.37') +makedepends=('help2man' 'kernel26-headers>=2.6.36' 'kernel26-headers<2.6.37') replaces=('lirc+pctv') options=('!makeflags') install=$pkgname.install -source=("http://prdownloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'kernel-2.6.33.patch') -md5sums=('4ca24da6f5e7c2dcea74878c27a4a3f7' - 'f029698154cf32bc51e5e69879d53a12') +source=("http://prdownloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('fb1dcddbc8ca3d03c7f3a2d40cf28b71') build() { # configure - cd ${srcdir}/lirc-${pkgver} || return 1 + cd ${srcdir}/lirc-${pkgver} # see http://bugs.gentoo.org/301321 - patch -p0 -i ../kernel-2.6.33.patch || return 1 + #patch -p0 -i ../kernel-2.6.33.patch + #patch -Np0 -i ../kernel-2.6.35.patch ./configure --enable-sandboxed --prefix=/usr \ --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \ --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \ - --with-transmitter \ - || return 1 + --with-transmitter # disable parallel and bt829 # because of incompatibility with smp systems sed -i -e "s:lirc_parallel::" -e "s:lirc_bt829::" \ - Makefile drivers/Makefile drivers/*/Makefile tools/Makefile \ - || return 1 - + Makefile drivers/Makefile drivers/*/Makefile tools/Makefile + # lirc_i2c lirc_igorplugusb lirc_imon lirc_it87 lirc_ite8709 + # lirc_sasem lirc_serial lirc_sir lirc_ttusbir lirc_zilog + # because part of kernel 2.6.36 staging tree + sed -i -e "s:lirc_i2c::" -e "s:lirc_igorplugusb::" -e "s:lirc_imon::" \ + -e "s:lirc_it87::" -e "s:lirc_ite8709::" -e "s:lirc_sasem::" \ + -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \ + -e "s:lirc_zilog::" Makefile drivers/Makefile drivers/*/Makefile tools/Makefile # disable lirc_gpio due to brokeness of kernel 2.6.23 sed -i -e "s:lirc_gpio::" \ - Makefile drivers/Makefile drivers/*/Makefile tools/Makefile \ - || return 1 + Makefile drivers/Makefile drivers/*/Makefile tools/Makefile # build - cd drivers || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + cd drivers + make + make DESTDIR=${pkgdir} install # set the kernel we've built for inside the install script sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \ - ${startdir}/lirc.install || return 1 + ${startdir}/lirc.install } + diff --git a/abs/core/lirc/lirc.install b/abs/core/lirc/lirc.install index ac4bf13..495e505 100644 --- a/abs/core/lirc/lirc.install +++ b/abs/core/lirc/lirc.install @@ -10,7 +10,7 @@ pre_install() { post_install() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - KERNEL_VERSION=2.6.34-LinHES + KERNEL_VERSION=2.6.36-LinHES depmod -v $KERNEL_VERSION > /dev/null 2>&1 /bin/true } @@ -26,7 +26,7 @@ pre_upgrade() { post_upgrade() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - KERNEL_VERSION=2.6.34-LinHES + KERNEL_VERSION=2.6.36-LinHES depmod -v $KERNEL_VERSION > /dev/null 2>&1 /bin/true } @@ -40,7 +40,7 @@ pre_remove() { post_remove() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - KERNEL_VERSION=2.6.34-LinHES + KERNEL_VERSION=2.6.36-LinHES depmod -v $KERNEL_VERSION > /dev/null 2>&1 /bin/true } -- cgit v0.12