diff options
| -rw-r--r-- | media-libs/svgalib/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/svgalib/files/svgalib-1.9.18-linux2.6.patch | 23 |
2 files changed, 28 insertions, 1 deletions
diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog index 0c7ed925c8a2..912d373fa8e4 100644 --- a/media-libs/svgalib/ChangeLog +++ b/media-libs/svgalib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/svgalib # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.29 2004/02/23 08:46:59 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.30 2004/02/23 21:51:12 azarah Exp $ + + 23 Feb 2004; Martin Schlemmer <azarah@gentoo.org> + files/svgalib-1.9.18-linux2.6.patch: + Fix bug #42644 (2.4.23 also uses irqreturn_t, so do not define it then). 23 Feb 2004; Luca Barbato <lu_zero@gentoo.org> svgalib-1.9.18.ebuild: Workaround to let the kernel module compile on 2.6 diff --git a/media-libs/svgalib/files/svgalib-1.9.18-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.18-linux2.6.patch index 66bd65354ba2..c1b489473499 100644 --- a/media-libs/svgalib/files/svgalib-1.9.18-linux2.6.patch +++ b/media-libs/svgalib/files/svgalib-1.9.18-linux2.6.patch @@ -44,6 +44,29 @@ diff -urpN svgalib-1.9.18/kernel/svgalib_helper/Makefile svgalib-1.9.18.new/kern diff -urpN svgalib-1.9.18/kernel/svgalib_helper/kernel26compat.h svgalib-1.9.18.new/kernel/svgalib_helper/kernel26compat.h --- svgalib-1.9.18/kernel/svgalib_helper/kernel26compat.h 2003-10-04 15:42:01.000000000 +0200 +++ svgalib-1.9.18.new/kernel/svgalib_helper/kernel26compat.h 2004-02-23 00:41:03.176196576 +0200 +@@ -1,5 +1,8 @@ + #ifndef KERNEL_VERSION + # include <linux/version.h> ++#else ++# undef KERNEL_VERSION ++# include <linux/version.h> + #endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) + +@@ -9,9 +12,11 @@ + + # define my_io_remap_page_range(vma, start, ofs, len, prot) io_remap_page_range(start,ofs,len,prot) + ++# if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23) + typedef void irqreturn_t; +-# define IRQ_NONE +-# define IRQ_HANDLED ++# define IRQ_NONE ++# define IRQ_HANDLED ++# endif + + #else /* Kernel 2.6 */ + @@ -43,9 +43,36 @@ static inline int devfs_unregister_chrde } #endif |