[arch-commits] Commit in lirc/trunk (PKGBUILD kernel-2.6.39.patch lirc.install)

[Jan de Groot]

    Date: Tuesday, June 7, 2011 @ 11:30:55
  Author: jgc
Revision: 126831

Add patch to compile with 2.6.39

Added:
  lirc/trunk/kernel-2.6.39.patch
Modified:
  lirc/trunk/PKGBUILD
  lirc/trunk/lirc.install

---------------------+
 PKGBUILD            |   11 ++++++----
 kernel-2.6.39.patch |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++
 lirc.install        |    2 -
 3 files changed, 62 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-07 15:08:35 UTC (rev 126830)
+++ PKGBUILD	2011-06-07 15:30:55 UTC (rev 126831)
@@ -4,17 +4,19 @@
 pkgbase=lirc
 pkgname=('lirc' 'lirc-utils')
 pkgver=0.9.0
-pkgrel=2
+pkgrel=3
 epoch=1
-_kernver=2.6.38-ARCH
+_kernver=2.6.39-ARCH
 arch=('i686' 'x86_64')
 url="http://www.lirc.org/"
 license=('GPL')
-makedepends=('help2man' 'kernel26-headers>=2.6.38' 'kernel26-headers<2.6.39' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python')
+makedepends=('help2man' 'kernel26-headers>=2.6.39' 'kernel26-headers<2.6.40' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python')
 options=('!makeflags' '!strip')
 source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
+        kernel-2.6.39.patch
 	lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd)
 md5sums=('b232aef26f23fe33ea8305d276637086'
+         '087a7d102e1c96bf1179f38db2b0b237'
          '8d0e238dc0eda95e340fe570605da492'
          '85f7fdac55e5256967241864049bf5e9'
          '3deb02604b37811d41816e9b4385fcc3'
@@ -24,6 +26,7 @@
 
 build() {
   cd "${srcdir}/lirc-${pkgver}"
+  patch -Np1 -i "${srcdir}/kernel-2.6.39.patch"
 
   sed -i '/AC_PATH_XTRA/d' configure.ac
   sed -e 's/@X_CFLAGS@//g' \
@@ -48,7 +51,7 @@
 
 package_lirc() {
   pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
-  depends=('lirc-utils' 'kernel26>=2.6.38' 'kernel26<2.6.39')
+  depends=('lirc-utils' 'kernel26>=2.6.39' 'kernel26<2.6.40')
   replaces=('lirc+pctv')
   install=lirc.install
 

Added: kernel-2.6.39.patch
===================================================================
--- kernel-2.6.39.patch	                        (rev 0)
+++ kernel-2.6.39.patch	2011-06-07 15:30:55 UTC (rev 126831)
@@ -0,0 +1,54 @@
+diff -ru lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c
+--- lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c	2011-03-25 23:28:18.000000000 +0100
++++ lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c	2011-06-07 17:02:20.356580306 +0200
+@@ -48,7 +48,6 @@
+ #include <linux/slab.h>
+ #include <linux/module.h>
+ #include <linux/kmod.h>
+-#include <linux/smp_lock.h>
+ #include <linux/completion.h>
+ #include <linux/uaccess.h>
+ #include <linux/usb.h>
+diff -ru lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c
+--- lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c	2011-03-25 23:28:18.000000000 +0100
++++ lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c	2011-06-07 17:04:19.725933627 +0200
+@@ -555,8 +555,8 @@
+ 		kfree(ir);
+ 		return -EINVAL;
+ 	}
+-	printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n",
+-	       adap->id, addr, ir->c.name);
++	printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n",
++	       addr, ir->c.name);
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
+ 	/* register device */
+diff -ru lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c
+--- lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c	2011-03-25 23:28:18.000000000 +0100
++++ lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c	2011-06-07 17:07:23.984935411 +0200
+@@ -361,14 +361,14 @@
+ 		size = count << 3;
+ 
+ 		ldata = (unsigned long *) data_buf;
+-		next_one = generic_find_next_le_bit(ldata, size, 0);
++		next_one = find_next_zero_bit_le(ldata, size, 0);
+ 
+ 		if (next_one > 0)
+ 			put_pulse_bit(next_one
+ 				* WPC8769L_USECS_PER_BIT);
+ 
+ 		while (next_one < size) {
+-			next_zero = generic_find_next_zero_le_bit(ldata,
++			next_zero = find_next_zero_bit_le(ldata,
+ 				size, next_one + 1);
+ 
+ 			put_space_bit(
+@@ -376,7 +376,7 @@
+ 				* WPC8769L_USECS_PER_BIT);
+ 
+ 			if (next_zero < size) {
+-				next_one = generic_find_next_le_bit(ldata,
++				next_one = find_next_bit_le(ldata,
+ 					size, next_zero + 1);
+ 
+ 				put_pulse_bit(

Modified: lirc.install
===================================================================
--- lirc.install	2011-06-07 15:08:35 UTC (rev 126830)
+++ lirc.install	2011-06-07 15:30:55 UTC (rev 126831)
@@ -1,4 +1,4 @@
-KERNEL_VERSION=2.6.38-ARCH
+KERNEL_VERSION=2.6.39-ARCH
 
 post_install() {
   # updating module dependencies