[arch-commits] CVS update of extra/system/lirc (3 files)

[Tobias Powalowski]

    Date: Saturday, October 13, 2007 @ 11:35:19
  Author: tpowa
    Path: /home/cvs-extra/extra/system/lirc

   Added: kernel-2.6.23.patch (1.1)
Modified: PKGBUILD (1.46 -> 1.47) lirc.install (1.16 -> 1.17)

'upgpkg: update to new kernel'


---------------------+
 PKGBUILD            |   19 +++++++++++++------
 kernel-2.6.23.patch |   36 ++++++++++++++++++++++++++++++++++++
 lirc.install        |    6 +++---
 3 files changed, 52 insertions(+), 9 deletions(-)


Index: extra/system/lirc/PKGBUILD
diff -u extra/system/lirc/PKGBUILD:1.46 extra/system/lirc/PKGBUILD:1.47
--- extra/system/lirc/PKGBUILD:1.46	Mon Jul  9 16:37:32 2007
+++ extra/system/lirc/PKGBUILD	Sat Oct 13 11:35:19 2007
@@ -1,26 +1,27 @@
-# $Id: PKGBUILD,v 1.46 2007/07/09 20:37:32 thomas Exp $
+# $Id: PKGBUILD,v 1.47 2007/10/13 15:35:19 tpowa Exp $
 # Maintainer: Paul Mattal <paul at archlinux.org>
 
 pkgname=lirc
 pkgver=0.8.2
-pkgrel=4
-_kernver=2.6.22-ARCH
+pkgrel=5
+_kernver=2.6.23-ARCH
 pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
 arch=(i686 x86_64)
 license=('GPL')
 depends=('lirc-utils' 'kernel26')
 makedepends=(help2man)
-source=(http://umn.dl.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
+source=(http://puzzle.dl.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 \
+	kernel-2.6.23.patch)
 url="http://www.lirc.org/"
 install=$pkgname.install
 replaces=('lirc+pctv')
-md5sums=('83e7060a6693b81075c178d7e3b215af')
 
 build() {
 	# configure
 	cd $startdir/src/lirc-$pkgver || return 1
+	patch -Np1 -i ../kernel-2.6.23.patch || return 1
 	./configure --enable-sandboxed --prefix=/usr \
-		--with-driver=all --with-kerneldir=/usr/src/linux-${_kernver} \
+		--with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
 		--with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \
 		|| return 1
 
@@ -29,6 +30,10 @@
         sed -i -e "s:lirc_parallel::" -e "s:lirc_bt829::" \
 		Makefile drivers/Makefile drivers/*/Makefile tools/Makefile \
                 || return 1
+	# 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
 
 	# build
 	cd drivers || return 1
@@ -39,3 +44,5 @@
 	sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
 		$startdir/lirc.install || return 1
 }
+md5sums=('83e7060a6693b81075c178d7e3b215af'
+         '645d016b60bd4e67cc880aba034b1f68')
Index: extra/system/lirc/kernel-2.6.23.patch
diff -u /dev/null extra/system/lirc/kernel-2.6.23.patch:1.1
--- /dev/null	Sat Oct 13 11:35:19 2007
+++ extra/system/lirc/kernel-2.6.23.patch	Sat Oct 13 11:35:19 2007
@@ -0,0 +1,36 @@
+--- lirc-0.8.2/drivers/lirc_dev/lirc_dev.c	2007/02/13 06:45:15	1.51
++++ lirc-0.8.2/drivers/lirc_dev/lirc_dev.c	2007/08/30 19:54:46	1.52
+@@ -880,8 +880,13 @@
+ 	return SUCCESS;
+ 
+ out_unregister:
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
++	/* unregister_chrdev returns void now */
++	unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME);
++#else
+ 	if(unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME))
+ 		printk(KERN_ERR "lirc_dev: unregister_chrdev failed!\n");
++#endif
+ out:
+ 	return -1;
+ }
+@@ -905,6 +910,11 @@
+  */
+ void cleanup_module(void)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
++	/* unregister_chrdev returns void now */
++	unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME);
++	class_destroy(lirc_class);
++#else
+ 	int ret;
+ 
+ 	ret = unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME);
+@@ -914,6 +924,7 @@
+ 		printk("lirc_dev: error in module_unregister_chrdev: %d\n", ret);
+ 	else
+ 		dprintk("lirc_dev: module successfully unloaded\n");
++#endif
+ }
+ 
+ MODULE_DESCRIPTION("LIRC base driver module");
Index: extra/system/lirc/lirc.install
diff -u extra/system/lirc/lirc.install:1.16 extra/system/lirc/lirc.install:1.17
--- extra/system/lirc/lirc.install:1.16	Mon Jul  9 16:37:32 2007
+++ extra/system/lirc/lirc.install	Sat Oct 13 11:35:19 2007
@@ -10,7 +10,7 @@
 post_install() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.22-ARCH
+  KERNEL_VERSION=2.6.23-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
   /bin/true
 }
@@ -26,7 +26,7 @@
 post_upgrade() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.22-ARCH
+  KERNEL_VERSION=2.6.23-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
   /bin/true
 }
@@ -40,7 +40,7 @@
 post_remove() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.22-ARCH
+  KERNEL_VERSION=2.6.23-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
   /bin/true
 }