summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2006-07-27 17:33:24 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2006-07-27 17:33:24 +0000
commitac88b9efba8e4389aa04080825c2ffbb1576c058 (patch)
tree5ad8e49ce2832531c8b31a1b77709f5e4c763fda
parentAdd "sgc" and "backtrace" flags for dev-scheme/drscheme. (diff)
downloadgentoo-2-ac88b9efba8e4389aa04080825c2ffbb1576c058.tar.gz
gentoo-2-ac88b9efba8e4389aa04080825c2ffbb1576c058.tar.bz2
gentoo-2-ac88b9efba8e4389aa04080825c2ffbb1576c058.zip
Small change to match the patch in lirc-cvs.
(Portage version: 2.1.1_pre3-r5)
-rw-r--r--app-misc/lirc/ChangeLog6
-rw-r--r--app-misc/lirc/files/lirc-0.8.0-kernel-2.6.17.diff5
2 files changed, 8 insertions, 3 deletions
diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 67f3ec7fbc7c..cf55f70ec6be 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,10 @@
# 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.101 2006/07/25 14:29:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.102 2006/07/27 17:33:24 zzam Exp $
+
+ 27 Jul 2006; Matthias Schwarzott <zzam@gentoo.org>
+ files/lirc-0.8.0-kernel-2.6.17.diff:
+ Small change to match the patch in lirc-cvs.
*lirc-0.8.0-r4 (25 Jul 2006)
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
index c14728214213..adc0c66d6448 100644
--- 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
@@ -18,12 +18,13 @@ diff -ru lirc-0.8.0/drivers/lirc_gpio/lirc_gpio.c lirc-0.8.0-kernel-2.6.17/drive
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 @@
+@@ -10,7 +10,8 @@
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
++ -I$(KERNEL_LOCATION)/include/ \
++ -I$(KERNEL_LOCATION)/drivers/media/video/
export LIRC_EXTRA_CFLAGS KERNEL_LOCATION module_DATA
$(module_DATA): $(automake_dummy_SOURCES) $(top_srcdir)/config.h ../lirc.h