| 1 |
wormo 08/10/01 19:17:25 |
| 2 |
|
| 3 |
Modified: svgalib-1.9.25-linux2.6.patch |
| 4 |
Log: |
| 5 |
Add lrmi patch to compile with kernels >= 2.6.26 (bug #235401, |
| 6 |
fix posted by reporter pyrophobicman in related bug #235495) |
| 7 |
(Portage version: 2.1.4.4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.7 media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch?rev=1.7&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch?rev=1.7&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch?r1=1.6&r2=1.7 |
| 15 |
|
| 16 |
Index: svgalib-1.9.25-linux2.6.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch,v |
| 19 |
retrieving revision 1.6 |
| 20 |
retrieving revision 1.7 |
| 21 |
diff -u -r1.6 -r1.7 |
| 22 |
--- svgalib-1.9.25-linux2.6.patch 16 Aug 2008 14:36:09 -0000 1.6 |
| 23 |
+++ svgalib-1.9.25-linux2.6.patch 1 Oct 2008 19:17:24 -0000 1.7 |
| 24 |
@@ -5,6 +5,7 @@ |
| 25 |
- use module_param() for 2.6.x and MODULE_PARM() for all others |
| 26 |
- dont declare all_devices as static since it is exported |
| 27 |
- dont include <linux/config.h> as the build system does it for us |
| 28 |
+ - in lrmi, map old flag names to new names for versions >= 2.6.26 |
| 29 |
|
| 30 |
--- svgalib/kernel/svgalib_helper/Makefile |
| 31 |
+++ svgalib/kernel/svgalib_helper/Makefile |
| 32 |
@@ -207,4 +208,70 @@ |
| 33 |
+ |
| 34 |
+MODULE_PARM_DESC(debug, "Debug output level."); |
| 35 |
MODULE_PARM_DESC(all_devices, "Give access to all PCI devices, regardless of class."); |
| 36 |
+ |
| 37 |
+ |
| 38 |
+--- svgalib/src/lrmi.6.c |
| 39 |
++++ svgalib/src/lrmi.6.c |
| 40 |
+@@ -169,6 +169,13 @@ LRMI_free_real(void *m) |
| 41 |
+ } |
| 42 |
+ } |
| 43 |
+ |
| 44 |
++#ifndef TF_MASK |
| 45 |
++#define TF_MASK X86_EFLAGS_TF |
| 46 |
++#define IF_MASK X86_EFLAGS_IF |
| 47 |
++#define IOPL_MASK X86_EFLAGS_IOPL |
| 48 |
++#define VIF_MASK X86_EFLAGS_VIF |
| 49 |
++#define VIP_MASK X86_EFLAGS_VIP |
| 50 |
++#endif |
| 51 |
+ |
| 52 |
+ #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) |
| 53 |
+ #define DEFAULT_STACK_SIZE 0x1000 |
| 54 |
+--- svgalib/src/lrmi.9.c |
| 55 |
++++ svgalib/src/lrmi.9.c |
| 56 |
+@@ -206,6 +206,13 @@ LRMI_free_real(void *m) |
| 57 |
+ |
| 58 |
+ |
| 59 |
+ #if defined(__linux__) |
| 60 |
++#ifndef TF_MASK |
| 61 |
++#define TF_MASK X86_EFLAGS_TF |
| 62 |
++#define IF_MASK X86_EFLAGS_IF |
| 63 |
++#define IOPL_MASK X86_EFLAGS_IOPL |
| 64 |
++#define VIF_MASK X86_EFLAGS_VIF |
| 65 |
++#define VIP_MASK X86_EFLAGS_VIP |
| 66 |
++#endif |
| 67 |
+ #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) |
| 68 |
+ #elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) |
| 69 |
+ #define DEFAULT_VM86_FLAGS (PSL_I | PSL_IOPL) |
| 70 |
+--- svgalib/lrmi-0.6m/lrmi.c |
| 71 |
++++ svgalib/lrmi-0.6m/lrmi.c |
| 72 |
+@@ -170,6 +170,14 @@ LRMI_free_real(void *m) |
| 73 |
+ } |
| 74 |
+ |
| 75 |
+ |
| 76 |
++#ifndef TF_MASK |
| 77 |
++#define TF_MASK X86_EFLAGS_TF |
| 78 |
++#define IF_MASK X86_EFLAGS_IF |
| 79 |
++#define IOPL_MASK X86_EFLAGS_IOPL |
| 80 |
++#define VIF_MASK X86_EFLAGS_VIF |
| 81 |
++#define VIP_MASK X86_EFLAGS_VIP |
| 82 |
++#endif |
| 83 |
++ |
| 84 |
+ #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) |
| 85 |
+ #define DEFAULT_STACK_SIZE 0x1000 |
| 86 |
+ #define RETURN_TO_32_INT 255 |
| 87 |
+--- svgalib/lrmi-0.9/lrmi.c |
| 88 |
++++ svgalib/lrmi-0.9/lrmi.c |
| 89 |
+@@ -203,6 +203,13 @@ LRMI_free_real(void *m) |
| 90 |
|
| 91 |
+ |
| 92 |
+ #if defined(__linux__) |
| 93 |
++#ifndef TF_MASK |
| 94 |
++#define TF_MASK X86_EFLAGS_TF |
| 95 |
++#define IF_MASK X86_EFLAGS_IF |
| 96 |
++#define IOPL_MASK X86_EFLAGS_IOPL |
| 97 |
++#define VIF_MASK X86_EFLAGS_VIF |
| 98 |
++#define VIP_MASK X86_EFLAGS_VIP |
| 99 |
++#endif |
| 100 |
+ #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) |
| 101 |
+ #elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) |
| 102 |
+ #define DEFAULT_VM86_FLAGS (PSL_I | PSL_IOPL) |
Archives