[arch-commits] Commit in lirc-utils/trunk (4 files)
Eric Belanger
eric at archlinux.org
Wed Jul 23 02:50:00 UTC 2008
Date: Tuesday, July 22, 2008 @ 22:50:00
Author: eric
Revision: 6058
upgpkg: lirc-utils 0.8.3-1
upstream update, enabled IR transmitters support (close FS#9709), fixed daemon script to facilitate the use of device that don't create device (close FS#9767), disabled SMP build, removed old patch
Added:
lirc-utils/trunk/kernel-2.6.26.patch
Modified:
lirc-utils/trunk/PKGBUILD
lirc-utils/trunk/lircd
Deleted:
lirc-utils/trunk/kernel-2.6.20.patch
---------------------+
PKGBUILD | 36 +++++++-----
kernel-2.6.20.patch | 145 --------------------------------------------------
kernel-2.6.26.patch | 122 ++++++++++++++++++++++++++++++++++++++++++
lircd | 7 ++
4 files changed, 150 insertions(+), 160 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-07-23 02:45:05 UTC (rev 6057)
+++ PKGBUILD 2008-07-23 02:50:00 UTC (rev 6058)
@@ -2,40 +2,48 @@
# Maintainer: Paul Mattal <paul at archlinux.org>
pkgname=lirc-utils
-pkgver=0.8.2
+pkgver=0.8.3
pkgrel=1
pkgdesc="Linux Infrared Remote Control utils"
arch=(i686 x86_64)
+url="http://www.lirc.org/"
license=('GPL')
-_kernver=2.6.21-ARCH
+_kernver=2.6.26-ARCH
depends=('alsa-lib' 'libusb' 'libx11' 'libsm')
-makedepends=(help2man)
-options=('!libtool')
+makedepends=('help2man')
+replaces=('lirc+pctv')
+backup=('etc/lircd.conf' 'etc/lircmd.conf'\
+ 'etc/conf.d/lircd')
+options=('!libtool' '!makeflags')
source=(http://umn.dl.sf.net/sourceforge/lirc/lirc-$pkgver.tar.bz2 \
- lircd lircmd lirc.logrotate lircd.conf.d kernel-2.6.20.patch)
-md5sums=('83e7060a6693b81075c178d7e3b215af' 'a454dae4bd8db55e305d5720546b04ae'\
+ lircd lircmd lirc.logrotate lircd.conf.d kernel-2.6.26.patch)
+md5sums=('8e78eeded7b31e5ad02e328970437c0f' '909ad968afa10e4511e1da277bb23c3b'\
'85f7fdac55e5256967241864049bf5e9' '3deb02604b37811d41816e9b4385fcc3'\
- '5b1f8c9cd788a39a6283f93302ce5c6e' '5922c346bbc946a25aa6bdc3f9383308')
-url="http://www.lirc.org/"
-backup=('etc/lircd.conf' 'etc/lircmd.conf'\
- 'etc/conf.d/lircd')
-replaces=('lirc+pctv')
+ '5b1f8c9cd788a39a6283f93302ce5c6e' '1753acd774f50b638e6173d364de53fd')
build() {
- export MAKEFLAGS="-j1"
# configure
cd $startdir/src/lirc-$pkgver || return 1
- #patch -Np0 -i ../kernel-2.6.20.patch || return 1
+ patch -Np1 -i ../kernel-2.6.26.patch || return 1
+
+ # Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+
+ sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am || return 1
+
+ autoreconf || return 1
+ libtoolize || return 1
+
./configure --enable-sandboxed --prefix=/usr \
--with-driver=all --with-kerneldir=/usr/src/linux-${_kernver} \
--with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \
+ --with-transmitter \
|| return 1
# disable parallel and bt829
# because of incompatibility with smp systems
sed -i -e "s:lirc_parallel::" -e "s:lirc_bt829::" \
Makefile drivers/Makefile drivers/*/Makefile tools/Makefile \
|| return 1
- # build
+
+ # build
make || return 1
make DESTDIR=$startdir/pkg install || return 1
mkdir -p $startdir/pkg/usr/share/lirc $startdir/pkg/etc/rc.d \
Deleted: kernel-2.6.20.patch
===================================================================
--- kernel-2.6.20.patch 2008-07-23 02:45:05 UTC (rev 6057)
+++ kernel-2.6.20.patch 2008-07-23 02:50:00 UTC (rev 6058)
@@ -1,145 +0,0 @@
---- drivers/lirc_atiusb/lirc_atiusb.c 2006/10/20 05:03:38 1.55
-+++ drivers/lirc_atiusb/lirc_atiusb.c 2007/01/16 08:45:04 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;
---- drivers/lirc_igorplugusb/lirc_igorplugusb.c 2006/10/20 05:03:38 1.9
-+++ drivers/lirc_igorplugusb/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(
---- drivers/lirc_mceusb/lirc_mceusb.c 2006/10/20 05:03:38 1.13
-+++ drivers/lirc_mceusb/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
---- drivers/lirc_mceusb2/lirc_mceusb2.c 2007/01/16 06:05:27 1.22
-+++ drivers/lirc_mceusb2/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;
---- drivers/lirc_streamzap/lirc_streamzap.c 2006/12/01 04:11:52 1.18
-+++ drivers/lirc_streamzap/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
Added: kernel-2.6.26.patch
===================================================================
--- kernel-2.6.26.patch (rev 0)
+++ kernel-2.6.26.patch 2008-07-23 02:50:00 UTC (rev 6058)
@@ -0,0 +1,122 @@
+--- a/drivers/kcompat.h 2008-01-13 11:26:28.000000000 +0100
++++ b/drivers/kcompat.h 2008-05-14 18:37:49.000000000 +0200
+@@ -1,4 +1,4 @@
+-/* $Id: kcompat.h,v 5.34 2008/01/13 10:26:28 lirc Exp $ */
++/* $Id: kcompat.h,v 5.36 2008/05/14 16:37:49 lirc Exp $ */
+
+ #ifndef _KCOMPAT_H
+ #define _KCOMPAT_H
+@@ -36,10 +36,10 @@
+ class_simple_destroy(cls);
+ }
+
+-#define lirc_class_device_create(cs, parent, dev, device, fmt, args...) \
+- class_simple_device_add(cs, dev, device, fmt, ## args)
++#define lirc_device_create(cs, parent, dev, fmt, args...) \
++ class_simple_device_add(cs, dev, parent, fmt, ## args)
+
+-static inline void class_device_destroy(lirc_class_t *cls, dev_t devt)
++static inline void lirc_device_destroy(lirc_class_t *cls, dev_t devt)
+ {
+ class_simple_device_remove(devt);
+ }
+@@ -48,20 +48,40 @@
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15)
+
+-#define lirc_class_device_create(cs, parent, dev, device, fmt, args...) \
+- class_device_create(cs, dev, device, fmt, ## args)
++#define lirc_device_create(cs, parent, dev, fmt, args...) \
++ class_device_create(cs, dev, parent, fmt, ## args)
+
+ #else /* >= 2.6.15 */
+
+-#define lirc_class_device_create class_device_create
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
++
++#define lirc_device_create(cs, parent, dev, fmt, args...) \
++ class_device_create(cs, NULL, dev, parent, fmt, ## args)
++
++#else /* >= 2.6.26 */
++
++#define lirc_device_create device_create
++
++#endif /* >= 2.6.26 */
++
+ #define LIRC_DEVFS_PREFIX
+
+-#endif
++#endif /* >= 2.6.15 */
+
+ typedef struct class lirc_class_t;
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
++
++#define lirc_device_destroy class_device_destroy
++
++#else
++
++#define lirc_device_destroy device_destroy
++
+ #endif
+
++#endif /* >= 2.6.13 */
++
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0)
+ #define LIRC_HAVE_DEVFS
+ #define LIRC_HAVE_DEVFS_24
+@@ -133,8 +153,8 @@
+ #ifndef LIRC_HAVE_SYSFS
+ #define class_destroy(x) do { } while (0)
+ #define class_create(x, y) NULL
+-#define class_device_destroy(x, y) do { } while (0)
+-#define lirc_class_device_create(x, y, z, xx, yy, zz) 0
++#define lirc_class_destroy(x, y) do { } while (0)
++#define lirc_class_create(x, y, z, xx, yy, zz) 0
+ #define IS_ERR(x) 0
+ typedef struct class_simple
+ {
+--- a/drivers/lirc_dev/lirc_dev.c 2008-01-13 11:45:02.000000000 +0100
++++ b/drivers/lirc_dev/lirc_dev.c 2008-05-14 18:37:49.000000000 +0200
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+- * $Id: lirc_dev.c,v 1.56 2008/01/13 10:45:02 lirc Exp $
++ * $Id: lirc_dev.c,v 1.58 2008/05/14 16:37:49 lirc Exp $
+ *
+ */
+
+@@ -145,7 +145,8 @@
+ #ifdef LIRC_HAVE_DEVFS_26
+ devfs_remove(DEV_LIRC "/%u", ir->p.minor);
+ #endif
+- class_device_destroy(lirc_class, MKDEV(IRCTL_DEV_MAJOR, ir->p.minor));
++ lirc_device_destroy(lirc_class,
++ MKDEV(IRCTL_DEV_MAJOR, ir->p.minor));
+
+ if (ir->buf != ir->p.rbuf) {
+ lirc_buffer_free(ir->buf);
+@@ -400,9 +401,9 @@
+ S_IFCHR|S_IRUSR|S_IWUSR,
+ DEV_LIRC "/%u", ir->p.minor);
+ #endif
+- (void) lirc_class_device_create(lirc_class, NULL,
+- MKDEV(IRCTL_DEV_MAJOR, ir->p.minor),
+- ir->p.dev, "lirc%u", ir->p.minor);
++ (void) lirc_device_create(lirc_class, ir->p.dev,
++ MKDEV(IRCTL_DEV_MAJOR, ir->p.minor),
++ "lirc%u", ir->p.minor);
+
+ if (p->sample_rate || p->get_queue) {
+ /* try to fire up polling thread */
+@@ -441,7 +442,8 @@
+ return minor;
+
+ out_sysfs:
+- class_device_destroy(lirc_class, MKDEV(IRCTL_DEV_MAJOR, ir->p.minor));
++ lirc_device_destroy(lirc_class,
++ MKDEV(IRCTL_DEV_MAJOR, ir->p.minor));
+ #ifdef LIRC_HAVE_DEVFS_24
+ devfs_unregister(ir->devfs_handle);
+ #endif
Modified: lircd
===================================================================
--- lircd 2008-07-23 02:45:05 UTC (rev 6057)
+++ lircd 2008-07-23 02:50:00 UTC (rev 6058)
@@ -9,7 +9,12 @@
start)
stat_busy "Starting LIRC Daemon"
[ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS"
- [ -z "$PID" ] && /usr/sbin/lircd -d $LIRC_DEVICE $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
+ [ -z "$PID" ] &&
+ if [ -n "$LIRC_DEVICE" ] ; then
+ /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
+ else
+ /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE
+ fi
if [ $? -gt 0 ]; then
stat_fail
else
More information about the arch-commits
mailing list