From ce52bb380f2eec59a02cc2e108cd3a5c749a1032 Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Thu, 22 Feb 2007 19:04:19 +0000 Subject: [PATCH] Added patch to compile with kernel 2.6.20, Bug #166557. Package-Manager: portage-2.1.2-r10 --- app-misc/lirc/ChangeLog | 6 +- app-misc/lirc/Manifest | 28 ++-- .../lirc/files/lirc-0.8.1-kernel-2.6.20.diff | 145 ++++++++++++++++++ app-misc/lirc/lirc-0.8.1.ebuild | 3 +- 4 files changed, 168 insertions(+), 14 deletions(-) create mode 100644 app-misc/lirc/files/lirc-0.8.1-kernel-2.6.20.diff 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 + +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 lirc-0.8.0-r8.ebuild: Marked ppc stable for bug #159980. diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest index fd2129887a9c..12f377d3bfe7 100644 --- a/app-misc/lirc/Manifest +++ b/app-misc/lirc/Manifest @@ -57,6 +57,10 @@ AUX lirc-0.8.1-imon-pad2keys.patch 8123 RMD160 1dba2af99821ec73b5bc38b9f6733bf3e MD5 393407e55668d762ad0812c1f17a7dfa files/lirc-0.8.1-imon-pad2keys.patch 8123 RMD160 1dba2af99821ec73b5bc38b9f6733bf3e8aa02d2 files/lirc-0.8.1-imon-pad2keys.patch 8123 SHA256 d1fd6ba55335f4185f00bec901117fd4cce03ad0541a539cdd78618b060f7cbc files/lirc-0.8.1-imon-pad2keys.patch 8123 +AUX lirc-0.8.1-kernel-2.6.20.diff 5003 RMD160 89d3073e0f0c049c16ece750c06ba4f046340371 SHA1 28bc0258485ff21f7f0725b7e234060958c2e25d SHA256 34d436c19d64e7b9c48173dc84342f251d28733827c3f160da44d394dbd7d099 +MD5 e33d5f9995d7493f131c74406c3c463e files/lirc-0.8.1-kernel-2.6.20.diff 5003 +RMD160 89d3073e0f0c049c16ece750c06ba4f046340371 files/lirc-0.8.1-kernel-2.6.20.diff 5003 +SHA256 34d436c19d64e7b9c48173dc84342f251d28733827c3f160da44d394dbd7d099 files/lirc-0.8.1-kernel-2.6.20.diff 5003 AUX lirc-remotewonderplus.patch 876 RMD160 5fa5bd312f60ec900a38b189134627f2c27449bc SHA1 b13a5c024b0eb6f9b65cb1a795c618832aad39e3 SHA256 12e296b694fa9f3889d191756cd9c3846822ca7e653ee3e26c00bf7bf5a73a88 MD5 e68a17220295d3c72d78c9e78d9ec9b0 files/lirc-remotewonderplus.patch 876 RMD160 5fa5bd312f60ec900a38b189134627f2c27449bc files/lirc-remotewonderplus.patch 876 @@ -95,14 +99,14 @@ EBUILD lirc-0.8.0-r8.ebuild 8426 RMD160 d546fe03b2d8583dbc80309aa9927761f3211384 MD5 bccbc8e06bf4b952364cfb3039403c8a lirc-0.8.0-r8.ebuild 8426 RMD160 d546fe03b2d8583dbc80309aa9927761f3211384 lirc-0.8.0-r8.ebuild 8426 SHA256 a1f5ea68c904c70dc3a184e6b8a226638642743a7247aad34b5e67360e50f488 lirc-0.8.0-r8.ebuild 8426 -EBUILD lirc-0.8.1.ebuild 7766 RMD160 028f46ed8bc576b304435e2c458888547387c048 SHA1 28637b184723a0e496a3be96925faa04380016a7 SHA256 54fdaeb3a317e78c6c8a4dcf1e042c5a6d38940e41bad2c3b56148464d094bc5 -MD5 6a1b7d49d8472dd8c59f5277827f8cff lirc-0.8.1.ebuild 7766 -RMD160 028f46ed8bc576b304435e2c458888547387c048 lirc-0.8.1.ebuild 7766 -SHA256 54fdaeb3a317e78c6c8a4dcf1e042c5a6d38940e41bad2c3b56148464d094bc5 lirc-0.8.1.ebuild 7766 -MISC ChangeLog 20442 RMD160 0438c938950f9310fd8afc84e5d6e77e057bcd79 SHA1 0760f070598a331bd3437971e017b003c6436aa6 SHA256 8f7ed983f06648b5b34f5fc3674373c750ad9cea652af2a43f8589cc8cb98b0f -MD5 a1e0c427a37bf38e02c01abb112bd35d ChangeLog 20442 -RMD160 0438c938950f9310fd8afc84e5d6e77e057bcd79 ChangeLog 20442 -SHA256 8f7ed983f06648b5b34f5fc3674373c750ad9cea652af2a43f8589cc8cb98b0f ChangeLog 20442 +EBUILD lirc-0.8.1.ebuild 7810 RMD160 1b0e528bb080353b786cebf3cff4d275e0ee9be0 SHA1 ca6d2e9c19985dfc8b466f24aa108d0b7148708d SHA256 ccb7de2c7ddc8c89b1d86ec9ed266270c0b995e1dd596238d137fa92969e6708 +MD5 6ca1cdd69ad04dc78f36b4ae0c20a171 lirc-0.8.1.ebuild 7810 +RMD160 1b0e528bb080353b786cebf3cff4d275e0ee9be0 lirc-0.8.1.ebuild 7810 +SHA256 ccb7de2c7ddc8c89b1d86ec9ed266270c0b995e1dd596238d137fa92969e6708 lirc-0.8.1.ebuild 7810 +MISC ChangeLog 20611 RMD160 9d942bd6f5500cdbb16c32c47fbd85ceccf471d0 SHA1 84d75fd158159baaa49d989401a2d1f0c4526f9c SHA256 99c70524d30c15fd466b9d2a45c99be15bd97544ff976c45df585b1e1c7c71ff +MD5 2ec9c67fcae4b794a1e8b04c0bf70b00 ChangeLog 20611 +RMD160 9d942bd6f5500cdbb16c32c47fbd85ceccf471d0 ChangeLog 20611 +SHA256 99c70524d30c15fd466b9d2a45c99be15bd97544ff976c45df585b1e1c7c71ff ChangeLog 20611 MISC metadata.xml 252 RMD160 e1c170c221f61fa9787a04feac90fab777639d88 SHA1 9fdd5da8466c39d7ff3b40412c4dfa77dd2446b7 SHA256 4e8b5c34b3e50b781a18c9be9e6199442f1b0299e00d66ba35024f8b743b9c32 MD5 abf8a9c4b96bc3bb50f04a48349dae34 metadata.xml 252 RMD160 e1c170c221f61fa9787a04feac90fab777639d88 metadata.xml 252 @@ -117,9 +121,9 @@ MD5 570f33b570b59a825856007da3f3fd18 files/digest-lirc-0.8.1 235 RMD160 1f11ae05892517002e2b10bcf42f00a1388651f5 files/digest-lirc-0.8.1 235 SHA256 a417bf0f77bcebeb15d873c786344c9d7622dce02aa31f8f8fa1912ad673d301 files/digest-lirc-0.8.1 235 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFqf5dcsIHjyDViGQRAupXAJ9OoN/XSoF/ZdFxESGLSq9waiH+DQCfWUxF -Lf2W32Jj0zTp8RgaOdZb6i4= -=CAqO +iD8DBQFF3ek+t2vP6XvVdOcRAmaVAJ0eJ/97QA+367tA0EaIogB/0NzNRACdF+ZB +rrN2Au6flOTJqDFZiT+CcJc= +=wxjo -----END PGP SIGNATURE----- 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 -- 2.26.2