diff options
| -rw-r--r-- | system/lirc/datarootdir.patch | 10 | ||||
| -rw-r--r-- | system/lirc/lirc.SlackBuild | 25 | ||||
| -rw-r--r-- | system/lirc/lirc.info | 12 | ||||
| -rw-r--r-- | system/lirc/patches/lirc-0.9.0-atiusb_kfifo.patch | 14 | ||||
| -rw-r--r-- | system/lirc/patches/lirc-0.9.0-kernel-2.6.39-fixes.patch | 67 | ||||
| -rw-r--r-- | system/lirc/patches/lirc-0.9.0-kernel-3.3.0-fixes.patch | 50 | ||||
| -rw-r--r-- | system/lirc/patches/lirc-0.9.0-kernel-3.5-err-fix.patch | 12 | ||||
| -rw-r--r-- | system/lirc/patches/lirc-0.9.0-kernel-3.8-fixes.patch | 80 |
8 files changed, 25 insertions, 245 deletions
diff --git a/system/lirc/datarootdir.patch b/system/lirc/datarootdir.patch new file mode 100644 index 000000000000..b20a0c06cea6 --- /dev/null +++ b/system/lirc/datarootdir.patch @@ -0,0 +1,10 @@ +--- ./lirc-driver.pc.in 2015-10-14 12:23:44.000000000 -0400 ++++ ./lirc-driver.pc.in 2015-11-10 00:35:01.894031781 -0500 +@@ -3,6 +3,7 @@ + Version: @VERSION@ + + prefix=@prefix@ ++datarootdir=@datarootdir@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ diff --git a/system/lirc/lirc.SlackBuild b/system/lirc/lirc.SlackBuild index 2e3a7243c5a4..05d09ea0d557 100644 --- a/system/lirc/lirc.SlackBuild +++ b/system/lirc/lirc.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for lirc # Copyright 2009 Murat D. Kadirov <banderols@gmail.com> +# Copyright 2015 Jeremy Hansen <jebrhansen+SBo -at- gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,9 +23,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Modified for 0.9.3a by Jeremy Hansen <jebrhansen+SBo -at- gmail.com> + PRGNAM=lirc -VERSION=${VERSION:-0.9.0} -BUILD=${BUILD:-3} +VERSION=${VERSION:-0.9.3a} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} KERNEL=${KERNEL:-$(uname -r)} @@ -72,8 +75,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Patch for recent kernels, thanks Gentoo -for i in $CWD/patches/* ; do patch -p1 < $i ; done +# Patch to fix config.status warning for lirc-driver.pc.in ignoring --datarootdir +patch -p1 < $CWD/datarootdir.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -84,21 +87,11 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-sandboxed \ - --with-driver=all \ - --with-transmitter \ --build=$ARCH-slackware-linux -# Disable parallel and bt829 because of incompatibility with smp systems -sed -i -e "s:lirc_parallel::" -e "s:lirc_bt829::" \ - Makefile drivers/Makefile drivers/*/Makefile tools/Makefile - make -j1 make install DESTDIR=$PKG -mkdir -p $PKG/usr/share/$PRGNAM -cp -a remotes $PKG/usr/share/$PRGNAM - mkdir -p $PKG/lib/udev/rules.d cat contrib/lirc.rules > $PKG/lib/udev/rules.d/96-lirc.rules @@ -117,8 +110,8 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r rm -f $PKG/usr/man/man1/smode2.1.gz mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ANNOUNCE AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \ - doc/{html,irxevent.keys,lirc.hwdb} $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \ + doc/{html,irxevent.keys} $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/lirc/lirc.info b/system/lirc/lirc.info index af47fe041037..4b5767ee9b6a 100644 --- a/system/lirc/lirc.info +++ b/system/lirc/lirc.info @@ -1,10 +1,10 @@ PRGNAM="lirc" -VERSION="0.9.0" +VERSION="0.9.3a" HOMEPAGE="http://www.lirc.org/" -DOWNLOAD="http://downloads.sourceforge.net/project/lirc/LIRC/0.9.0/lirc-0.9.0.tar.bz2" -MD5SUM="b232aef26f23fe33ea8305d276637086" +DOWNLOAD="http://downloads.sourceforge.net/project/lirc/LIRC/0.9.3a/lirc-0.9.3a.tar.bz2" +MD5SUM="f9ed5dd0684a52c7cd98672e71e81b05" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Murat D. Kadirov" -EMAIL="banderols@gmail.com" +REQUIRES="python3-PyYAML" +MAINTAINER="Jeremy Hansen" +EMAIL="jebrhansen+SBo -at- gmail.com" diff --git a/system/lirc/patches/lirc-0.9.0-atiusb_kfifo.patch b/system/lirc/patches/lirc-0.9.0-atiusb_kfifo.patch deleted file mode 100644 index 32edb244b412..000000000000 --- a/system/lirc/patches/lirc-0.9.0-atiusb_kfifo.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/lirc_atiusb/lirc_atiusb.c 2012-07-17 16:04:39.000000000 -0400 -+++ b/drivers/lirc_atiusb/lirc_atiusb.c 2012-07-17 16:19:06.000000000 -0400 -@@ -1050,7 +1050,11 @@ - goto new_irctl_failure_check; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38) - if (lirc_buffer_init(driver->rbuf, dclen, 1)) { -+#else -+ if (lirc_buffer_init(driver->rbuf, dclen, 2)) { -+#endif - mem_failure = 4; - goto new_irctl_failure_check; - } diff --git a/system/lirc/patches/lirc-0.9.0-kernel-2.6.39-fixes.patch b/system/lirc/patches/lirc-0.9.0-kernel-2.6.39-fixes.patch deleted file mode 100644 index 624737090bbe..000000000000 --- a/system/lirc/patches/lirc-0.9.0-kernel-2.6.39-fixes.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -u a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c ---- a/drivers/lirc_atiusb/lirc_atiusb.c -+++ b/drivers/lirc_atiusb/lirc_atiusb.c -@@ -48,7 +48,9 @@ - #include <linux/slab.h> - #include <linux/module.h> - #include <linux/kmod.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) - #include <linux/smp_lock.h> -+#endif - #include <linux/completion.h> - #include <linux/uaccess.h> - #include <linux/usb.h> -diff -u a/drivers/lirc_i2c/lirc_i2c.c b/drivers/lirc_i2c/lirc_i2c.c ---- a/drivers/lirc_i2c/lirc_i2c.c -+++ b/drivers/lirc_i2c/lirc_i2c.c -@@ -555,8 +555,8 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) - 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 */ -diff -u a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c ---- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c -+++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c -@@ -361,14 +361,22 @@ static irqreturn_t irq_handler(int irqno, void *blah, struct pt_regs *regs) - size = count << 3; - - ldata = (unsigned long *) data_buf; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) - next_one = generic_find_next_le_bit(ldata, size, 0); -+#else -+ next_one = find_next_zero_bit_le(ldata, size, 0); -+#endif - - if (next_one > 0) - put_pulse_bit(next_one - * WPC8769L_USECS_PER_BIT); - - while (next_one < size) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) - next_zero = generic_find_next_zero_le_bit(ldata, -+#else -+ next_zero = find_next_zero_bit_le(ldata, -+#endif - size, next_one + 1); - - put_space_bit( -@@ -376,7 +384,11 @@ static irqreturn_t irq_handler(int irqno, void *blah, struct pt_regs *regs) - * WPC8769L_USECS_PER_BIT); - - if (next_zero < size) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) - next_one = generic_find_next_le_bit(ldata, -+#else -+ next_one = find_next_bit_le(ldata, -+#endif - size, next_zero + 1); - - put_pulse_bit( --- -1.7.5.4 diff --git a/system/lirc/patches/lirc-0.9.0-kernel-3.3.0-fixes.patch b/system/lirc/patches/lirc-0.9.0-kernel-3.3.0-fixes.patch deleted file mode 100644 index 80b87d27ab15..000000000000 --- a/system/lirc/patches/lirc-0.9.0-kernel-3.3.0-fixes.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -ur a/drivers/lirc_serial/lirc_serial.c a/drivers.new/lirc_serial/lirc_serial.c ---- a/drivers/lirc_serial/lirc_serial.c 2011-03-25 18:28:18.000000000 -0400 -+++ a/drivers.new/lirc_serial/lirc_serial.c 2012-10-24 14:32:14.000000000 -0400 -@@ -66,7 +66,12 @@ - #include <linux/poll.h> - #include <linux/platform_device.h> - -+#include "drivers/kcompat.h" -+#if LINUX_VERSION_CODE > KERNEL_VERSION(3, 3, 0) -+#include <asm/switch_to.h> -+#else - #include <asm/system.h> -+#endif - #include <linux/io.h> - #include <linux/irq.h> - #include <linux/fcntl.h> -@@ -80,7 +85,6 @@ - #define UART_IE_IXP42X_UUE 0x40 /* IXP42X UART Unit enable */ - #define UART_IE_IXP42X_RTOIE 0x10 /* IXP42X Receiver Data Timeout int.enable */ - --#include "drivers/kcompat.h" - #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35) - #include <media/lirc.h> - #include <media/lirc_dev.h> -diff -ur a/drivers/lirc_sir/lirc_sir.c a/drivers.new/lirc_sir/lirc_sir.c ---- a/drivers/lirc_sir/lirc_sir.c 2011-03-25 18:28:18.000000000 -0400 -+++ a/drivers.new/lirc_sir/lirc_sir.c 2012-10-24 14:32:46.000000000 -0400 -@@ -59,7 +59,14 @@ - #include <linux/mm.h> - #include <linux/delay.h> - #include <linux/poll.h> -+ -+#include "drivers/kcompat.h" -+#if LINUX_VERSION_CODE > KERNEL_VERSION(3, 3, 0) -+#include <asm/switch_to.h> -+#else - #include <asm/system.h> -+#endif -+ - #include <linux/io.h> - #include <asm/irq.h> - #include <linux/fcntl.h> -@@ -74,7 +81,6 @@ - - #include <linux/timer.h> - --#include "drivers/kcompat.h" - #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35) - #include <media/lirc.h> - #include <media/lirc_dev.h> diff --git a/system/lirc/patches/lirc-0.9.0-kernel-3.5-err-fix.patch b/system/lirc/patches/lirc-0.9.0-kernel-3.5-err-fix.patch deleted file mode 100644 index b06d94efb322..000000000000 --- a/system/lirc/patches/lirc-0.9.0-kernel-3.5-err-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/drivers/kcompat.h 2011-03-25 18:28:18.000000000 -0400 -+++ b/drivers/kcompat.h 2012-11-27 13:37:55.000000000 -0500 -@@ -136,4 +136,9 @@ - ) - #endif - -+#ifndef err -+#define err(format, arg...) \ -+ printk(KERN_ERR KBUILD_MODNAME ": " format "\n", ##arg) -+#endif -+ - #endif /* _KCOMPAT_H */ diff --git a/system/lirc/patches/lirc-0.9.0-kernel-3.8-fixes.patch b/system/lirc/patches/lirc-0.9.0-kernel-3.8-fixes.patch deleted file mode 100644 index bd11b61c19d8..000000000000 --- a/system/lirc/patches/lirc-0.9.0-kernel-3.8-fixes.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -Naur lirc-0.9.0/drivers/lirc_serial/lirc_serial.c lirc-0.9.0.new/drivers/lirc_serial/lirc_serial.c ---- lirc-0.9.0/drivers/lirc_serial/lirc_serial.c 2013-05-24 11:58:31.017566567 -0400 -+++ lirc-0.9.0.new/drivers/lirc_serial/lirc_serial.c 2013-05-24 12:00:38.733568898 -0400 -@@ -1107,12 +1107,12 @@ - - static struct platform_device *lirc_serial_dev; - --static int __devinit lirc_serial_probe(struct platform_device *dev) -+static int lirc_serial_probe(struct platform_device *dev) - { - return 0; - } - --static int __devexit lirc_serial_remove(struct platform_device *dev) -+static int lirc_serial_remove(struct platform_device *dev) - { - return 0; - } -@@ -1163,7 +1163,7 @@ - - static struct platform_driver lirc_serial_driver = { - .probe = lirc_serial_probe, -- .remove = __devexit_p(lirc_serial_remove), -+ .remove = lirc_serial_remove, - .suspend = lirc_serial_suspend, - .resume = lirc_serial_resume, - .driver = { -diff -Naur lirc-0.9.0/drivers/lirc_sir/lirc_sir.c lirc-0.9.0.new/drivers/lirc_sir/lirc_sir.c ---- lirc-0.9.0/drivers/lirc_sir/lirc_sir.c 2013-05-24 11:58:31.017566567 -0400 -+++ lirc-0.9.0.new/drivers/lirc_sir/lirc_sir.c 2013-05-24 12:00:38.733568898 -0400 -@@ -1296,19 +1296,19 @@ - return 0; - } - --static int __devinit lirc_sir_probe(struct platform_device *dev) -+static int lirc_sir_probe(struct platform_device *dev) - { - return 0; - } - --static int __devexit lirc_sir_remove(struct platform_device *dev) -+static int lirc_sir_remove(struct platform_device *dev) - { - return 0; - } - - static struct platform_driver lirc_sir_driver = { - .probe = lirc_sir_probe, -- .remove = __devexit_p(lirc_sir_remove), -+ .remove = lirc_sir_remove, - .driver = { - .name = "lirc_sir", - .owner = THIS_MODULE, -diff -Naur lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers/lirc_wpc8769l/lirc_wpc8769l.c ---- lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2013-05-24 11:58:30.974566567 -0400 -+++ lirc-0.9.0.new/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2013-05-24 12:00:38.734568898 -0400 -@@ -942,12 +942,12 @@ - #ifdef MODULE - static struct platform_device *lirc_wpc8769l_platform_dev; - --static int __devinit lirc_wpc8769l_probe(struct platform_device *dev) -+static int lirc_wpc8769l_probe(struct platform_device *dev) - { - return 0; - } - --static int __devexit lirc_wpc8769l_remove(struct platform_device *dev) -+static int lirc_wpc8769l_remove(struct platform_device *dev) - { - return 0; - } -@@ -975,7 +975,7 @@ - - static struct platform_driver lirc_wpc8769l_platform_driver = { - .probe = lirc_wpc8769l_probe, -- .remove = __devexit_p(lirc_wpc8769l_remove), -+ .remove = lirc_wpc8769l_remove, - .suspend = lirc_wpc8769l_suspend, - .resume = lirc_wpc8769l_resume, - .driver = { |