diff options
| author |   Stephanie J. Lockwood-Childs <wormo@gentoo.org> | 2008-10-01 19:17:24 +0000 |
|---|---|---|
| committer | Stephanie J. Lockwood-Childs <wormo@gentoo.org> | 2008-10-01 19:17:24 +0000 |
| commit | 9dd4ad90fdfaf0134a2c1cfe16fcd3f6d925c886 (patch) | |
| tree | 11d896eb445df5bec7aec385e445e1fddfb20749 /media-libs/svgalib | |
| parent | Masking x11-misc/obpager to be removed (bug 226007) (diff) | |
| download | gentoo-2-9dd4ad90fdfaf0134a2c1cfe16fcd3f6d925c886.tar.gz gentoo-2-9dd4ad90fdfaf0134a2c1cfe16fcd3f6d925c886.tar.bz2 gentoo-2-9dd4ad90fdfaf0134a2c1cfe16fcd3f6d925c886.zip | |
Add lrmi patch to compile with kernels >= 2.6.26 (bug #235401,
fix posted by reporter pyrophobicman in related bug #235495)
(Portage version: 2.1.4.4)
Diffstat (limited to 'media-libs/svgalib')
| -rw-r--r-- | media-libs/svgalib/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch | 67 |
2 files changed, 73 insertions, 1 deletions
diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog index 48d3420357b9..10eddb795fd1 100644 --- a/media-libs/svgalib/ChangeLog +++ b/media-libs/svgalib/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/svgalib # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.79 2008/08/16 14:36:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.80 2008/10/01 19:17:23 wormo Exp $ + + 02 Oct 2008; Stephanie Lockwood-Childs <wormo@gentoo.org> + files/svgalib-1.9.25-linux2.6.patch: + Add lrmi patch to compile with kernels >= 2.6.26 (bug #235401, + fix posted by reporter pyrophobicman in related bug #235495) 16 Aug 2008; Mike Frysinger <vapier@gentoo.org> files/svgalib-1.9.25-linux2.6.patch: diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch index 8475d3ae0f89..f3b61e1e8e1d 100644 --- a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch +++ b/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch @@ -5,6 +5,7 @@ - use module_param() for 2.6.x and MODULE_PARM() for all others - dont declare all_devices as static since it is exported - dont include <linux/config.h> as the build system does it for us + - in lrmi, map old flag names to new names for versions >= 2.6.26 --- svgalib/kernel/svgalib_helper/Makefile +++ svgalib/kernel/svgalib_helper/Makefile @@ -207,4 +208,70 @@ + +MODULE_PARM_DESC(debug, "Debug output level."); MODULE_PARM_DESC(all_devices, "Give access to all PCI devices, regardless of class."); + + +--- svgalib/src/lrmi.6.c ++++ svgalib/src/lrmi.6.c +@@ -169,6 +169,13 @@ LRMI_free_real(void *m) + } + } + ++#ifndef TF_MASK ++#define TF_MASK X86_EFLAGS_TF ++#define IF_MASK X86_EFLAGS_IF ++#define IOPL_MASK X86_EFLAGS_IOPL ++#define VIF_MASK X86_EFLAGS_VIF ++#define VIP_MASK X86_EFLAGS_VIP ++#endif + + #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) + #define DEFAULT_STACK_SIZE 0x1000 +--- svgalib/src/lrmi.9.c ++++ svgalib/src/lrmi.9.c +@@ -206,6 +206,13 @@ LRMI_free_real(void *m) + + + #if defined(__linux__) ++#ifndef TF_MASK ++#define TF_MASK X86_EFLAGS_TF ++#define IF_MASK X86_EFLAGS_IF ++#define IOPL_MASK X86_EFLAGS_IOPL ++#define VIF_MASK X86_EFLAGS_VIF ++#define VIP_MASK X86_EFLAGS_VIP ++#endif + #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) + #elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) + #define DEFAULT_VM86_FLAGS (PSL_I | PSL_IOPL) +--- svgalib/lrmi-0.6m/lrmi.c ++++ svgalib/lrmi-0.6m/lrmi.c +@@ -170,6 +170,14 @@ LRMI_free_real(void *m) + } + + ++#ifndef TF_MASK ++#define TF_MASK X86_EFLAGS_TF ++#define IF_MASK X86_EFLAGS_IF ++#define IOPL_MASK X86_EFLAGS_IOPL ++#define VIF_MASK X86_EFLAGS_VIF ++#define VIP_MASK X86_EFLAGS_VIP ++#endif ++ + #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) + #define DEFAULT_STACK_SIZE 0x1000 + #define RETURN_TO_32_INT 255 +--- svgalib/lrmi-0.9/lrmi.c ++++ svgalib/lrmi-0.9/lrmi.c +@@ -203,6 +203,13 @@ LRMI_free_real(void *m) + + #if defined(__linux__) ++#ifndef TF_MASK ++#define TF_MASK X86_EFLAGS_TF ++#define IF_MASK X86_EFLAGS_IF ++#define IOPL_MASK X86_EFLAGS_IOPL ++#define VIF_MASK X86_EFLAGS_VIF ++#define VIP_MASK X86_EFLAGS_VIP ++#endif + #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) + #elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) + #define DEFAULT_VM86_FLAGS (PSL_I | PSL_IOPL) |