Hello community, here is the log from the commit of package lirc checked in at Mon Aug 21 16:34:57 CEST 2006. -------- --- lirc/lirc-kernel.changes 2006-02-16 11:56:09.000000000 +0100 +++ lirc/lirc-kernel.changes 2006-08-21 16:11:26.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 21 16:11:22 CEST 2006 - ro@suse.de + +- fix build with 2.6.18 (from cvs) + +------------------------------------------------------------------- --- lirc/lirc.changes 2006-02-08 15:32:20.000000000 +0100 +++ lirc/lirc.changes 2006-08-17 23:04:22.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 17 23:04:16 CEST 2006 - ro@suse.de + +- fix build with 2.6.18 (from cvs) + +------------------------------------------------------------------- New: ---- lirc-0.8.0-k2.6.18.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lirc-kernel.spec ++++++ --- /var/tmp/diff_new_pack.Rs1ViC/_old 2006-08-21 16:33:42.000000000 +0200 +++ /var/tmp/diff_new_pack.Rs1ViC/_new 2006-08-21 16:33:42.000000000 +0200 @@ -17,12 +17,13 @@ Group: System/Kernel Summary: LIRC kernel modules Version: 0.8.0 -Release: 5 +Release: 6 Source0: lirc-0.8.0.tar.bz2 Source1: Makefile.module Source2: Makefile.modsub Patch: lirc-0.8.0-kernel.diff Patch1: lirc-0.8.0_igorplugusb_novermagic.diff +Patch2: lirc-0.8.0-k2.6.18.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build NoSource: 0 %suse_kernel_module_package -n lirc kdump um xen debug @@ -46,6 +47,7 @@ %setup -n lirc-%version %patch -p0 %patch1 -p1 +%patch2 ./configure --with-driver=all cp -a drivers source find source -name 'Makefile*'|xargs rm @@ -74,6 +76,8 @@ done %changelog -n lirc-kernel +* Mon Aug 21 2006 - ro@suse.de +- fix build with 2.6.18 (from cvs) * Thu Feb 16 2006 - lnussel@suse.de - remove redundant vermagic line from igorplugusb as it apparently confuses some magic kernel package script ++++++ lirc.spec ++++++ --- /var/tmp/diff_new_pack.Rs1ViC/_old 2006-08-21 16:33:42.000000000 +0200 +++ /var/tmp/diff_new_pack.Rs1ViC/_new 2006-08-21 16:33:42.000000000 +0200 @@ -17,7 +17,7 @@ Group: Hardware/Other Autoreqprov: on Version: 0.8.0 -Release: 6 +Release: 17 PreReq: %fillup_prereq Summary: Tools for Infrared Receivers Source0: lirc-%{version}.tar.bz2 @@ -30,6 +30,7 @@ Source9: 51-lirc.rules #Patch0: lirc-hw.diff Patch1: lirc-sockets-in-var.diff +Patch2: lirc-0.8.0-k2.6.18.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: udev @@ -46,6 +47,7 @@ %setup -q -a 1 #%patch0 -p1 -b .hw %patch1 -p1 -b .var +%patch2 cp %{SOURCE8} . #find . -type d -name CVS -print0 | xargs -0 -- rm -rf #find . -name .cvsignore -print0 | xargs -0 -- rm -rf @@ -128,6 +130,8 @@ %{fillup_only} %changelog -n lirc +* Thu Aug 17 2006 - ro@suse.de +- fix build with 2.6.18 (from cvs) * Tue Feb 07 2006 - lnussel@suse.de - remove CFT2000 config file as it contains a strange proprietary notice (#148744) ++++++ Makefile.modsub ++++++ --- lirc/Makefile.modsub 2006-02-08 15:32:20.000000000 +0100 +++ lirc/Makefile.modsub 2006-08-21 16:04:33.000000000 +0200 @@ -1,7 +1,8 @@ EXTRA_CFLAGS := -I$(src)/.. \ -DLIRC_MAJOR=61 \ -DIRCTL_DEV_MAJOR=61 \ - -DDEV_LIRC='"lirc"' + -DDEV_LIRC='"lirc"' \ + -I$(srctree)/drivers/media/video lirc_src = $(wildcard $(src)/*.c) obj-m := $(lirc_src:$(src)%.c=%.o) ++++++ lirc-0.8.0-k2.6.18.diff ++++++ --- drivers/kcompat.h +++ drivers/kcompat.h @@ -8,9 +8,10 @@ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) #include <linux/device.h> - +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) #define LIRC_HAVE_DEVFS #define LIRC_HAVE_DEVFS_26 +#endif #define LIRC_HAVE_SYSFS #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) --- drivers/lirc_dev/lirc_dev.c +++ drivers/lirc_dev/lirc_dev.c @@ -49,16 +49,16 @@ #endif #define __KERNEL_SYSCALLS__ #include <linux/unistd.h> +#include "drivers/kcompat.h" /* DevFS header */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) +#if defined(LIRC_HAVE_DEVFS) #include <linux/devfs_fs_kernel.h> #endif /* SysFS header */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) +#if defined(LIRC_HAVE_SYSFS) #include <linux/device.h> #endif -#include "drivers/kcompat.h" #include "drivers/lirc.h" #include "lirc_dev.h" --- drivers/lirc_gpio/lirc_gpio.c +++ drivers/lirc_gpio/lirc_gpio.c @@ -48,9 +48,12 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0) #include "../drivers/char/bttv.h" #include "../drivers/char/bttvp.h" -#else +#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17) #include "../drivers/media/video/bttv.h" #include "../drivers/media/video/bttvp.h" +#else +#include "../drivers/media/video/bt8xx/bttv.h" +#include "../drivers/media/video/bt8xx/bttvp.h" #endif #if BTTV_VERSION_CODE < KERNEL_VERSION(0,7,45) --- drivers/lirc_imon/lirc_imon.c +++ drivers/lirc_imon/lirc_imon.c @@ -58,10 +58,12 @@ #include <linux/slab.h> #include <asm/uaccess.h> #include <linux/usb.h> +#include "drivers/kcompat.h" +#if defined(LIRC_HAVE_DEVFS) #include <linux/devfs_fs_kernel.h> +#endif #include "drivers/lirc.h" -#include "drivers/kcompat.h" #include "drivers/lirc_dev/lirc_dev.h" --- drivers/lirc_sasem/lirc_sasem.c +++ drivers/lirc_sasem/lirc_sasem.c @@ -67,10 +67,12 @@ #include <linux/slab.h> #include <asm/uaccess.h> #include <linux/usb.h> +#include "drivers/kcompat.h" +#if defined(LIRC_HAVE_DEVFS) #include <linux/devfs_fs_kernel.h> +#endif #include "drivers/lirc.h" -#include "drivers/kcompat.h" #include "drivers/lirc_dev/lirc_dev.h" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org