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

lirc-0.8.1-imon_pad2keys.patch

@@ -1,5 +1,31 @@
---- lirc-0.8.1/drivers/lirc_imon/lirc_imon.c	2006-12-29 11:00:07.000000000 +0100
+--- lirc-0.8.2/drivers/Makefile.am
-+++ lirc-0.8.1/drivers/lirc_imon2/lirc_imon2.c	2007-04-23 14:50:31.000000000 +0200
++++ lirc-0.8.2/drivers/Makefile.am
+@@ -15,6 +15,7 @@
+ 	lirc_i2c \
+ 	lirc_igorplugusb \
+ 	lirc_imon \
++	lirc_imon2 \
+ 	lirc_it87 \
+ 	lirc_mceusb \
+ 	lirc_mceusb2 \
+--- lirc-0.8.2/drivers/lirc_imon/Makefile.am
++++ lirc-0.8.2/drivers/lirc_imon/Makefile.am
+@@ -5,9 +5,9 @@
+ ## this is so that Automake includes the C compiling definitions, and
+ ## includes the source files in the distribution.
+ EXTRA_PROGRAMS = automake_dummy
+-automake_dummy_SOURCES = lirc_imon.c
++automake_dummy_SOURCES = lirc_imon2.c
+ 
+ ## there is no *just* object file support in automake.  This is close enough
+-module_DATA = lirc_imon.o
++module_DATA = lirc_imon2.o
+ 
+-include ../Makefile.common
+\ No newline at end of file
++include ../Makefile.common
+--- lirc-0.8.2/drivers/lirc_imon/lirc_imon.c
++++ lirc-0.8.2/drivers/lirc_imon/lirc_imon.c
 @@ -65,9 +65,9 @@
  
  
@@ -21,7 +47,7 @@
  
  
  /* ------------------------------------------------------------
-@@ -160,6 +161,9 @@
+@@ -166,6 +167,9 @@
  		atomic_t busy;		     /* write in progress         */
  		int status;		     /* status of tx completion   */
  	} tx;
@@ -31,15 +57,15 @@
  };
  
  #define LOCK_CONTEXT	down (&context ->sem)
-@@ -250,6 +254,7 @@
+@@ -256,6 +260,7 @@
  
  MODULE_AUTHOR (MOD_AUTHOR);
  MODULE_DESCRIPTION (MOD_DESC);
 +MODULE_VERSION(MOD_VERSION);    /* MBr: was missing */
  MODULE_LICENSE ("GPL");
+ MODULE_DEVICE_TABLE (usb, imon_usb_id_table);
  module_param (debug, int, 0);
- MODULE_PARM_DESC (debug, "Debug messages: 0=no, 1=yes (default: no)");
+@@ -682,6 +687,11 @@
-@@ -574,6 +579,11 @@
  	context ->rx.initial_space = 1;
  	context ->rx.prev_bit = 0;
  
@@ -51,7 +77,7 @@
  	usb_fill_int_urb (context ->rx_urb, context ->dev,
  		usb_rcvintpipe (context ->dev,
  				context ->rx_endpoint-> bEndpointAddress),
-@@ -704,6 +714,76 @@
+@@ -836,6 +846,76 @@
  
  		/* The signals have been decoded onboard the iMON controller */
  
@@ -128,29 +154,3 @@
  		lirc_buffer_write_1 (context ->plugin ->rbuf, buf);
  		wake_up (&context ->plugin ->rbuf ->wait_poll);
  		return;
---- lirc-0.8.1/drivers/lirc_imon/Makefile.am	2005-01-26 21:07:28.000000000 +0100
-+++ lirc-0.8.1/drivers/lirc_imon2/Makefile.am	2007-04-23 14:50:31.000000000 +0200
-@@ -5,9 +5,9 @@
- ## this is so that Automake includes the C compiling definitions, and
- ## includes the source files in the distribution.
- EXTRA_PROGRAMS = automake_dummy
--automake_dummy_SOURCES = lirc_imon.c
-+automake_dummy_SOURCES = lirc_imon2.c
- 
- ## there is no *just* object file support in automake.  This is close enough
--module_DATA = lirc_imon.o
-+module_DATA = lirc_imon2.o
- 
--include ../Makefile.common
-\ No newline at end of file
-+include ../Makefile.common
---- lirc-0.8.1/drivers/Makefile.am
-+++ lirc-0.8.1/drivers/Makefile.am
-@@ -15,6 +15,7 @@
- 	lirc_i2c \
- 	lirc_igorplugusb \
- 	lirc_imon \
-+	lirc_imon2 \
- 	lirc_it87 \
- 	lirc_mceusb \
- 	lirc_mceusb2 \

lirc-2.6.23.diff

@@ -0,0 +1,30 @@
+--- drivers/lirc_dev/lirc_dev.c
++++ drivers/lirc_dev/lirc_dev.c
+@@ -880,8 +880,7 @@
+ 	return SUCCESS;
+ 
+ out_unregister:
+-	if(unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME))
+-		printk(KERN_ERR "lirc_dev: unregister_chrdev failed!\n");
++	unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME);
+ out:
+ 	return -1;
+ }
+@@ -905,15 +904,11 @@
+  */
+ void cleanup_module(void)
+ {
+-	int ret;
+ 
+-	ret = unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME);
++	unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME);
+ 	class_destroy(lirc_class);
+ 
+-	if(ret)
+-		printk("lirc_dev: error in module_unregister_chrdev: %d\n", ret);
+-	else
+-		dprintk("lirc_dev: module successfully unloaded\n");
++	dprintk("lirc_dev: module successfully unloaded\n");
+ }
+ 
+ MODULE_DESCRIPTION("LIRC base driver module");

lirc-kernel.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 18 19:08:05 CEST 2007 - ro@suse.de
+
+- fix build with 2.6.23 
+
 -------------------------------------------------------------------
 Fri Aug 10 15:07:12 CEST 2007 - lnussel@suse.de
 

lirc-kernel.spec

@@ -17,12 +17,13 @@ License:        GPL v2 or later
 Group:          System/Kernel
 Summary:        LIRC kernel modules
 Version:        0.8.2
-Release:        1
+Release:        2
 Source0:        lirc-0.8.2.tar.bz2
 Source1:        Makefile.module
 Source2:        Makefile.modsub
 Patch:          lirc-0.8.1-kernel_SLAB_ATOMIC.diff
 Patch1:         lirc-0.8.1-imon_pad2keys.patch
+Patch2:         lirc-2.6.23.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %suse_kernel_module_package -n lirc kdump um debug
 
@@ -49,6 +50,7 @@ mv lirc_imon2/lirc_imon.c lirc_imon2/lirc_imon2.c
 popd
 #%patch -p1
 %patch1 -p1
+%patch2 -p0
 autoreconf -f -i
 ./configure --with-driver=all
 cp -a drivers source
@@ -76,8 +78,9 @@ for flavor in %flavors_to_build; do
     make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install \
 	 M=$PWD/obj/$flavor
 done
-
 %changelog
+* Thu Oct 18 2007 - ro@suse.de
+- fix build with 2.6.23
 * Fri Aug 10 2007 - lnussel@suse.de
 - upgrade to 0.8.2 final, just minor changes
 * Fri Jun 01 2007 - lnussel@suse.de

lirc.spec

@@ -15,12 +15,12 @@ BuildRequires:  alsa-devel xorg-x11-devel
 %if %suse_version > 1020
 BuildRequires:  fdupes
 %endif
-URL:            http://www.lirc.org/
+Url:            http://www.lirc.org/
 License:        GPL v2 or later
 Group:          Hardware/Other
-Autoreqprov:    on
+AutoReqProv:    on
 Version:        0.8.2
-Release:        1
+Release:        20
 PreReq:         %fillup_prereq
 Summary:        Tools for Infrared Receivers
 Source0:        lirc-0.8.2.tar.bz2
@@ -114,7 +114,6 @@ rm -f %{buildroot}%{_libdir}/liblirc_client.la
 # get rid of useless contrib stuff
 rm contrib/lirc.*
 %if %suse_version > 1020
-
 %fdupes $RPM_BUILD_ROOT
 %endif
 #
@@ -154,7 +153,6 @@ install -D -m 644 /dev/null %{buildroot}/etc/lircd.conf
 
 %clean
 rm -rf %{buildroot}
-
 %changelog
 * Fri Aug 10 2007 - lnussel@suse.de
 - upgrade to 0.8.2 final, just minor changes