summaryrefslogtreecommitdiffstats
path: root/abs
diff options
context:
space:
mode:
Diffstat (limited to 'abs')
-rw-r--r--abs/core/lirc/PKGBUILD53
-rw-r--r--abs/core/lirc/__changelog2
-rw-r--r--abs/core/lirc/lirc.install22
-rw-r--r--abs/core/lirc/lirc.lr6
-rw-r--r--abs/core/lirc/lirc_imon.conf2
5 files changed, 28 insertions, 57 deletions
diff --git a/abs/core/lirc/PKGBUILD b/abs/core/lirc/PKGBUILD
index 0ce8b69..ad9ca4c 100644
--- a/abs/core/lirc/PKGBUILD
+++ b/abs/core/lirc/PKGBUILD
@@ -1,26 +1,38 @@
-# $Id: PKGBUILD 127217 2011-06-11 09:10:14Z ibiru $
+# $Id: PKGBUILD 163879 2012-07-21 12:01:55Z tpowa $
# Maintainer: Paul Mattal <paul@archlinux.org>
pkgbase=lirc
pkgname=('lirc' 'lirc-utils')
pkgver=0.9.0
-pkgrel=10
-#epoch=1
-_kernver=2.6.39-LinHES
+pkgrel=22
+epoch=1
+_extramodules=extramodules-3.4-ARCH
arch=('i686' 'x86_64')
url="http://www.lirc.org/"
license=('GPL')
-makedepends=('help2man' 'kernel26-headers>=2.6.39' 'kernel26-headers<2.6.40' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python' )
+### NOTICE don't forget to bump version in depends in package_lirc
+makedepends=('help2man' 'linux-headers>=3.4' 'linux-headers<3.5' 'alsa-lib' 'libx11' 'libftdi' '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
- lircd lircmd lirc.lr lircd.conf irexec.conf irexecd
- lirc_imon.conf)
+ lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd)
+md5sums=('b232aef26f23fe33ea8305d276637086'
+ '1cce37e18e3f6f46044abab29016d18f'
+ 'b70cc9640505205446ec47b7d4779f38'
+ '1f8b104a2365d9f93404b143f499059b'
+ '087a7d102e1c96bf1179f38db2b0b237'
+ '8d0e238dc0eda95e340fe570605da492'
+ '85f7fdac55e5256967241864049bf5e9'
+ '3deb02604b37811d41816e9b4385fcc3'
+ '5b1f8c9cd788a39a6283f93302ce5c6e'
+ 'f0c0ac930326168035f0c8e24357ae55'
+ '69d099e6deedfa3c1ee2b6e82d9b8bfb')
build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
cd "${srcdir}/lirc-${pkgver}"
patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch"
patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
@@ -37,7 +49,7 @@ build() {
PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
--with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
- --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \
+ --with-moduledir=/usr/lib/modules/${_kernver}/kernel/drivers/misc \
--with-transmitter
# Remove drivers already in kernel
@@ -50,15 +62,15 @@ build() {
package_lirc() {
pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
- depends=('lirc-utils' 'kernel26>=2.6.39' 'kernel26<2.6.40' 'iguanair')
+ depends=('lirc-utils' 'linux>=3.4' 'linux<3.5')
replaces=('lirc+pctv')
install=lirc.install
cd "${srcdir}/lirc-${pkgver}/drivers"
- make DESTDIR="${pkgdir}" install
+ make DESTDIR="${pkgdir}" moduledir="/usr/lib/modules/${_extramodules}" 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"
+ sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install"
# gzip -9 modules
find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
}
@@ -78,7 +90,7 @@ package_lirc-utils() {
chmod -R go-w "${pkgdir}/usr/share/lirc/"
# install the logrotate config
- install -Dm644 "${srcdir}/lirc.lr" "${pkgdir}/etc/logrotate.d/lirc"
+ install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc"
# install conf.d file
install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf"
@@ -88,21 +100,6 @@ package_lirc-utils() {
install -d "${pkgdir}/etc/lirc"
- # install IMON VFD module options
- install -Dm644 ${srcdir}/lirc_imon.conf ${pkgdir}/etc/modprobe.d/lirc_imon.conf
-
# remove built modules
- rm -r "${pkgdir}/lib/"
+ rm -r "${pkgdir}/usr/lib/modules"
}
-md5sums=('b232aef26f23fe33ea8305d276637086'
- '1cce37e18e3f6f46044abab29016d18f'
- 'b70cc9640505205446ec47b7d4779f38'
- '1f8b104a2365d9f93404b143f499059b'
- '087a7d102e1c96bf1179f38db2b0b237'
- '8d0e238dc0eda95e340fe570605da492'
- '85f7fdac55e5256967241864049bf5e9'
- '33905430f163432d70e66e593dc4ca5a'
- '5b1f8c9cd788a39a6283f93302ce5c6e'
- 'f0c0ac930326168035f0c8e24357ae55'
- '69d099e6deedfa3c1ee2b6e82d9b8bfb'
- '56f1d74bd20edd96c8e2f2687b124341')
diff --git a/abs/core/lirc/__changelog b/abs/core/lirc/__changelog
index adf3fd6..e9442d0 100644
--- a/abs/core/lirc/__changelog
+++ b/abs/core/lirc/__changelog
@@ -1 +1 @@
-Add iguanair to the list of depends
+iguanir
diff --git a/abs/core/lirc/lirc.install b/abs/core/lirc/lirc.install
index ba2c957..c35848a 100644
--- a/abs/core/lirc/lirc.install
+++ b/abs/core/lirc/lirc.install
@@ -1,31 +1,13 @@
-KERNEL_VERSION=2.6.39-LinHES
+EXTRAMODULES=extramodules-3.4-ARCH
post_install() {
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- depmod $KERNEL_VERSION > /dev/null 2>&1
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
}
post_upgrade() {
post_install
-
- . /etc/systemconfig
-
- # Fix LircSocket in mythtv database
- SOCKET=`mysql -u mythtv -pmythtv -B --skip-column-names -h "${dbhost}" -D mythconverg -e \
- "SELECT data FROM settings WHERE value = 'LircSocket' AND hostname = '${hostname}';"`
- if [ "${SOCKET}" != "/var/run/lirc/lircd" ]; then
- mysql -u mythtv -pmythtv -B --skip-column-names -h "${dbhost}" -D mythconverg -e \
- "UPDATE settings SET data = '/var/run/lirc/lircd' WHERE value = 'LircSocket' AND hostname = '${hostname}';"
- else
- echo ">>>"
- echo ">>> ATTENTION! ATTENTION! ATTENTION!"
- echo ">>> Unable to connect the the MySQL database to make needed"
- echo ">>> changes to the LIRC socket."
- echo ">>> LIRC now uses /var/run/lirc/lircd and /dev/lirc is now"
- echo ">>> obsolete. Update your MythTV settings to reflect this."
- echo ">>>"
- fi
}
# arg 1: the old package version
diff --git a/abs/core/lirc/lirc.lr b/abs/core/lirc/lirc.lr
deleted file mode 100644
index 44bbdbb..0000000
--- a/abs/core/lirc/lirc.lr
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/lircd {
- missingok
- notifempty
- delaycompress
-}
-
diff --git a/abs/core/lirc/lirc_imon.conf b/abs/core/lirc/lirc_imon.conf
deleted file mode 100644
index d3e0b8f..0000000
--- a/abs/core/lirc/lirc_imon.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Module options for IMON VFD. usbid=15c2:ffdc Ref #596
-options lirc_imon display_type=1
generated by cgit v0.12 at 2024-11-02 22:28:39 (GMT)