diff options
| -rw-r--r-- | media-libs/svgalib/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/svgalib/Manifest | 4 | ||||
| -rw-r--r-- | media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch | 67 |
3 files changed, 75 insertions, 3 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/Manifest b/media-libs/svgalib/Manifest index 786533ee478e..c3e466463b4c 100644 --- a/media-libs/svgalib/Manifest +++ b/media-libs/svgalib/Manifest @@ -1,8 +1,8 @@ AUX svgalib-1.9.19-pic.patch 487 RMD160 5bd8935162cdfa55292e4fabfbec1515ad80a507 SHA1 326f4132d7f625d2fd5ae04795da5f2e6f1bc36f SHA256 cbce8a1067b6618300de8b1934dd72a28130eba6953938434333dab3b29c8358 AUX svgalib-1.9.25-build.patch 1834 RMD160 725fa79a06dabb2b45cc8f325ab13cd3f982d931 SHA1 bc1cb83188c3ceb08c7cc0fda780fa5391c62208 SHA256 8e27610d4050f55301a611c9abb438bd4aa757d8fecc98b43cdc352dbf747e54 -AUX svgalib-1.9.25-linux2.6.patch 6997 RMD160 54df7b5289e4b362e7aff74757e4e64d5a1eb451 SHA1 c20fb4f4528e62b33047add768152f5bf82b6a43 SHA256 81bcc56b26920de60003b1ff4da59824181d3b960e795412f0a3ec65b69e4ea9 +AUX svgalib-1.9.25-linux2.6.patch 8842 RMD160 3e4ed6f1acbad3132363b8986306834e22b6d36d SHA1 e655b9324bfa0db65c11a1d487e6b115fa9afd0d SHA256 d37afa43f45ef8860eb82bbc2d55b6dbb697954ac35d5bed1e48481c0d28b3d0 AUX svgalib.udev.rules.d 55 RMD160 05987efb133e53358a8f1aeb69895b8f44fb9f80 SHA1 a0851d5de96c9e3933515fcbdb0fb6de9a07339e SHA256 ae60596a1b5fdc0e6cc9d625f363d869f8674e4da631cc341e663b22870f7d81 DIST svgalib-1.9.25.tar.gz 987084 RMD160 e987f65ddb5610c575183e4a2058423eab3ce1e4 SHA1 187b2156dde0e8f397b130d14cc35237386273d6 SHA256 2ad5da713a6bd69622c483de4e4f448ed2b82f7b954db43dc477d5b6b12d8602 EBUILD svgalib-1.9.25.ebuild 3548 RMD160 e0b4b659fe653cf5541c7d2b63d9505f0171114e SHA1 f0e11849baabf1ccf3149e402dd2fe224d52eae4 SHA256 7f2bf8e1482db90b11459686248758d8247e89f787892c790407ead0a426f684 -MISC ChangeLog 13763 RMD160 969f90b349e881b196afab0deee3820b0a175b33 SHA1 54c3d78cf3a5dd881dbd865875d724264e759836 SHA256 5a327c138954c097f177d9d61f31ed7d1e4350f78d0d06ab83aeeed009bd8c58 +MISC ChangeLog 13991 RMD160 21d204e5514261a8721e971c5bbb8f9b5bcd7d8e SHA1 4ca9be6dbf07345e1b22d70a327408accf408cc2 SHA256 eded1d8761598e665fb9d3784f1ab92d121be1cf28e262eb21150fbcb06bf635 MISC metadata.xml 251 RMD160 e0bcff619838271bbca98b61a3f2e2ca1f1f3ac5 SHA1 e9817cb41b490f36c003b4f6f7f8d5c5b2925a91 SHA256 c8b65b62cd7f073b5391536073610d99602f69c7ee4438607100474699a3ffdd 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) |