diff options
| -rw-r--r-- | system/lirc/lirc.SlackBuild | 7 | ||||
| -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 |
4 files changed, 146 insertions, 3 deletions
diff --git a/system/lirc/lirc.SlackBuild b/system/lirc/lirc.SlackBuild index 79a6ffff8a..07350db303 100644 --- a/system/lirc/lirc.SlackBuild +++ b/system/lirc/lirc.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=lirc VERSION=${VERSION:-0.9.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} KERNEL=${KERNEL:-$(uname -r)} @@ -75,8 +75,7 @@ find . \ -exec chmod 644 {} \; # Patch for recent kernels, thanks Gentoo -patch -p1 < $CWD/patches/lirc-0.9.0-kernel-2.6.39-fixes.patch -patch -p1 < $CWD/patches/lirc-0.9.0-atiusb_kfifo.patch +for i in $CWD/patches/* ; do patch -p1 < $i ; done CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -116,6 +115,8 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +# This is an empty file :| +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 \ 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 new file mode 100644 index 0000000000..80b87d27ab --- /dev/null +++ b/system/lirc/patches/lirc-0.9.0-kernel-3.3.0-fixes.patch @@ -0,0 +1,50 @@ +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 new file mode 100644 index 0000000000..b06d94efb3 --- /dev/null +++ b/system/lirc/patches/lirc-0.9.0-kernel-3.5-err-fix.patch @@ -0,0 +1,12 @@ +--- 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 new file mode 100644 index 0000000000..bd11b61c19 --- /dev/null +++ b/system/lirc/patches/lirc-0.9.0-kernel-3.8-fixes.patch @@ -0,0 +1,80 @@ +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 = { |