[svn] r5938 - trunk/rpms/dkms-lirc
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Mon Oct 22 18:38:31 CEST 2007
Author: thias
Date: 2007-10-22 18:38:28 +0200 (Mon, 22 Oct 2007)
New Revision: 5938
Added:
trunk/rpms/dkms-lirc/lirc-0.8.2-2.6.23-unregister_chrdev-void.patch
trunk/rpms/dkms-lirc/lirc-0.8.2-alldrivers.patch
Removed:
trunk/rpms/dkms-lirc/lirc-0.8.1pre2-alldrivers.patch
trunk/rpms/dkms-lirc/lirc-0.8.1pre2-nolinuxconfigh.patch
Modified:
trunk/rpms/dkms-lirc/dkms-lirc.spec
Log:
Update dkms-lirc to 0.8.2.
Modified: trunk/rpms/dkms-lirc/dkms-lirc.spec
===================================================================
--- trunk/rpms/dkms-lirc/dkms-lirc.spec 2007-10-22 15:49:39 UTC (rev 5937)
+++ trunk/rpms/dkms-lirc/dkms-lirc.spec 2007-10-22 16:38:28 UTC (rev 5938)
@@ -7,14 +7,14 @@
Summary: Drivers for lirc supported hardware
Name: dkms-lirc
-Version: 0.8.1
+Version: 0.8.2
Release: 1
License: GPL
Group: System Environment/Kernel
URL: http://www.lirc.org/
-Source: http://lirc.sourceforge.net/software/snapshots/lirc-%{version}pre2.tar.bz2
-Patch0: lirc-0.8.1pre2-alldrivers.patch
-Patch1: lirc-0.8.1pre2-nolinuxconfigh.patch
+Source: http://dl.sf.net/lirc/lirc-%{version}.tar.bz2
+Patch0: lirc-0.8.2-alldrivers.patch
+Patch1: lirc-0.8.2-2.6.23-unregister_chrdev-void.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
Requires: gcc, make, lirc
@@ -30,9 +30,9 @@
%prep
-%setup -n lirc-%{version}pre2
+%setup -n lirc-%{version}
%patch0 -p1 -b .alldrivers
-%patch1 -p1 -b .nolinuxconfigh
+%patch1 -p1 -b .2.6.23-unregister_chrdev-void
%build
@@ -77,7 +77,10 @@
AUTOINSTALL="YES"
EOF
+# Clean up... makes module builds fail
+#find %{buildroot} -name .deps | xargs %{__rm} -rf
+
%clean
%{__rm} -rf %{buildroot}
@@ -95,12 +98,16 @@
%files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
%doc COPYING
%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
%changelog
+* Mon Oct 22 2007 Matthias Saou <http://freshrpms.net/> 0.8.2-1
+- Update to 0.8.2 (patch from Miroslav Lichvar).
+- Include patch to fix compilation with 2.6.23+ kernels.
+
* Mon Jan 8 2007 Matthias Saou <http://freshrpms.net/> 0.8.1-1
- Update to 0.8.1 final.
Deleted: trunk/rpms/dkms-lirc/lirc-0.8.1pre2-alldrivers.patch
===================================================================
--- trunk/rpms/dkms-lirc/lirc-0.8.1pre2-alldrivers.patch 2007-10-22 15:49:39 UTC (rev 5937)
+++ trunk/rpms/dkms-lirc/lirc-0.8.1pre2-alldrivers.patch 2007-10-22 16:38:28 UTC (rev 5938)
@@ -1,18 +0,0 @@
-diff -Naupr lirc-0.8.1pre2.orig/configure.in lirc-0.8.1pre2/configure.in
---- lirc-0.8.1pre2.orig/configure.in 2006-10-14 08:19:17.000000000 +0200
-+++ lirc-0.8.1pre2/configure.in 2006-10-18 01:36:19.000000000 +0200
-@@ -1129,14 +1129,12 @@ elif test "$lirc_driver" = "all"; then
- lirc_atiusb \
- lirc_bt829 \
- lirc_cmdir \
-- lirc_gpio \
- lirc_i2c \
- lirc_igorplugusb \
- lirc_imon \
- lirc_it87 \
- lirc_mceusb \
- lirc_mceusb2 \
-- lirc_parallel \
- lirc_sasem \
- lirc_serial \
- lirc_sir \
Deleted: trunk/rpms/dkms-lirc/lirc-0.8.1pre2-nolinuxconfigh.patch
===================================================================
--- trunk/rpms/dkms-lirc/lirc-0.8.1pre2-nolinuxconfigh.patch 2007-10-22 15:49:39 UTC (rev 5937)
+++ trunk/rpms/dkms-lirc/lirc-0.8.1pre2-nolinuxconfigh.patch 2007-10-22 16:38:28 UTC (rev 5938)
@@ -1,171 +0,0 @@
-diff -Naupr lirc-0.8.1pre2.orig/drivers/lirc_atiusb/lirc_atiusb.c lirc-0.8.1pre2/drivers/lirc_atiusb/lirc_atiusb.c
---- lirc-0.8.1pre2.orig/drivers/lirc_atiusb/lirc_atiusb.c 2006-07-31 03:19:57.000000000 +0200
-+++ lirc-0.8.1pre2/drivers/lirc_atiusb/lirc_atiusb.c 2006-10-18 16:42:55.000000000 +0200
-@@ -39,8 +39,6 @@
- #error "*******************************************************"
- #endif
-
--#include <linux/config.h>
--
- #include <linux/kernel.h>
- #include <linux/errno.h>
- #include <linux/init.h>
-diff -Naupr lirc-0.8.1pre2.orig/drivers/lirc_bt829/lirc_bt829.c lirc-0.8.1pre2/drivers/lirc_bt829/lirc_bt829.c
---- lirc-0.8.1pre2.orig/drivers/lirc_bt829/lirc_bt829.c 2005-11-27 12:03:01.000000000 +0100
-+++ lirc-0.8.1pre2/drivers/lirc_bt829/lirc_bt829.c 2006-10-18 16:43:23.000000000 +0200
-@@ -23,7 +23,6 @@
- #error "This driver needs kernel version 2.4.0 or higher"
- #endif
-
--#include <linux/config.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/threads.h>
-diff -Naupr lirc-0.8.1pre2.orig/drivers/lirc_cmdir/lirc_cmdir.c lirc-0.8.1pre2/drivers/lirc_cmdir/lirc_cmdir.c
---- lirc-0.8.1pre2.orig/drivers/lirc_cmdir/lirc_cmdir.c 2006-08-10 02:53:21.000000000 +0200
-+++ lirc-0.8.1pre2/drivers/lirc_cmdir/lirc_cmdir.c 2006-10-18 16:43:31.000000000 +0200
-@@ -35,7 +35,6 @@
- #error "**********************************************************"
- #endif
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/errno.h>
- #include <linux/signal.h>
-diff -Naupr lirc-0.8.1pre2.orig/drivers/lirc_dev/lirc_dev.c lirc-0.8.1pre2/drivers/lirc_dev/lirc_dev.c
---- lirc-0.8.1pre2.orig/drivers/lirc_dev/lirc_dev.c 2006-09-22 05:18:22.000000000 +0200
-+++ lirc-0.8.1pre2/drivers/lirc_dev/lirc_dev.c 2006-10-18 16:43:34.000000000 +0200
-@@ -32,7 +32,6 @@
- #error "**********************************************************"
- #endif
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/sched.h>
-diff -Naupr lirc-0.8.1pre2.orig/drivers/lirc_igorplugusb/lirc_igorplugusb.c lirc-0.8.1pre2/drivers/lirc_igorplugusb/lirc_igorplugusb.c
---- lirc-0.8.1pre2.orig/drivers/lirc_igorplugusb/lirc_igorplugusb.c 2006-03-04 23:36:38.000000000 +0100
-+++ lirc-0.8.1pre2/drivers/lirc_igorplugusb/lirc_igorplugusb.c 2006-10-18 16:43:43.000000000 +0200
-@@ -47,7 +47,6 @@
- #error "*******************************************************"
- #endif
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/kmod.h>
-diff -Naupr lirc-0.8.1pre2.orig/drivers/lirc_imon/lirc_imon.c lirc-0.8.1pre2/drivers/lirc_imon/lirc_imon.c
---- lirc-0.8.1pre2.orig/drivers/lirc_imon/lirc_imon.c 2006-07-31 03:19:57.000000000 +0200
-+++ lirc-0.8.1pre2/drivers/lirc_imon/lirc_imon.c 2006-10-18 16:43:46.000000000 +0200
-@@ -49,8 +49,6 @@
- #error "*** Sorry, this driver requires kernel version 2.4.22 or higher"
- #endif
-
--#include <linux/config.h>
--
- #include <linux/errno.h>
- #include <linux/init.h>
- #include <linux/kernel.h>
-diff -Naupr lirc-0.8.1pre2.orig/drivers/lirc_it87/lirc_it87.c lirc-0.8.1pre2/drivers/lirc_it87/lirc_it87.c
---- lirc-0.8.1pre2.orig/drivers/lirc_it87/lirc_it87.c 2006-01-21 18:43:36.000000000 +0100
-+++ lirc-0.8.1pre2/drivers/lirc_it87/lirc_it87.c 2006-10-18 16:43:51.000000000 +0200
-@@ -38,9 +38,6 @@
- # include <config.h>
- #endif
-
--#include <linux/config.h>
--
--
- #include <linux/sched.h>
- #include <linux/errno.h>
- #include <linux/signal.h>
-diff -Naupr lirc-0.8.1pre2.orig/drivers/lirc_mceusb/lirc_mceusb.c lirc-0.8.1pre2/drivers/lirc_mceusb/lirc_mceusb.c
---- lirc-0.8.1pre2.orig/drivers/lirc_mceusb/lirc_mceusb.c 2006-07-31 03:19:57.000000000 +0200
-+++ lirc-0.8.1pre2/drivers/lirc_mceusb/lirc_mceusb.c 2006-10-18 16:43:54.000000000 +0200
-@@ -88,7 +88,6 @@
- *
- */
-
--#include <linux/config.h>
- #include <linux/kernel.h>
- #include <linux/errno.h>
- #include <linux/init.h>
-diff -Naupr lirc-0.8.1pre2.orig/drivers/lirc_mceusb2/lirc_mceusb2.c lirc-0.8.1pre2/drivers/lirc_mceusb2/lirc_mceusb2.c
---- lirc-0.8.1pre2.orig/drivers/lirc_mceusb2/lirc_mceusb2.c 2006-09-22 05:18:22.000000000 +0200
-+++ lirc-0.8.1pre2/drivers/lirc_mceusb2/lirc_mceusb2.c 2006-10-18 16:43:57.000000000 +0200
-@@ -40,8 +40,6 @@
- #error "*******************************************************"
- #endif
-
--#include <linux/config.h>
--
- #include <linux/kernel.h>
- #include <linux/errno.h>
- #include <linux/init.h>
-diff -Naupr lirc-0.8.1pre2.orig/drivers/lirc_parallel/lirc_parallel.c lirc-0.8.1pre2/drivers/lirc_parallel/lirc_parallel.c
---- lirc-0.8.1pre2.orig/drivers/lirc_parallel/lirc_parallel.c 2005-09-22 22:10:37.000000000 +0200
-+++ lirc-0.8.1pre2/drivers/lirc_parallel/lirc_parallel.c 2006-10-18 16:44:31.000000000 +0200
-@@ -40,8 +40,6 @@
- #error "**********************************************************"
- #endif
-
--#include <linux/config.h>
--
- #ifdef CONFIG_SMP
- #error "--- Sorry, this driver is not SMP safe. ---"
- #endif
-@@ -50,7 +48,6 @@
- #include <linux/sched.h>
- #include <linux/errno.h>
- #include <linux/signal.h>
--#include <linux/config.h>
- #include <linux/fs.h>
- #include <linux/kernel.h>
- #include <linux/ioport.h>
-diff -Naupr lirc-0.8.1pre2.orig/drivers/lirc_sasem/lirc_sasem.c lirc-0.8.1pre2/drivers/lirc_sasem/lirc_sasem.c
---- lirc-0.8.1pre2.orig/drivers/lirc_sasem/lirc_sasem.c 2006-07-24 01:24:35.000000000 +0200
-+++ lirc-0.8.1pre2/drivers/lirc_sasem/lirc_sasem.c 2006-10-18 16:44:09.000000000 +0200
-@@ -58,8 +58,6 @@
- #error "*** Sorry, this driver requires kernel version 2.4.22 or higher"
- #endif
-
--#include <linux/config.h>
--
- #include <linux/errno.h>
- #include <linux/init.h>
- #include <linux/kernel.h>
-diff -Naupr lirc-0.8.1pre2.orig/drivers/lirc_serial/lirc_serial.c lirc-0.8.1pre2/drivers/lirc_serial/lirc_serial.c
---- lirc-0.8.1pre2.orig/drivers/lirc_serial/lirc_serial.c 2006-01-21 18:43:36.000000000 +0100
-+++ lirc-0.8.1pre2/drivers/lirc_serial/lirc_serial.c 2006-10-18 16:44:13.000000000 +0200
-@@ -61,8 +61,6 @@
- #error "**********************************************************"
- #endif
-
--#include <linux/config.h>
--
- #if defined(CONFIG_SERIAL) || defined(CONFIG_SERIAL_8250)
- #warning "******************************************"
- #warning " Your serial port driver is compiled into "
-diff -Naupr lirc-0.8.1pre2.orig/drivers/lirc_sir/lirc_sir.c lirc-0.8.1pre2/drivers/lirc_sir/lirc_sir.c
---- lirc-0.8.1pre2.orig/drivers/lirc_sir/lirc_sir.c 2006-01-21 18:43:36.000000000 +0100
-+++ lirc-0.8.1pre2/drivers/lirc_sir/lirc_sir.c 2006-10-18 16:44:16.000000000 +0200
-@@ -46,8 +46,6 @@
- # include <config.h>
- #endif
-
--#include <linux/config.h>
--
- #if !defined(LIRC_ON_SA1100) && !defined(CONFIG_SERIAL_MODULE)
- #warning "******************************************"
- #warning " Your serial port driver is compiled into "
-diff -Naupr lirc-0.8.1pre2.orig/drivers/lirc_streamzap/lirc_streamzap.c lirc-0.8.1pre2/drivers/lirc_streamzap/lirc_streamzap.c
---- lirc-0.8.1pre2.orig/drivers/lirc_streamzap/lirc_streamzap.c 2006-03-04 23:36:39.000000000 +0100
-+++ lirc-0.8.1pre2/drivers/lirc_streamzap/lirc_streamzap.c 2006-10-18 16:44:18.000000000 +0200
-@@ -38,7 +38,6 @@
- #error "*******************************************************"
- #endif
-
--#include <linux/config.h>
- #include <linux/kernel.h>
- #include <linux/errno.h>
- #include <linux/init.h>
Added: trunk/rpms/dkms-lirc/lirc-0.8.2-2.6.23-unregister_chrdev-void.patch
===================================================================
--- trunk/rpms/dkms-lirc/lirc-0.8.2-2.6.23-unregister_chrdev-void.patch (rev 0)
+++ trunk/rpms/dkms-lirc/lirc-0.8.2-2.6.23-unregister_chrdev-void.patch 2007-10-22 16:38:28 UTC (rev 5938)
@@ -0,0 +1,37 @@
+diff -Naupr lirc-0.8.2.orig/drivers/lirc_dev/lirc_dev.c lirc-0.8.2/drivers/lirc_dev/lirc_dev.c
+--- lirc-0.8.2.orig/drivers/lirc_dev/lirc_dev.c 2007-02-13 07:45:15.000000000 +0100
++++ lirc-0.8.2/drivers/lirc_dev/lirc_dev.c 2007-10-22 18:07:08.000000000 +0200
+@@ -880,8 +880,13 @@ static int lirc_dev_init(void)
+ return SUCCESS;
+
+ out_unregister:
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
++ /* unregister_chrdev returns void now */
++ unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME);
++#else
+ if(unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME))
+ printk(KERN_ERR "lirc_dev: unregister_chrdev failed!\n");
++#endif
+ out:
+ return -1;
+ }
+@@ -905,6 +910,11 @@ int init_module(void)
+ */
+ void cleanup_module(void)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
++ /* unregister_chrdev returns void now */
++ unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME);
++ class_destroy(lirc_class);
++#else
+ int ret;
+
+ ret = unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME);
+@@ -914,6 +924,7 @@ void cleanup_module(void)
+ printk("lirc_dev: error in module_unregister_chrdev: %d\n", ret);
+ else
+ dprintk("lirc_dev: module successfully unloaded\n");
++#endif
+ }
+
+ MODULE_DESCRIPTION("LIRC base driver module");
Added: trunk/rpms/dkms-lirc/lirc-0.8.2-alldrivers.patch
===================================================================
--- trunk/rpms/dkms-lirc/lirc-0.8.2-alldrivers.patch (rev 0)
+++ trunk/rpms/dkms-lirc/lirc-0.8.2-alldrivers.patch 2007-10-22 16:38:28 UTC (rev 5938)
@@ -0,0 +1,18 @@
+--- lirc-0.8.2/configure.in.alldrivers 2007-06-09 20:54:09.000000000 +0200
++++ lirc-0.8.2/configure.in 2007-08-01 21:34:44.547507875 +0200
+@@ -1209,7 +1209,6 @@ elif test "$lirc_driver" = "all"; then
+ lirc_atiusb \
+ lirc_bt829 \
+ lirc_cmdir \
+- lirc_gpio \
+ lirc_i2c \
+ lirc_igorplugusb \
+ lirc_ttusbir \
+@@ -1217,7 +1216,6 @@ elif test "$lirc_driver" = "all"; then
+ lirc_it87 \
+ lirc_mceusb \
+ lirc_mceusb2 \
+- lirc_parallel \
+ lirc_sasem \
+ lirc_serial \
+ lirc_sir \
More information about the svn-commits
mailing list