diff options
| author |   Ian Stakenvicius <axs@gentoo.org> | 2012-07-17 20:30:17 +0000 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2012-07-17 20:30:17 +0000 |
| commit | e95a3911cf280152f669e9cb550a280ed95073b2 (patch) | |
| tree | 18fb87be94c51803579a322aa36a0f41d737db04 /app-misc/lirc | |
| parent | fixed compilation issues for some drivers against kernel >=2.6.39 for bug 369... (diff) | |
| download | gentoo-2-e95a3911cf280152f669e9cb550a280ed95073b2.tar.gz gentoo-2-e95a3911cf280152f669e9cb550a280ed95073b2.tar.bz2 gentoo-2-e95a3911cf280152f669e9cb550a280ed95073b2.zip | |
Applied upstream patch to fix bug 377033
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'app-misc/lirc')
| -rw-r--r-- | app-misc/lirc/ChangeLog | 6 | ||||
| -rw-r--r-- | app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch | 14 | ||||
| -rw-r--r-- | app-misc/lirc/lirc-0.9.0-r1.ebuild | 5 |
3 files changed, 23 insertions, 2 deletions
diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog index 79e9f5ee6460..da321e75c39f 100644 --- a/app-misc/lirc/ChangeLog +++ b/app-misc/lirc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/lirc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.227 2012/07/17 20:14:21 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.228 2012/07/17 20:30:16 axs Exp $ + + 17 Jul 2012; Ian Stakenvicius <axs@gentoo.org> lirc-0.9.0-r1.ebuild, + +files/lirc-0.9.0-atiusb_kfifo.patch: + Applied upstream patch to fix bug 377033 17 Jul 2012; Ian Stakenvicius <axs@gentoo.org> lirc-0.9.0-r1.ebuild, +files/lirc-0.9.0-kernel-2.6.39-fixes.patch: diff --git a/app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch b/app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch new file mode 100644 index 000000000000..32edb244b412 --- /dev/null +++ b/app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch @@ -0,0 +1,14 @@ +--- 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/app-misc/lirc/lirc-0.9.0-r1.ebuild b/app-misc/lirc/lirc-0.9.0-r1.ebuild index fdc604ae29e8..acbf1f3fe413 100644 --- a/app-misc/lirc/lirc-0.9.0-r1.ebuild +++ b/app-misc/lirc/lirc-0.9.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.9.0-r1.ebuild,v 1.2 2012/07/17 20:14:21 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.9.0-r1.ebuild,v 1.3 2012/07/17 20:30:16 axs Exp $ EAPI=4 @@ -293,6 +293,9 @@ src_prepare() { # Apply fixes for kernel-2.6.39 and above epatch "${FILESDIR}"/${P}-kernel-2.6.39-fixes.patch + # Slightly massaged upstream patch to fix kfifo issues >=2.6.38 + # for bug 377033 + epatch "${FILESDIR}"/${P}-atiusb_kfifo.patch # Do not build drivers from the top-level Makefile sed -i -e 's:\(SUBDIRS =\) drivers\(.*\):\1\2:' Makefile.am |