pool/lirc
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lirc?expand=0&rev=20

Browse Source
This commit is contained in:
OBS User unknown 2008-10-13 14:37:52 +00:00 committed by Git OBS Bridge
parent 2de2a671d1
commit 18d6ceca52
12 changed files with 47 additions and 359 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
lirc-0.8.1-kernel_SLAB_ATOMIC.diff
View File

@ -1,155 +0,0 @@
Index: lirc-0.8.1/drivers/lirc_atiusb/lirc_atiusb.c
===================================================================
--- lirc-0.8.1.orig/drivers/lirc_atiusb/lirc_atiusb.c
+++ lirc-0.8.1/drivers/lirc_atiusb/lirc_atiusb.c
@@ -251,7 +251,7 @@ static void send_packet(struct out_endpt
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 @@ static int set_use_inc(void *data)
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 @@ static void usb_remote_recv(struct urb *
/* resubmit urb */
#ifdef KERNEL_2_5
- usb_submit_urb(urb, SLAB_ATOMIC);
+ usb_submit_urb(urb, GFP_ATOMIC);
#endif
}
@@ -775,7 +775,7 @@ static struct in_endpt *new_in_endpt(str
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 @@ static struct out_endpt *new_out_endpt(s
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;
Index: lirc-0.8.1/drivers/lirc_igorplugusb/lirc_igorplugusb.c
===================================================================
--- lirc-0.8.1.orig/drivers/lirc_igorplugusb/lirc_igorplugusb.c
+++ lirc-0.8.1/drivers/lirc_igorplugusb/lirc_igorplugusb.c
@@ -484,7 +484,7 @@ static void *usb_remote_probe(struct usb
#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(
Index: lirc-0.8.1/drivers/lirc_mceusb/lirc_mceusb.c
===================================================================
--- lirc-0.8.1.orig/drivers/lirc_mceusb/lirc_mceusb.c
+++ lirc-0.8.1/drivers/lirc_mceusb/lirc_mceusb.c
@@ -768,7 +768,7 @@ static void * mceusb_probe(struct usb_de
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 @@ static void * mceusb_probe(struct usb_de
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
Index: lirc-0.8.1/drivers/lirc_mceusb2/lirc_mceusb2.c
===================================================================
--- lirc-0.8.1.orig/drivers/lirc_mceusb2/lirc_mceusb2.c
+++ lirc-0.8.1/drivers/lirc_mceusb2/lirc_mceusb2.c
@@ -263,7 +263,7 @@ static void request_packet_async(struct
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;
}
@@ -466,7 +466,7 @@ static void usb_remote_recv(struct urb *
}
/* resubmit urb */
- usb_submit_urb(urb, SLAB_ATOMIC);
+ usb_submit_urb(urb, GFP_ATOMIC);
}
@@ -702,7 +702,7 @@ static int usb_remote_probe(struct usb_i
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;
Index: lirc-0.8.1/drivers/lirc_streamzap/lirc_streamzap.c
===================================================================
--- lirc-0.8.1.orig/drivers/lirc_streamzap/lirc_streamzap.c
+++ lirc-0.8.1/drivers/lirc_streamzap/lirc_streamzap.c
@@ -458,7 +458,7 @@ static void usb_streamzap_irq(struct urb
#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 @@ static void *streamzap_probe(struct usb_
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 @@ static int streamzap_use_inc(void *data)
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 @@ static int streamzap_resume(struct usb_i
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

14
lirc-0.8.3-hw_i2cuser.diff
View File

@ -1,14 +0,0 @@
Index: lirc-0.8.3/daemons/hw-types.c
===================================================================
--- lirc-0.8.3.orig/daemons/hw-types.c
+++ lirc-0.8.3/daemons/hw-types.c
@@ -110,7 +110,9 @@ struct hardware *hw_list[] =
&hw_dvico,
#endif
&hw_ea65,
+#ifdef HAVE_LINUX_I2C_DEV_H
&hw_i2cuser,
+#endif
#ifdef HAVE_IGUANAIR
&hw_iguanaIR,
#endif

16
lirc-0.8.3-hw_i2cuser_header.diff
View File

@ -1,16 +0,0 @@
Index: lirc-0.8.3/daemons/hw_i2cuser.c
===================================================================
--- lirc-0.8.3.orig/daemons/hw_i2cuser.c
+++ lirc-0.8.3/daemons/hw_i2cuser.c
@@ -52,8 +52,10 @@
#include <dirent.h>
#include <time.h>
#include <signal.h>
-#include <linux/i2c.h>
#include <linux/i2c-dev.h>
+#ifndef I2C_SLAVE /* hack */
+#include <linux/i2c.h>
+#endif
#include "hardware.h"
#include "ir_remote.h"

3
lirc-0.8.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8190c84fb40376380c163009808df4bd25bac53890261a48c522bb9ccad5723f
size 667882

3
lirc-0.8.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a803ae84b81e6c145bafc880835df44501d75d5e572d8a92d45209df15b581c0
size 694420

133
lirc-kernel-2.6.26-fixes.patch
View File

@ -1,133 +0,0 @@
--- lirc/drivers/lirc_dev/lirc_dev.c 2008/01/13 10:45:02 1.56
+++ lirc/drivers/lirc_dev/lirc_dev.c 2008/08/12 20:50:39 1.59
@@ -49,7 +49,11 @@
#include <linux/uaccess.h>
#include <linux/errno.h>
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
#include <asm/semaphore.h>
+#else
+#include <linux/semaphore.h>
+#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
#include <linux/wrapper.h>
#endif
@@ -145,7 +149,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 +405,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 +446,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
--- lirc/drivers/kcompat.h 2008/01/13 10:26:28 5.34
+++ lirc/drivers/kcompat.h 2008/05/14 16:37:49 5.36
@@ -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
{
--- lirc/drivers/lirc_i2c/lirc_i2c.c 2008/08/31 23:45:56 1.1
+++ lirc/drivers/lirc_i2c/lirc_i2c.c 2008/08/31 23:46:36
@@ -54,7 +54,11 @@
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
#include <asm/semaphore.h>
+#else
+#include <linux/semaphore.h>
+#endif
#include "drivers/kcompat.h"
#include "drivers/lirc_dev/lirc_dev.h"

12
lirc-kernel-2.6.27-fixes.patch
View File

@ -1,12 +0,0 @@
--- lirc-0.8.3/drivers/kcompat.h 2008/09/01 00:02:20 1.5
+++ lirc-0.8.3/drivers/kcompat.h 2008/09/01 00:15:39
@@ -60,7 +60,8 @@
#else /* >= 2.6.26 */
-#define lirc_device_create device_create
+#define lirc_device_create(cs, parent, dev, fmt, args...) \
+ device_create_drvdata(cs, parent, dev, NULL, fmt, ## args)
#endif /* >= 2.6.26 */

8
lirc-kernel.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Oct 13 09:06:34 CEST 2008 - lnussel@suse.de
- new version 0.8.4
* added support for ITE8709 CIR port (Gregory Lardiere)
* added pronto2lirc converter (Olavi Akerman)
* support for include directive in lircd.conf
-------------------------------------------------------------------
Mon Sep 1 02:20:04 CEST 2008 - ro@suse.de

28
lirc-kernel.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package lirc-kernel (Version 0.8.3)
# spec file for package lirc-kernel (Version 0.8.4MACRO)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -24,18 +24,14 @@ BuildRequires: kernel-source kernel-syms module-init-tools
License: GPL v2 or later
Group: System/Kernel
Summary: LIRC kernel modules
Version: 0.8.3
Release: 5
Source0: lirc-%{version}.tar.bz2
Version: 0.8.4%{?snapshot:_%snapshot}
Release: 1
Source0: lirc-%{?snapshot}%{!?snapshot:%version}.tar.bz2
Source1: Makefile.module
Source2: Makefile.modsub
Patch: lirc-0.8.1-kernel_SLAB_ATOMIC.diff
#Patch0: lirc-0.8.4pre1-kernel-2.6.27.diff
# http://brakemeier.de/electronics/vdr/lirc-imon.html
Patch1: lirc-0.8.3pre1-imon-pad2keys.patch
# picked from CVS
Patch2: lirc-kernel-2.6.26-fixes.patch
# hack to build
Patch3: lirc-kernel-2.6.27-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%suse_kernel_module_package -n lirc kdump um debug
@ -84,17 +80,16 @@ receivers for the serial port.
%prep
%setup -q -n lirc-%{version}
%setup -q -n lirc-%{?snapshot}%{!?snapshot:%version}
pushd drivers
cp -av lirc_imon lirc_imon2
mv lirc_imon2/lirc_imon.c lirc_imon2/lirc_imon2.c
popd
#%patch -p1
#%patch0 -p0
%patch1 -p1
%patch2 -p1
%patch3 -p1
autoreconf -f -i
./configure --with-driver=all
PYTHON=/usr/bin/python \
./configure --with-driver=all
cp -a drivers source
find source -name 'Makefile*'|xargs rm
ln -s . source/drivers
@ -122,6 +117,11 @@ for flavor in %flavors_to_build; do
done
%changelog
* Mon Oct 13 2008 lnussel@suse.de
- new version 0.8.4
* added support for ITE8709 CIR port (Gregory Lardiere)
* added pronto2lirc converter (Olavi Akerman)
* support for include directive in lircd.conf
* Mon Sep 01 2008 ro@suse.de
- pick some fixes from cvs to compile with 2.6.26
- hack to build with 2.6.27

8
lirc.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Oct 13 09:06:34 CEST 2008 - lnussel@suse.de
- new version 0.8.4
* added support for ITE8709 CIR port (Gregory Lardiere)
* added pronto2lirc converter (Olavi Akerman)
* support for include directive in lircd.conf
-------------------------------------------------------------------
Tue Aug 19 14:13:37 CEST 2008 - lnussel@suse.de

24
lirc.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package lirc (Version 0.8.3)
# spec file for package lirc (Version 0.8.4MACRO)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -41,11 +41,11 @@ Url: http://www.lirc.org/
License: GPL v2 or later
Group: Hardware/Other
AutoReqProv: on
Version: 0.8.3
Release: 34
Version: 0.8.4%{?snapshot:_%snapshot}
Release: 1
PreReq: %fillup_prereq %insserv_prereq
Summary: Tools for Infrared Receivers
Source0: lirc-0.8.3.tar.bz2
Source0: lirc-%{?snapshot}%{!?snapshot:%version}.tar.bz2
Source4: rc.lirc
Source5: sysconfig.lirc
Source6: fix-remote-keys.pl
@ -55,8 +55,6 @@ Source9: 51-lirc.rules
#Patch0: lirc-hw.diff
Patch1: lirc-sockets-in-var.diff
Patch2: imon2_conf.patch
Patch3: lirc-0.8.3-hw_i2cuser.diff
Patch4: lirc-0.8.3-hw_i2cuser_header.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: udev
Suggests: lirc-kmp
@ -73,12 +71,10 @@ control your computer with a remote control.
%prep
%setup -q
%setup -q -n %{name}-%{?snapshot}%{!?snapshot:%version}
#%patch0 -p1 -b .hw
%patch1 -p1 -b .var
%patch2 -p1
%patch3 -p1
%patch4 -p1
cp %{SOURCE8} .
#find . -type d -name CVS -print0 | xargs -0 -- rm -rf
#find . -name .cvsignore -print0 | xargs -0 -- rm -rf
@ -90,6 +86,7 @@ sed -i -e 's/linux\/i2c-dev\.h/foobarblah.h/' configure.ac
%endif
%{?suse_update_config:%{suse_update_config -fl}}
autoreconf -vfi
PYTHON=/usr/bin/python \
CFLAGS="%{optflags}" ./configure \
--prefix=%{_prefix} \
--mandir=%{_mandir} \
@ -144,6 +141,8 @@ rm contrib/lirc.*
#
# ghost file
install -D -m 644 /dev/null %{buildroot}/etc/lircd.conf
# hide python dependency
chmod 644 %{buildroot}%{_bindir}/pronto2lirc
%files
%defattr (-,root,root)
@ -157,7 +156,7 @@ install -D -m 644 /dev/null %{buildroot}/etc/lircd.conf
#%attr (600,root,root) %dev(c,61,0) /dev/lirc # => udev
%dir /var/run/lirc
/var/run/lirc/lircm
/usr/bin/*
%attr(0755,root,root)/usr/bin/*
/usr/sbin/*
/usr/share/lirc
/etc/init.d/lirc
@ -185,6 +184,11 @@ install -D -m 644 /dev/null %{buildroot}/etc/lircd.conf
rm -rf %{buildroot}
%changelog
* Mon Oct 13 2008 lnussel@suse.de
- new version 0.8.4
* added support for ITE8709 CIR port (Gregory Lardiere)
* added pronto2lirc converter (Olavi Akerman)
* support for include directive in lircd.conf
* Tue Aug 19 2008 lnussel@suse.de
- set Required-Stop in init script
* Thu Jun 26 2008 lnussel@suse.de

2
rc.lirc
View File

@ -14,9 +14,7 @@
### BEGIN INIT INFO
# Provides: lirc
# Required-Start: $remote_fs
# Should-Start:
# Required-Stop: $remote_fs
# Should-Stop:
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: lirc daemon