diff options
| author |   Ian Stakenvicius <axs@gentoo.org> | 2012-11-27 18:49:26 +0000 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2012-11-27 18:49:26 +0000 |
| commit | d7e256a861ea32ff65f65b6481fa2a50509a2e56 (patch) | |
| tree | b0335094a67e3ac8b95478de082ae2a0b6872e92 /app-misc/lirc | |
| parent | Drop apache herd as discussed in http://www.gossamer-threads.com/lists/gentoo... (diff) | |
| download | gentoo-2-d7e256a861ea32ff65f65b6481fa2a50509a2e56.tar.gz gentoo-2-d7e256a861ea32ff65f65b6481fa2a50509a2e56.tar.bz2 gentoo-2-d7e256a861ea32ff65f65b6481fa2a50509a2e56.zip | |
added err() to kcompat.h as has been removed from usb.h in kernels >=3.5, fixing bug 444736
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
Diffstat (limited to 'app-misc/lirc')
| -rw-r--r-- | app-misc/lirc/ChangeLog | 7 | ||||
| -rw-r--r-- | app-misc/lirc/files/lirc-0.9.0-kernel-3.5-err-fix.patch | 12 | ||||
| -rw-r--r-- | app-misc/lirc/lirc-0.9.0-r2.ebuild | 4 |
3 files changed, 21 insertions, 2 deletions
diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog index 31afb03c97be..3a4a22e4bd4a 100644 --- a/app-misc/lirc/ChangeLog +++ b/app-misc/lirc/ChangeLog @@ -1,6 +1,11 @@ # 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.233 2012/10/24 18:39:12 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.234 2012/11/27 18:49:26 axs Exp $ + + 27 Nov 2012; Ian Stakenvicius <axs@gentoo.org> lirc-0.9.0-r2.ebuild, + +files/lirc-0.9.0-kernel-3.5-err-fix.patch: + added err() to kcompat.h as has been removed from usb.h in kernels >=3.5, + fixing bug 444736 24 Oct 2012; Ian Stakenvicius <axs@gentoo.org> lirc-0.9.0-r2.ebuild, +files/lirc-0.9.0-kernel-3.3.0-fixes.patch: diff --git a/app-misc/lirc/files/lirc-0.9.0-kernel-3.5-err-fix.patch b/app-misc/lirc/files/lirc-0.9.0-kernel-3.5-err-fix.patch new file mode 100644 index 000000000000..b06d94efb322 --- /dev/null +++ b/app-misc/lirc/files/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/app-misc/lirc/lirc-0.9.0-r2.ebuild b/app-misc/lirc/lirc-0.9.0-r2.ebuild index 9bcc0eafc881..d4d3fb5da43a 100644 --- a/app-misc/lirc/lirc-0.9.0-r2.ebuild +++ b/app-misc/lirc/lirc-0.9.0-r2.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-r2.ebuild,v 1.4 2012/10/24 18:39:12 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.9.0-r2.ebuild,v 1.5 2012/11/27 18:49:26 axs Exp $ EAPI=4 @@ -298,6 +298,8 @@ src_prepare() { epatch "${FILESDIR}"/${P}-atiusb_kfifo.patch # Apply fixes for kernel-3.3 and above (bug 439538) epatch "${FILESDIR}"/${P}-kernel-3.3.0-fixes.patch + # Apply fix for missing err() in usb.h for kernel 3.5+ (bug 444736) + epatch "${FILESDIR}"/${P}-kernel-3.5-err-fix.patch # Do not build drivers from the top-level Makefile sed -i -e 's:\(SUBDIRS =\) drivers\(.*\):\1\2:' Makefile.am |