Author: arekm Date: Sat Sep 10 10:39:56 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 0.9.0; upstream dropped few drivers; wpc8769l no longer builds, so disable it for now
---- Files affected: packages/lirc: lirc-kernel.patch (1.4 -> 1.5) , lirc.spec (1.288 -> 1.289) ---- Diffs: ================================================================ Index: packages/lirc/lirc-kernel.patch diff -u packages/lirc/lirc-kernel.patch:1.4 packages/lirc/lirc-kernel.patch:1.5 --- packages/lirc/lirc-kernel.patch:1.4 Sun Mar 27 20:55:19 2011 +++ packages/lirc/lirc-kernel.patch Sat Sep 10 12:39:50 2011 @@ -1,20 +1,23 @@ -fix undeclared current_cpu_data in lirc-modules-source (LP: #726182) - -BeeHock Goh <[email protected]> Mon Mar 14 2011 - ---- a/drivers/lirc_serial/lirc_serial.c 2010-09-04 18:38:49 +0000 -+++ b/drivers/lirc_serial/lirc_serial.c 2011-03-14 15:35:02 +0000 -@@ -90,6 +90,12 @@ - #include <linux/mm.h> - #include <linux/delay.h> - #include <linux/poll.h> -+ -+#ifndef current_cpu_data -+/* Macro current_cpu_data no longer defined in processor.h in newer kernel */ -+#define current_cpu_data __get_cpu_var(cpu_info) -+#endif -+ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 18) - #include <linux/platform_device.h> - #endif - +--- lirc-0.9.0/./drivers/lirc_atiusb/lirc_atiusb.c~ 2011-03-25 23:28:18.000000000 +0100 ++++ lirc-0.9.0/./drivers/lirc_atiusb/lirc_atiusb.c 2011-09-10 11:19:50.422542829 +0200 +@@ -48,7 +48,6 @@ + #include <linux/slab.h> + #include <linux/module.h> + #include <linux/kmod.h> +-#include <linux/smp_lock.h> + #include <linux/completion.h> + #include <linux/uaccess.h> + #include <linux/usb.h> +--- lirc-0.9.0/drivers/lirc_i2c/lirc_i2c.c~ 2011-03-25 23:28:18.000000000 +0100 ++++ lirc-0.9.0/drivers/lirc_i2c/lirc_i2c.c 2011-09-10 12:24:55.710859996 +0200 +@@ -555,8 +555,8 @@ + kfree(ir); + return -EINVAL; + } +- printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n", +- adap->id, addr, ir->c.name); ++ printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n", ++ addr, ir->c.name); + + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) + /* register device */ ================================================================ Index: packages/lirc/lirc.spec diff -u packages/lirc/lirc.spec:1.288 packages/lirc/lirc.spec:1.289 --- packages/lirc/lirc.spec:1.288 Sat Jul 23 19:41:05 2011 +++ packages/lirc/lirc.spec Sat Sep 10 12:39:50 2011 @@ -21,7 +21,7 @@ %endif %define pname lirc -%define rel 42 +%define rel 1 # # main package @@ -30,19 +30,23 @@ # lirc_gpio fails to build under kernel >= 2.6.23 # %if "%{_kernel_ver}" >= "2.6.23" -%define drivers "lirc_atiusb lirc_bt829 lirc_dev lirc_ene0100 lirc_i2c lirc_igorplugusb lirc_imon lirc_it87 lirc_ite8709 lirc_mceusb lirc_sasem lirc_serial lirc_sir lirc_streamzap lirc_ttusbir lirc_wpc8769l" +%if "%{_kernel_ver}" >= "3.0.0" +%define drivers "lirc_atiusb lirc_bt829 lirc_dev lirc_i2c lirc_igorplugusb lirc_imon lirc_sasem lirc_serial lirc_sir lirc_ttusbir" %else -%define drivers "lirc_atiusb lirc_bt829 lirc_dev lirc_ene0100 lirc_gpio lirc_i2c lirc_igorplugusb lirc_imon lirc_it87 lirc_ite8709 lirc_mceusb lirc_sasem lirc_serial lirc_sir lirc_streamzap lirc_ttusbir lirc_wpc8769l" +%define drivers "lirc_atiusb lirc_bt829 lirc_dev lirc_ene0100 lirc_i2c lirc_igorplugusb lirc_imon lirc_sasem lirc_serial lirc_sir lirc_ttusbir lirc_wpc8769l" +%endif +%else +%define drivers "lirc_atiusb lirc_bt829 lirc_dev lirc_ene0100 lirc_gpio lirc_i2c lirc_igorplugusb lirc_imon lirc_sasem lirc_serial lirc_sir lirc_ttusbir lirc_wpc8769l" %endif Summary: Linux Infrared Remote Control daemons Summary(pl.UTF-8): Serwery do zdalnego sterowania Linuksem za pomocą podczerwieni Name: %{pname}%{_alt_kernel} -Version: 0.8.7 +Version: 0.9.0 Release: %{rel} License: GPL v2+ Group: Daemons Source0: http://dl.sourceforge.net/lirc/%{pname}-%{version}.tar.bz2 -# Source0-md5: fb1dcddbc8ca3d03c7f3a2d40cf28b71 +# Source0-md5: b232aef26f23fe33ea8305d276637086 Source1: http://lirc.sourceforge.net/remotes.tar.bz2 # Source1-md5: 238d1773d3c405acc02813674f5a55f8 Source2: %{pname}d.sysconfig @@ -51,11 +55,10 @@ Patch0: %{pname}-opt.patch Patch1: %{pname}-tmp.patch Patch2: %{pname}-no-svgalib.patch -Patch3: %{pname}-alpha.patch +Patch3: %{pname}-kernel.patch Patch4: %{pname}-sparc.patch Patch5: %{pname}-remotes.patch Patch6: %{pname}-kernelcc.patch -Patch7: %{pname}-kernel.patch URL: http://www.lirc.org/ BuildRequires: alsa-lib-devel BuildRequires: autoconf >= 2.50 @@ -388,84 +391,6 @@ Moduł lirc_imon. -%package -n kernel%{_alt_kernel}-char-lirc-it87 -Summary: Kernel modules for Linux Infrared Remote Control -Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni -Release: %{rel}@%{_kernel_ver_str} -Group: Base/Kernel -%if %{with dist_kernel} -%requires_releq_kernel -Requires(postun): %releq_kernel -%endif -Requires(post,postun): /sbin/depmod -Requires: %{pname} = %{version}-%{rel} -Conflicts: dev < 2.8.0-3 - -%description -n kernel%{_alt_kernel}-char-lirc-it87 -This package contains the kernel modules necessary to operate some -infrared remote control devices (such as the ones bundled with TV -cards). - -lirc_it87 module. - -%description -n kernel%{_alt_kernel}-char-lirc-it87 -l pl.UTF-8 -Ten pakiet zawiera moduły jądra niezbędne do obsługi niektórych -pilotów na podczerwień (w tym tych dostarczanych z kartami TV). - -Moduł lirc_it87. - -%package -n kernel%{_alt_kernel}-char-lirc-ite8709 -Summary: Kernel modules for Linux Infrared Remote Control -Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni -Release: %{rel}@%{_kernel_ver_str} -Group: Base/Kernel -%if %{with dist_kernel} -%requires_releq_kernel -Requires(postun): %releq_kernel -%endif -Requires(post,postun): /sbin/depmod -Requires: %{pname} = %{version}-%{rel} -Conflicts: dev < 2.8.0-3 - -%description -n kernel%{_alt_kernel}-char-lirc-ite8709 -This package contains the kernel modules necessary to operate some -infrared remote control devices (such as the ones bundled with TV -cards). - -lirc_ite8709 module. - -%description -n kernel%{_alt_kernel}-char-lirc-ite8709 -l pl.UTF-8 -Ten pakiet zawiera moduły jądra niezbędne do obsługi niektórych -pilotów na podczerwień (w tym tych dostarczanych z kartami TV). - -Moduł lirc_ite8709. - -%package -n kernel%{_alt_kernel}-char-lirc-mceusb -Summary: Kernel modules for Linux Infrared Remote Control -Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni -Release: %{rel}@%{_kernel_ver_str} -Group: Base/Kernel -%if %{with dist_kernel} -%requires_releq_kernel -Requires(postun): %releq_kernel -%endif -Requires(post,postun): /sbin/depmod -Requires: %{pname} = %{version}-%{rel} -Conflicts: dev < 2.8.0-3 - -%description -n kernel%{_alt_kernel}-char-lirc-mceusb -This package contains the kernel modules necessary to operate some -infrared remote control devices (such as the ones bundled with TV -cards). - -lirc_mceusb module. - -%description -n kernel%{_alt_kernel}-char-lirc-mceusb -l pl.UTF-8 -Ten pakiet zawiera moduły jądra niezbędne do obsługi niektórych -pilotów na podczerwień (w tym tych dostarczanych z kartami TV). - -Moduł lirc_mceusb. - %package -n kernel%{_alt_kernel}-char-lirc-sasem Summary: Kernel modules for Linux Infrared Remote Control Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni @@ -521,34 +446,6 @@ Moduł lirc_serial dla urządzeń podłączanych do portu szeregowego. -%package -n kernel%{_alt_kernel}-char-lirc-streamzap -Summary: Kernel modules for Linux Infrared Remote Control -Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni -Release: %{rel}@%{_kernel_ver_str} -Group: Base/Kernel -%if %{with dist_kernel} -%requires_releq_kernel -Requires(postun): %releq_kernel -%endif -Requires(post,postun): /sbin/depmod -Requires: %{pname} = %{version}-%{rel} -Obsoletes: lirc-modules -Obsoletes: lirc-modules-streamzap -Conflicts: dev < 2.8.0-3 - -%description -n kernel%{_alt_kernel}-char-lirc-streamzap -This package contains the kernel modules necessary to operate some -infrared remote control devices (such as the ones bundled with TV -cards). - -lirc_streamzap module. - -%description -n kernel%{_alt_kernel}-char-lirc-streamzap -l pl.UTF-8 -Ten pakiet zawiera moduły jądra niezbędne do obsługi niektórych -pilotów na podczerwień (w tym tych dostarczanych z kartami TV). - -Moduł lirc_streamzap. - %package -n kernel%{_alt_kernel}-char-lirc-sir Summary: Kernel modules for Linux Infrared Remote Control Summary(pl.UTF-8): Moduły jądra dla zdalnej obsługi Linuksa za pomocą podczerwieni @@ -670,7 +567,6 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %build echo '#' > drivers/Makefile.am @@ -738,6 +634,7 @@ %{__make} -j1 \ M=$PWD O=$PWD/o \ + CONSTIFY_PLUGIN="" \ KBUILD_MODPOST_WARN=1 \ %{?with_verbose:V=1} mv $drv{,-dist}.ko @@ -900,36 +797,6 @@ %postun -n kernel%{_alt_kernel}-char-lirc-imon %depmod %{_kernel_ver} -%post -n kernel%{_alt_kernel}-char-lirc-it87 -%depmod %{_kernel_ver} -if [ "$1" = "1" ]; then - echo "Don't forget to add an 'alias lirc lirc_it87' line" - echo "to your /etc/modules.conf." -fi - -%postun -n kernel%{_alt_kernel}-char-lirc-it87 -%depmod %{_kernel_ver} - -%post -n kernel%{_alt_kernel}-char-lirc-ite8709 -%depmod %{_kernel_ver} -if [ "$1" = "1" ]; then - echo "Don't forget to add an 'alias lirc lirc_ite8709' line" - echo "to your /etc/modules.conf." -fi - -%postun -n kernel%{_alt_kernel}-char-lirc-ite8709 -%depmod %{_kernel_ver} - -%post -n kernel%{_alt_kernel}-char-lirc-mceusb -%depmod %{_kernel_ver} -if [ "$1" = "1" ]; then - echo "Don't forget to add an 'alias lirc lirc_mceusb' line" - echo "to your /etc/modules.conf." -fi - -%postun -n kernel%{_alt_kernel}-char-lirc-mceusb -%depmod %{_kernel_ver} - %post -n kernel%{_alt_kernel}-char-lirc-sasem %depmod %{_kernel_ver} if [ "$1" = "1" ]; then @@ -950,16 +817,6 @@ %postun -n kernel%{_alt_kernel}-char-lirc-serial %depmod %{_kernel_ver} -%post -n kernel%{_alt_kernel}-char-lirc-streamzap -%depmod %{_kernel_ver} -if [ "$1" = "1" ]; then - echo "Don't forget to add an 'alias lirc lirc_streamzap' line" - echo "to your /etc/modules.conf." -fi - -%postun -n kernel%{_alt_kernel}-char-lirc-streamzap -%depmod %{_kernel_ver} - %post -n kernel%{_alt_kernel}-char-lirc-parallel %depmod %{_kernel_ver} if [ "$1" = "1" ]; then @@ -1087,9 +944,11 @@ %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/*/lirc_dev* +%if "%{_kernel_ver}" < "3.0.0" %files -n kernel%{_alt_kernel}-char-lirc-ene0100 %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/*/lirc_ene0100* +%endif %if "%{_kernel_ver}" < "2.6.23" %files -n kernel%{_alt_kernel}-char-lirc-gpio @@ -1109,18 +968,6 @@ %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/*/lirc_imon* -%files -n kernel%{_alt_kernel}-char-lirc-it87 -%defattr(644,root,root,755) -/lib/modules/%{_kernel_ver}/*/lirc_it87* - -%files -n kernel%{_alt_kernel}-char-lirc-ite8709 -%defattr(644,root,root,755) -/lib/modules/%{_kernel_ver}/*/lirc_ite8709* - -%files -n kernel%{_alt_kernel}-char-lirc-mceusb -%defattr(644,root,root,755) -/lib/modules/%{_kernel_ver}/*/lirc_mceusb* - %files -n kernel%{_alt_kernel}-char-lirc-sasem %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/*/lirc_sasem* @@ -1129,10 +976,6 @@ %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/*/lirc_serial* -%files -n kernel%{_alt_kernel}-char-lirc-streamzap -%defattr(644,root,root,755) -/lib/modules/%{_kernel_ver}/*/lirc_streamzap* - %files -n kernel%{_alt_kernel}-char-lirc-sir %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/*/lirc_sir* @@ -1141,9 +984,11 @@ %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/*/lirc_ttusbir* +%if "%{_kernel_ver}" < "3.0.0" %files -n kernel%{_alt_kernel}-char-lirc-wpc87691 %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/*/lirc_wpc8769l* +%endif # XXX currently not SMP-safe %if 0 @@ -1159,6 +1004,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.289 2011/09/10 10:39:50 arekm +- up to 0.9.0; upstream dropped few drivers; wpc8769l no longer builds, so disable it for now + Revision 1.288 2011/07/23 17:41:05 arekm - release 42 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lirc/lirc-kernel.patch?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lirc/lirc.spec?r1=1.288&r2=1.289&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
