diff options
| -rw-r--r-- | app-misc/lirc/ChangeLog | 7 | ||||
| -rw-r--r-- | app-misc/lirc/files/lirc-0.9.0-kernel-3.8-fixes.patch | 80 | ||||
| -rw-r--r-- | app-misc/lirc/lirc-0.9.0-r2.ebuild | 10 |
3 files changed, 91 insertions, 6 deletions
diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog index a0bae6c7c60e..39357be74ed5 100644 --- a/app-misc/lirc/ChangeLog +++ b/app-misc/lirc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-misc/lirc # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.240 2013/04/26 06:07:57 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.241 2013/05/24 16:31:01 axs Exp $ + + 24 May 2013; Ian Stakenvicius <axs@gentoo.org> + +files/lirc-0.9.0-kernel-3.8-fixes.patch, lirc-0.9.0-r2.ebuild: + apply fix for kernel-3.8 (bug 461532) , only unparallelize the necessary bit + of compilation 26 Apr 2013; Patrick Lauer <patrick@gentoo.org> lirc-0.9.0-r2.ebuild: Automake 1.13 fix diff --git a/app-misc/lirc/files/lirc-0.9.0-kernel-3.8-fixes.patch b/app-misc/lirc/files/lirc-0.9.0-kernel-3.8-fixes.patch new file mode 100644 index 000000000000..bd11b61c19d8 --- /dev/null +++ b/app-misc/lirc/files/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 = { diff --git a/app-misc/lirc/lirc-0.9.0-r2.ebuild b/app-misc/lirc/lirc-0.9.0-r2.ebuild index ef28c1a1ffa2..bf56eefe91da 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-2013 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.10 2013/04/26 06:07:57 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.9.0-r2.ebuild,v 1.11 2013/05/24 16:31:01 axs Exp $ EAPI=4 @@ -278,9 +278,6 @@ pkg_setup() { elog "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}" filter-flags -Wl,-O1 - - # force non-parallel make, Bug 196134 (confirmed valid for 0.9.0-r2) - MAKEOPTS="${MAKEOPTS} -j1" } src_prepare() { @@ -300,6 +297,8 @@ src_prepare() { 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 + # Apply fix for missing __devinit __devexit defines in kernel 3.8+ (bug 461532) + epatch "${FILESDIR}"/${P}-kernel-3.8-fixes.patch # Do not build drivers from the top-level Makefile sed -i -e 's:\(SUBDIRS =\) drivers\(.*\):\1\2:' Makefile.am @@ -345,7 +344,8 @@ src_configure() { } src_compile() { - emake + # force non-parallel make, Bug 196134 (confirmed valid for 0.9.0-r2) + emake -j1 MODULE_NAMES="lirc(misc:${S}/drivers)" BUILD_TARGETS="all" |