diff options
author | Mike Frysinger <vapier@gentoo.org> | 2006-06-20 19:48:50 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2006-06-20 19:48:50 +0000 |
commit | 5d4439576016893b28dad12307e6ce8d30c11b21 (patch) | |
tree | f249b4c515ad9df8e6895f87caf0a6bd048cde3c /media-libs/svgalib | |
parent | kill off pointless whitespace (diff) | |
download | gentoo-2-5d4439576016893b28dad12307e6ce8d30c11b21.tar.gz gentoo-2-5d4439576016893b28dad12307e6ce8d30c11b21.tar.bz2 gentoo-2-5d4439576016893b28dad12307e6ce8d30c11b21.zip |
Fix building with linux-2.6.17 #137234 by Ivan Yosifov.
(Portage version: 2.1.1_pre1-r1)
Diffstat (limited to 'media-libs/svgalib')
-rw-r--r-- | media-libs/svgalib/ChangeLog | 6 | ||||
-rw-r--r-- | media-libs/svgalib/files/svgalib-1.9.24-linux2.6.patch | 19 |
2 files changed, 24 insertions, 1 deletions
diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog index 65ca42320252..b66b192e03f5 100644 --- a/media-libs/svgalib/ChangeLog +++ b/media-libs/svgalib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/svgalib # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.68 2006/06/04 09:50:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.69 2006/06/20 19:48:50 vapier Exp $ + + 20 Jun 2006; Mike Frysinger <vapier@gentoo.org> + files/svgalib-1.9.24-linux2.6.patch: + Fix building with linux-2.6.17 #137234 by Ivan Yosifov. 04 Jun 2006; Mike Frysinger <vapier@gentoo.org> +files/svgalib-1.9.24-all_devices.patch, svgalib-1.9.24.ebuild: diff --git a/media-libs/svgalib/files/svgalib-1.9.24-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.24-linux2.6.patch index 6e07283ab646..4dfd6b3864c3 100644 --- a/media-libs/svgalib/files/svgalib-1.9.24-linux2.6.patch +++ b/media-libs/svgalib/files/svgalib-1.9.24-linux2.6.patch @@ -2,6 +2,7 @@ - touch up the Makefile to let the ebuild handle the module details - fix support with io remap stuff in newer kernels - dont include headers that dont exist in 2.4.x kernels + - use module_param() for 2.6.x and MODULE_PARM() for all others --- svgalib/kernel/svgalib_helper/Makefile +++ svgalib/kernel/svgalib_helper/Makefile @@ -121,3 +122,21 @@ #define __KERNEL_SYSCALLS__ #include <linux/unistd.h> +@@ -770,10 +770,15 @@ + + } + ++#ifdef KERNEL_2_6 ++module_param(debug, int, 0); ++module_param(all_devices, int, 0); ++#else + MODULE_PARM(debug, "i"); +-MODULE_PARM_DESC(debug, "Debug output level."); +- + MODULE_PARM(all_devices, "i"); ++#endif ++ ++MODULE_PARM_DESC(debug, "Debug output level."); + MODULE_PARM_DESC(all_devices, "Give access to all PCI devices, regardless of class."); + + |