rpms/svgalib/devel svgalib-1.9.25-kernel-2.6.26.patch, NONE, 1.1 svgalib.spec, 1.11, 1.12

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/svgalib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21024

Modified Files:
	svgalib.spec 
Added Files:
	svgalib-1.9.25-kernel-2.6.26.patch 
Log Message:
* Sat May 31 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.9.25-5
- Fix building with 2.6.26 kernel headers


svgalib-1.9.25-kernel-2.6.26.patch:

--- NEW FILE svgalib-1.9.25-kernel-2.6.26.patch ---
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)


Index: svgalib.spec
===================================================================
RCS file: /cvs/extras/rpms/svgalib/devel/svgalib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- svgalib.spec	19 Feb 2008 09:44:13 -0000	1.11
+++ svgalib.spec	31 May 2008 14:01:36 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		svgalib
 Version:	1.9.25
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Low-level fullscreen SVGA graphics library
 Group:		System Environment/Libraries
 License:	Public Domain
@@ -11,6 +11,7 @@
 Patch1:		svgalib-1.4.3-fhs.patch
 Patch2:		svgalib-1.9.21-demos.patch
 Patch3:		svgalib-1.9.21-cfg.patch
+Patch4:		svgalib-1.9.25-kernel-2.6.26.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Exclusivearch:	%{ix86} x86_64
 
@@ -40,6 +41,7 @@
 %patch1 -p1 -b .fhs
 %patch2 -p1
 %patch3 -p1 -b .defaultcfg
+%patch4 -p1
 
 #the testlinear demo needs svgalib's internal libvga header, so copy it to the
 #demo dir
@@ -130,6 +132,9 @@
 
 
 %changelog
+* Sat May 31 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.9.25-5
+- Fix building with 2.6.26 kernel headers
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.9.25-4
 - Autorebuild for GCC 4.3