[Frugalware-darcs] frugalware-current: lirc-0.8.2-1-i686

voroskoi voroskoi at frugalware.org
Sun Jun 10 15:10:01 CEST 2007


Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070610125923-dd049-1ced1b21e4a53f6fa8e7764eb6e68dd6532910e9.gz;

[lirc-0.8.2-1-i686
voroskoi <voroskoi at frugalware.org>**20070610125923
 version bump
 kernel-2.6.20 patch in upstream
] {
hunk ./source/apps-extra/lirc/FrugalBuild 5
-pkgver=0.8.1
-pkgrel=10
+pkgver=0.8.2
+pkgrel=1
hunk ./source/apps-extra/lirc/FrugalBuild 23
-source=(${source[@]} rc.lirc lirc.logrotate lirc.sysconfig README.Frugalware lirc_2.6.20.diff)
+source=(${source[@]} rc.lirc lirc.logrotate lirc.sysconfig README.Frugalware)
hunk ./source/apps-extra/lirc/FrugalBuild 47
-
-sha1sums=('f6fe23c8d635ffaeee7633dff784d3c5b45224a5'\
+sha1sums=('3443b24c54e8679483efbb6fb446b41116bc654c'\
hunk ./source/apps-extra/lirc/FrugalBuild 51
-          '0b80c73e902920c028dca98a9006aaa313c6e120'\
-          'b981392038522a75c2e431fa22d75fa35c5a7b07')
+          '0b80c73e902920c028dca98a9006aaa313c6e120')
+
hunk ./source/apps-extra/lirc/lirc_2.6.20.diff 1
---- lirc/drivers/lirc_atiusb/lirc_atiusb.c	2006-10-20 07:03:38.000000000 +0200
-+++ lirc/drivers/lirc_atiusb/lirc_atiusb.c	2007-01-12 00:09:14.000000000 +0100
-@@ -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_KERNEL)) {
- #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_KERNEL)) < 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_KERNEL);
- #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_KERNEL, &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_KERNEL, &oep->dma)) ) {
- 			mem_failure = 2;
- 		} else if ( !(oep->urb = usb_alloc_urb(0, GFP_KERNEL)) ) {
- 			mem_failure = 3;
---- lirc/drivers/lirc_igorplugusb/lirc_igorplugusb.c	2006/10/20 05:03:38	1.9
-+++ lirc_igorplugusb.c	2007/01/16 08:45:04	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(
---- lirc/drivers/lirc_mceusb/lirc_mceusb.c	2006/10/20 05:03:38	1.13
-+++ lirc_mceusb.c	2007/01/16 08:45:04	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/drivers/lirc_mceusb2/lirc_mceusb2.c	2007/01/16 06:05:27	1.22
-+++ lirc_mceusb2.c	2007/01/16 08:45:04	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/drivers/lirc_streamzap/lirc_streamzap.c	2006/12/01 04:11:52	1.18
-+++ lirc_streamzap.c	2007/01/16 08:45:04	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
rmfile ./source/apps-extra/lirc/lirc_2.6.20.diff
}


More information about the Frugalware-darcs mailing list