summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2004-02-18 01:39:59 +0000
committerTim Yamin <plasmaroo@gentoo.org>2004-02-18 01:39:59 +0000
commitac9aeda9c6f882ae05dc368a4f93c1c2b8709731 (patch)
tree359595c275235894d86c6cbeabdf7751fac159b6 /media-libs/svgalib
parentversion bump, changed SRC_URI and PV munging (#40276) (Manifest recommit) (diff)
downloadgentoo-2-ac9aeda9c6f882ae05dc368a4f93c1c2b8709731.tar.gz
gentoo-2-ac9aeda9c6f882ae05dc368a4f93c1c2b8709731.tar.bz2
gentoo-2-ac9aeda9c6f882ae05dc368a4f93c1c2b8709731.zip
Updated the 2.6 compatibility patch; this should solve any outstanding issues on 2.4 kernels and closes bug #41553.
Diffstat (limited to 'media-libs/svgalib')
-rw-r--r--media-libs/svgalib/files/svgalib-1.9.17-linux2.6.patch11
1 files changed, 5 insertions, 6 deletions
diff --git a/media-libs/svgalib/files/svgalib-1.9.17-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.17-linux2.6.patch
index 403ceea4de68..c9bbf837bf86 100644
--- a/media-libs/svgalib/files/svgalib-1.9.17-linux2.6.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.17-linux2.6.patch
@@ -121,13 +121,16 @@ diff -urpwN svgalib-1.9.17/kernel/svgalib_helper/kernel25compat.h svgalib-1.9.17
diff -urpwN svgalib-1.9.17/kernel/svgalib_helper/kernel26compat.h svgalib-1.9.17.kernel2.6/kernel/svgalib_helper/kernel26compat.h
--- svgalib-1.9.17/kernel/svgalib_helper/kernel26compat.h 1970-01-01 02:00:00.000000000 +0200
+++ svgalib-1.9.17.kernel2.6/kernel/svgalib_helper/kernel26compat.h 2003-08-03 14:33:28.000000000 +0200
-@@ -0,0 +1,50 @@
+@@ -0,0 +1,49 @@
+#ifndef minor
+#define minor(x) MINOR(x)
+#endif
+
+#ifndef KERNEL_VERSION
+# include <linux/version.h>
++#else
++# undef KERNEL_VERSION
++# include <linux/version.h>
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
@@ -137,12 +140,8 @@ diff -urpwN svgalib-1.9.17/kernel/svgalib_helper/kernel26compat.h svgalib-1.9.17
+# endif
+
+#define my_remap_page_range(vma, start, ofs, len, prot) remap_page_range(start,ofs,len,prot)
-+# ifdef __KERNEL__
-+ typedef void irqreturn_t;
-+# else
-+# if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23)
++# if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23)
+ typedef void irqreturn_t;
-+# endif
+# endif
+#else
+