diff options
| author |   Jörg Bornkessel <hd_brummy@gentoo.org> | 2007-12-28 14:23:22 +0000 |
|---|---|---|
| committer | Jörg Bornkessel <hd_brummy@gentoo.org> | 2007-12-28 14:23:22 +0000 |
| commit | 35fd2d29bf9de63c560ce166d7647b75778e0dc6 (patch) | |
| tree | a3fa2a25f1e83111553e03f01b56362ee269e9ed /app-misc | |
| parent | Step up as new antiword maintainer (diff) | |
| download | gentoo-2-35fd2d29bf9de63c560ce166d7647b75778e0dc6.tar.gz gentoo-2-35fd2d29bf9de63c560ce166d7647b75778e0dc6.tar.bz2 gentoo-2-35fd2d29bf9de63c560ce166d7647b75778e0dc6.zip | |
rewrite patch; bug 200508
(Portage version: 2.1.3.19)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/lirc/ChangeLog | 6 | ||||
| -rw-r--r-- | app-misc/lirc/files/lirc-0.8.3_pre1-kernel-2.6.24.diff | 24 | ||||
| -rw-r--r-- | app-misc/lirc/lirc-0.8.3_pre1.ebuild | 10 |
3 files changed, 34 insertions, 6 deletions
diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog index d7daba63061b..1dc37183c620 100644 --- a/app-misc/lirc/ChangeLog +++ b/app-misc/lirc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/lirc # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.168 2007/12/27 00:12:21 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.169 2007/12/28 14:23:21 hd_brummy Exp $ + + 28 Dec 2007; Joerg Bornkessel <hd_brummy@gentoo.org> + files/lirc-0.8.3_pre1-kernel-2.6.24.diff, lirc-0.8.3_pre1.ebuild: + rewrite patch; bug 200508 27 Dec 2007; Joerg Bornkessel <hd_brummy@gentoo.org> lirc-0.8.3_pre1.ebuild: diff --git a/app-misc/lirc/files/lirc-0.8.3_pre1-kernel-2.6.24.diff b/app-misc/lirc/files/lirc-0.8.3_pre1-kernel-2.6.24.diff index 5b9150bdeece..7216e77eff4b 100644 --- a/app-misc/lirc/files/lirc-0.8.3_pre1-kernel-2.6.24.diff +++ b/app-misc/lirc/files/lirc-0.8.3_pre1-kernel-2.6.24.diff @@ -84,3 +84,27 @@ ir->t_notify = NULL; ir->t_notify2 = NULL; } +diff -Naur lirc-0.8.3pre1.orig/drivers/lirc_serial/lirc_serial.c lirc-0.8.3pre1/drivers/lirc_serial/lirc_serial.c +--- lirc-0.8.3pre1.orig/drivers/lirc_serial/lirc_serial.c 2007-12-27 01:27:36.143803257 +0100 ++++ lirc-0.8.3pre1/drivers/lirc_serial/lirc_serial.c 2007-12-27 01:29:38.149303268 +0100 +@@ -961,7 +961,7 @@ + do_gettimeofday(&lasttv); + + result = request_irq(irq, irq_handler, +- SA_INTERRUPT | (share_irq ? SA_SHIRQ:0), ++ IRQF_DISABLED | (share_irq ? IRQF_SHARED:0), + LIRC_DRIVER_NAME, (void *)&hardware); + + switch (result) { +diff -Naur lirc-0.8.3pre1.orig/drivers/lirc_sir/lirc_sir.c lirc-0.8.3pre1/drivers/lirc_sir/lirc_sir.c +--- lirc-0.8.3pre1.orig/drivers/lirc_sir/lirc_sir.c 2007-12-28 15:11:48.142285437 +0100 ++++ lirc-0.8.3pre1/drivers/lirc_sir/lirc_sir.c 2007-12-28 15:13:05.561290741 +0100 +@@ -1025,7 +1025,7 @@ + return -EBUSY; + } + #endif +- retval = request_irq(irq, sir_interrupt, SA_INTERRUPT, ++ retval = request_irq(irq, sir_interrupt, IRQF_DISABLED, + LIRC_DRIVER_NAME, NULL); + if (retval < 0) { + # ifndef LIRC_ON_SA1100 diff --git a/app-misc/lirc/lirc-0.8.3_pre1.ebuild b/app-misc/lirc/lirc-0.8.3_pre1.ebuild index 313daf01a291..8b80bdb90d16 100644 --- a/app-misc/lirc/lirc-0.8.3_pre1.ebuild +++ b/app-misc/lirc/lirc-0.8.3_pre1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.3_pre1.ebuild,v 1.10 2007/12/27 00:12:21 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.3_pre1.ebuild,v 1.11 2007/12/28 14:23:21 hd_brummy Exp $ inherit eutils linux-mod flag-o-matic autotools @@ -252,10 +252,10 @@ src_unpack() { sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am fi -# # Bug #200508 -# if kernel_is ge 2 6 24 ; then -# epatch "${FILESDIR}"/${P}-kernel-2.6.24.diff -# fi + # Bug #200508 + if kernel_is ge 2 6 24 ; then + epatch "${FILESDIR}"/${P}-kernel-2.6.24.diff + fi # respect CFLAGS sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.ac |