diff options
| author | Robin Cook | 2008-12-23 17:15:09 -0600 |
|---|---|---|
| committer | Robin Cook | 2008-12-23 17:15:09 -0600 |
| commit | 8f485f2ca6d3bebf8bbe85698c98a0242368296c (patch) | |
| tree | ae199758db427599a1d4f0d5b79a1decec49f81b /display/svgalib | |
| parent | 00cf8ee49677ba87e54d2fff4cb2dc48d47f341f (diff) | |
svgalib: apply patch to fix compile failure
Diffstat (limited to 'display/svgalib')
| -rw-r--r-- | display/svgalib/HISTORY | 4 | ||||
| -rwxr-xr-x | display/svgalib/PRE_BUILD | 1 | ||||
| -rw-r--r-- | display/svgalib/svgalib_lrmi-2.6.26.diff | 70 |
3 files changed, 75 insertions, 0 deletions
diff --git a/display/svgalib/HISTORY b/display/svgalib/HISTORY index f9159d2f5c..270762d2d1 100644 --- a/display/svgalib/HISTORY +++ b/display/svgalib/HISTORY @@ -1,3 +1,7 @@ +2008-12-23 Robin Cook <rcook@wyrms.net> + * PRE_BUILD: apply patch provided by maintainer for vesa driver compile failure + http://svn.rpmforge.net/svn/trunk/rpms/svgalib/svgalib-1.9.25-kernel-2.6.26.patch + 2008-08-10 Robin Cook <rcook@wyrms.net> * PRE_BUILD: updated to apply patch for 2.6.26 http://bugs.gentoo.org/attachment.cgi?id=161385&action=view diff --git a/display/svgalib/PRE_BUILD b/display/svgalib/PRE_BUILD index e8827616a5..83ddb8e136 100755 --- a/display/svgalib/PRE_BUILD +++ b/display/svgalib/PRE_BUILD @@ -11,6 +11,7 @@ sedit "s:\$(shell uname -r):$KER:g" \ # Apply patchs for kernel versions 2.6.15* and newer KER=${KER:0:6} && if [ ${KER//\./} > 2626 ]; then + patch -p1 < ${SCRIPT_DIRECTORY}/svgalib_lrmi-2.6.26.diff patch -p1 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.26.diff patch -p1 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.23.diff elif [ ${KER//\./} > 2623 ]; then diff --git a/display/svgalib/svgalib_lrmi-2.6.26.diff b/display/svgalib/svgalib_lrmi-2.6.26.diff new file mode 100644 index 0000000000..6521474e3d --- /dev/null +++ b/display/svgalib/svgalib_lrmi-2.6.26.diff @@ -0,0 +1,70 @@ +diff -up svgalib-1.9.25/src/lrmi.6.c~ svgalib-1.9.25/src/lrmi.6.c +--- svgalib-1.9.25/src/lrmi.6.c~ 2008-05-31 15:58:26.000000000 +0200 ++++ svgalib-1.9.25/src/lrmi.6.c 2008-05-31 15:58:26.000000000 +0200 +@@ -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 +diff -up svgalib-1.9.25/src/lrmi.9.c~ svgalib-1.9.25/src/lrmi.9.c +--- svgalib-1.9.25/src/lrmi.9.c~ 2008-05-31 15:58:25.000000000 +0200 ++++ svgalib-1.9.25/src/lrmi.9.c 2008-05-31 15:58:25.000000000 +0200 +@@ -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) +diff -up svgalib-1.9.25/lrmi-0.6m/lrmi.c~ svgalib-1.9.25/lrmi-0.6m/lrmi.c +--- svgalib-1.9.25/lrmi-0.6m/lrmi.c~ 2008-05-31 16:10:14.000000000 +0200 ++++ svgalib-1.9.25/lrmi-0.6m/lrmi.c 2008-05-31 16:10:14.000000000 +0200 +@@ -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 +diff -up svgalib-1.9.25/lrmi-0.9/lrmi.c~ svgalib-1.9.25/lrmi-0.9/lrmi.c +--- svgalib-1.9.25/lrmi-0.9/lrmi.c~ 2008-05-31 16:10:28.000000000 +0200 ++++ svgalib-1.9.25/lrmi-0.9/lrmi.c 2008-05-31 16:10:28.000000000 +0200 +@@ -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) + |