Added patch to compile with kernel 2.6.20, Bug #166557.

(Portage version: 2.1.2-r10)

3 files changed, 152 insertions, 2 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index a36788100cee..7171ce7c7e08 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/lirc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.131 2007/01/14 09:58:41 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.132 2007/02/22 19:04:19 zzam Exp $
+
+  22 Feb 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/lirc-0.8.1-kernel-2.6.20.diff, lirc-0.8.1.ebuild:
+  Added patch to compile with kernel 2.6.20, Bug #166557.
 
   14 Jan 2007; Joseph Jezak <josejx@gentoo.org> lirc-0.8.0-r8.ebuild:
   Marked ppc stable for bug #159980.
diff --git a/app-misc/lirc/files/lirc-0.8.1-kernel-2.6.20.diff b/app-misc/lirc/files/lirc-0.8.1-kernel-2.6.20.diff
new file mode 100644
index 000000000000..a2526ee888c0
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.8.1-kernel-2.6.20.diff
@@ -0,0 +1,145 @@
+--- lirc-0.8.1/drivers/lirc_mceusb2/lirc_mceusb2.c	16 Jan 2007 06:05:27 -0000	1.22
++++ lirc-0.8.1/drivers/lirc_mceusb2/lirc_mceusb2.c	16 Jan 2007 08:45:04 -0000	1.23
+@@ -264,7 +264,7 @@
+ 	async_urb->transfer_buffer_length = size;
+ 	async_urb->dev = ir->usbdev;
+ 
+-	if ((res=usb_submit_urb(async_urb, SLAB_ATOMIC))) {
++	if ((res=usb_submit_urb(async_urb, GFP_ATOMIC))) {
+ 	    dprintk(DRIVER_NAME "[%d]: receive request FAILED! (res=%d)\n", ir->devnum, res);
+ 	    return;
+ 	}
+@@ -467,7 +467,7 @@
+ 	}
+ 
+ 	/* resubmit urb */
+-	usb_submit_urb(urb, SLAB_ATOMIC);
++	usb_submit_urb(urb, GFP_ATOMIC);
+ }
+ 
+ 
+@@ -703,7 +703,7 @@
+ 			mem_failure = 3;
+ 		} else if (lirc_buffer_init(rbuf, sizeof(lirc_t), LIRCBUF_SIZE)) {
+ 			mem_failure = 4;
+-		} else if (!(ir->buf_in = usb_buffer_alloc(dev, maxp, SLAB_ATOMIC, &ir->dma_in))) {
++		} else if (!(ir->buf_in = usb_buffer_alloc(dev, maxp, GFP_ATOMIC, &ir->dma_in))) {
+ 			mem_failure = 5;
+ 		} else if (!(ir->urb_in = usb_alloc_urb(0, GFP_KERNEL))) {
+ 			mem_failure = 7;
+--- lirc-0.8.1/drivers/lirc_atiusb/lirc_atiusb.c	20 Oct 2006 05:03:38 -0000	1.55
++++ lirc-0.8.1/drivers/lirc_atiusb/lirc_atiusb.c	16 Jan 2007 08:45:04 -0000	1.56
+@@ -251,7 +251,7 @@
+ 	add_wait_queue(&oep->wait, &wait);
+ 
+ #ifdef KERNEL_2_5
+-	if (usb_submit_urb(oep->urb, SLAB_ATOMIC)) {
++	if (usb_submit_urb(oep->urb, GFP_ATOMIC)) {
+ #else
+ 	if (usb_submit_urb(oep->urb)) {
+ #endif
+@@ -323,7 +323,7 @@
+ 			iep->urb->dev = ir->usbdev;
+ 			dprintk(DRIVER_NAME "[%d]: linking iep 0x%02x (%p)\n", ir->devnum, iep->ep->bEndpointAddress, iep);
+ #ifdef KERNEL_2_5
+-			if ((rtn = usb_submit_urb(iep->urb, SLAB_ATOMIC)) < 0) {
++			if ((rtn = usb_submit_urb(iep->urb, GFP_ATOMIC)) < 0) {
+ #else
+ 			if ((rtn = usb_submit_urb(iep->urb)) < 0) {
+ #endif
+@@ -659,7 +659,7 @@
+ 
+ 	/* resubmit urb */
+ #ifdef KERNEL_2_5
+-	usb_submit_urb(urb, SLAB_ATOMIC);
++	usb_submit_urb(urb, GFP_ATOMIC);
+ #endif
+ }
+ 
+@@ -775,7 +775,7 @@
+ 		iep->len = len;
+ 
+ #ifdef KERNEL_2_5
+-		if ( !(iep->buf = usb_buffer_alloc(dev, len, SLAB_ATOMIC, &iep->dma)) ) {
++		if ( !(iep->buf = usb_buffer_alloc(dev, len, GFP_ATOMIC, &iep->dma)) ) {
+ 			mem_failure = 2;
+ 		} else if ( !(iep->urb = usb_alloc_urb(0, GFP_KERNEL)) ) {
+ 			mem_failure = 3;
+@@ -856,7 +856,7 @@
+ 		init_waitqueue_head(&oep->wait);
+ 
+ #ifdef KERNEL_2_5
+-		if ( !(oep->buf = usb_buffer_alloc(dev, USB_OUTLEN, SLAB_ATOMIC, &oep->dma)) ) {
++		if ( !(oep->buf = usb_buffer_alloc(dev, USB_OUTLEN, GFP_ATOMIC, &oep->dma)) ) {
+ 			mem_failure = 2;
+ 		} else if ( !(oep->urb = usb_alloc_urb(0, GFP_KERNEL)) ) {
+ 			mem_failure = 3;
+--- lirc-0.8.1/drivers/lirc_mceusb/lirc_mceusb.c	20 Oct 2006 05:03:38 -0000	1.13
++++ lirc-0.8.1/drivers/lirc_mceusb/lirc_mceusb.c	16 Jan 2007 08:45:04 -0000	1.14
+@@ -768,7 +768,7 @@
+ 			dev->bulk_in_endpointAddr = endpoint->bEndpointAddress;
+ #ifdef KERNEL_2_5
+ 			dev->bulk_in_buffer = usb_buffer_alloc
+-				(udev, buffer_size, SLAB_ATOMIC, &dev->dma_in);
++				(udev, buffer_size, GFP_ATOMIC, &dev->dma_in);
+ #else
+ 			dev->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
+ #endif
+@@ -795,7 +795,7 @@
+ 			dev->bulk_out_size = buffer_size;
+ 			dev->bulk_out_endpointAddr = endpoint->bEndpointAddress;
+ #ifdef KERNEL_2_5
+-			dev->bulk_out_buffer = usb_buffer_alloc(udev, buffer_size, SLAB_ATOMIC, &dev->dma_out);
++			dev->bulk_out_buffer = usb_buffer_alloc(udev, buffer_size, GFP_ATOMIC, &dev->dma_out);
+ #else
+ 			dev->bulk_out_buffer = kmalloc (buffer_size, GFP_KERNEL);
+ #endif
+--- lirc-0.8.1/drivers/lirc_streamzap/lirc_streamzap.c	1 Dec 2006 04:11:52 -0000	1.18
++++ lirc-0.8.1/drivers/lirc_streamzap/lirc_streamzap.c	16 Jan 2007 08:45:04 -0000	1.19
+@@ -458,7 +458,7 @@
+ 
+ #ifdef KERNEL_2_5
+ 	/* resubmit only for 2.6 */
+-	usb_submit_urb( urb, SLAB_ATOMIC );
++	usb_submit_urb( urb, GFP_ATOMIC );
+ #endif
+ 
+ 	return;
+@@ -556,7 +556,7 @@
+ 	sz->buf_in_len = sz->endpoint->wMaxPacketSize;
+ #ifdef KERNEL_2_5
+         if((sz->buf_in = usb_buffer_alloc(sz->udev, sz->buf_in_len,
+-					  SLAB_ATOMIC, &sz->dma_in)) == NULL )
++					  GFP_ATOMIC, &sz->dma_in)) == NULL )
+ 	{
+                 goto error;
+ 	}
+@@ -715,7 +715,7 @@
+ 
+ 	sz->urb_in->dev = sz->udev;
+ #ifdef KERNEL_2_5
+-	if (usb_submit_urb(sz->urb_in, SLAB_ATOMIC))
++	if (usb_submit_urb(sz->urb_in, GFP_ATOMIC))
+ #else
+ 	if (usb_submit_urb(sz->urb_in))
+ #endif
+@@ -866,7 +866,7 @@
+ 
+ 		sz->urb_in->dev = sz->udev;
+ #ifdef KERNEL_2_5
+-		if (usb_submit_urb(sz->urb_in, SLAB_ATOMIC))
++		if (usb_submit_urb(sz->urb_in, GFP_ATOMIC))
+ #else
+ 		if (usb_submit_urb(sz->urb_in))
+ #endif
+--- lirc-0.8.1/drivers/lirc_igorplugusb/lirc_igorplugusb.c	20 Oct 2006 05:03:38 -0000	1.9
++++ lirc-0.8.1/drivers/lirc_igorplugusb/lirc_igorplugusb.c	16 Jan 2007 08:45:04 -0000	1.10
+@@ -484,7 +484,7 @@
+ #if defined(KERNEL_2_5)
+ 		} else if (!(ir->buf_in = usb_buffer_alloc(dev, 
+ 				DEVICE_BUFLEN+DEVICE_HEADERLEN, 
+-                                SLAB_ATOMIC, &ir->dma_in))) {
++                                GFP_ATOMIC, &ir->dma_in))) {
+ 			mem_failure = 5;
+ #else
+ 		} else if (!(ir->buf_in = kmalloc(
diff --git a/app-misc/lirc/lirc-0.8.1.ebuild b/app-misc/lirc/lirc-0.8.1.ebuild
index 8eeb562ec6ad..670d48751341 100644
--- a/app-misc/lirc/lirc-0.8.1.ebuild
+++ b/app-misc/lirc/lirc-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.1.ebuild,v 1.1 2007/01/07 19:39:40 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.1.ebuild,v 1.2 2007/02/22 19:04:19 zzam Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -237,6 +237,7 @@ src_unpack() {
 	# Fix a sandbox violation while checking which cc to use for Kernel 2.6.19
 	# and newer
 	epatch ${FILESDIR}/${PN}-0.8.0-sandbox-fix.diff
+	epatch ${FILESDIR}/${P}-kernel-2.6.20.diff
 
 	# Rip out dos CRLF
 	edos2unix contrib/lirc.rules