diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2006-06-21 16:15:40 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2006-06-21 16:15:40 +0000 |
| commit | d2b0a0b15e6c2854ec26ec94422086f55968341a (patch) | |
| tree | b46672d97aa369fc806cc7af80f5c213314855d7 /app-misc | |
| parent | Rearranged the dependencies since gawk and pciutils are now used outside of j... (diff) | |
| download | gentoo-2-d2b0a0b15e6c2854ec26ec94422086f55968341a.tar.gz gentoo-2-d2b0a0b15e6c2854ec26ec94422086f55968341a.tar.bz2 gentoo-2-d2b0a0b15e6c2854ec26ec94422086f55968341a.zip | |
Make it compile with Kernel 2.6.17, solving Bug #137409.
(Portage version: 2.1.1_pre1-r1)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/lirc/ChangeLog | 7 | ||||
| -rw-r--r-- | app-misc/lirc/files/lirc-0.8.0-kernel-2.6.17.diff | 29 | ||||
| -rw-r--r-- | app-misc/lirc/lirc-0.8.0-r1.ebuild | 3 | ||||
| -rw-r--r-- | app-misc/lirc/lirc-0.8.0.ebuild | 3 |
4 files changed, 39 insertions, 3 deletions
diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog index 8736bf7b5716..9888849ac0af 100644 --- a/app-misc/lirc/ChangeLog +++ b/app-misc/lirc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-misc/lirc # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.90 2006/06/07 05:38:46 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.91 2006/06/21 16:15:40 zzam Exp $ + + 21 Jun 2006; Matthias Schwarzott <zzam@gentoo.org> + +files/lirc-0.8.0-kernel-2.6.17.diff, lirc-0.8.0.ebuild, + lirc-0.8.0-r1.ebuild: + Make it compile with Kernel 2.6.17, solving Bug #137409. 07 Jun 2006; Markus Rothe <corsair@gentoo.org> lirc-0.8.0-r1.ebuild: Added ~ppc64; bug #131306 diff --git a/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.17.diff b/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.17.diff new file mode 100644 index 000000000000..c14728214213 --- /dev/null +++ b/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.17.diff @@ -0,0 +1,29 @@ +diff -ru lirc-0.8.0/drivers/lirc_gpio/lirc_gpio.c lirc-0.8.0-kernel-2.6.17/drivers/lirc_gpio/lirc_gpio.c +--- lirc-0.8.0/drivers/lirc_gpio/lirc_gpio.c 2006-01-01 14:43:46.000000000 +0100 ++++ lirc-0.8.0-kernel-2.6.17/drivers/lirc_gpio/lirc_gpio.c 2006-06-21 17:20:32.000000000 +0200 +@@ -48,9 +48,12 @@ + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0) + #include "../drivers/char/bttv.h" + #include "../drivers/char/bttvp.h" +-#else ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17) + #include "../drivers/media/video/bttv.h" + #include "../drivers/media/video/bttvp.h" ++#else ++#include "../drivers/media/video/bt8xx/bttv.h" ++#include "../drivers/media/video/bt8xx/bttvp.h" + #endif + + #if BTTV_VERSION_CODE < KERNEL_VERSION(0,7,45) +diff -ru lirc-0.8.0/drivers/Makefile.common lirc-0.8.0-kernel-2.6.17/drivers/Makefile.common +--- lirc-0.8.0/drivers/Makefile.common 2005-12-27 13:59:01.000000000 +0100 ++++ lirc-0.8.0-kernel-2.6.17/drivers/Makefile.common 2006-06-21 17:47:14.000000000 +0200 +@@ -10,7 +10,7 @@ + KBUILD_VERBOSE = 1 + LIRC_EXTRA_CFLAGS = -DIRCTL_DEV_MAJOR=$(lirc_major) -DEXPORT_SYMTAB $(DEFS) \ + $(DEFAULT_INCLUDES) -I$(LIRC_DEVDIR)/../.. \ +- -I$(KERNEL_LOCATION)/include/ ++ -I$(KERNEL_LOCATION)/include/ -Idrivers/media/video + export LIRC_EXTRA_CFLAGS KERNEL_LOCATION module_DATA + + $(module_DATA): $(automake_dummy_SOURCES) $(top_srcdir)/config.h ../lirc.h diff --git a/app-misc/lirc/lirc-0.8.0-r1.ebuild b/app-misc/lirc/lirc-0.8.0-r1.ebuild index 32a3d8a1866c..7565a5901a94 100644 --- a/app-misc/lirc/lirc-0.8.0-r1.ebuild +++ b/app-misc/lirc/lirc-0.8.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.0-r1.ebuild,v 1.2 2006/06/07 05:38:46 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.0-r1.ebuild,v 1.3 2006/06/21 16:15:40 zzam Exp $ inherit eutils linux-mod flag-o-matic autotools @@ -209,6 +209,7 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/${P}-kernel-2.6.16.diff + epatch ${FILESDIR}/${P}-kernel-2.6.17.diff use lirc_devices_xboxusb && epatch ${FILESDIR}/lirc-0.8.0pre4-xbox-remote.diff use lirc_devices_imon_pad2keys && epatch ${FILESDIR}/${P}-imon-pad2keys.patch diff --git a/app-misc/lirc/lirc-0.8.0.ebuild b/app-misc/lirc/lirc-0.8.0.ebuild index c0d5e27d5bf3..f8259ad0d753 100644 --- a/app-misc/lirc/lirc-0.8.0.ebuild +++ b/app-misc/lirc/lirc-0.8.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.0.ebuild,v 1.8 2006/05/31 18:52:09 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.0.ebuild,v 1.9 2006/06/21 16:15:40 zzam Exp $ inherit eutils linux-mod flag-o-matic autotools @@ -86,6 +86,7 @@ src_unpack() { cd ${S} #epatch ${FILESDIR}/lirc-0.7.0-xbox.patch.bz2 epatch ${FILESDIR}/${P}-kernel-2.6.16.diff + epatch ${FILESDIR}/${P}-kernel-2.6.17.diff filter-flags -Wl,-O1 sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.in |