summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2004-02-23 21:51:12 +0000
committerMartin Schlemmer <azarah@gentoo.org>2004-02-23 21:51:12 +0000
commit1c376f984d01126f3b4b20c9002b6b8d39b4e6f6 (patch)
tree3fdb33f70eceb0f73a0c13bb5e2b4673b0e8a2c6 /media-libs/svgalib
parentFix broken reverse resolving for IPv6 addresses, bug #42492. Research done by (diff)
downloadhistorical-1c376f984d01126f3b4b20c9002b6b8d39b4e6f6.tar.gz
historical-1c376f984d01126f3b4b20c9002b6b8d39b4e6f6.tar.bz2
historical-1c376f984d01126f3b4b20c9002b6b8d39b4e6f6.zip
Fix bug #42644 (2.4.23 also uses irqreturn_t, so do not define it then).
Diffstat (limited to 'media-libs/svgalib')
-rw-r--r--media-libs/svgalib/ChangeLog6
-rw-r--r--media-libs/svgalib/Manifest26
-rw-r--r--media-libs/svgalib/files/svgalib-1.9.18-linux2.6.patch23
3 files changed, 41 insertions, 14 deletions
diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index 0c7ed925c8a2..912d373fa8e4 100644
--- a/media-libs/svgalib/ChangeLog
+++ b/media-libs/svgalib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/svgalib
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.29 2004/02/23 08:46:59 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.30 2004/02/23 21:51:12 azarah Exp $
+
+ 23 Feb 2004; Martin Schlemmer <azarah@gentoo.org>
+ files/svgalib-1.9.18-linux2.6.patch:
+ Fix bug #42644 (2.4.23 also uses irqreturn_t, so do not define it then).
23 Feb 2004; Luca Barbato <lu_zero@gentoo.org> svgalib-1.9.18.ebuild:
Workaround to let the kernel module compile on 2.6
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index 65d59272c09d..1450ca9a7fce 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -1,17 +1,17 @@
-MD5 e6c5c44316cad8dd39ebd0d05afc09a9 svgalib-1.9.17-r3.ebuild 3179
-MD5 86316b21b51460d39f6861a3b5a64967 ChangeLog 4975
-MD5 b7183e0b3d7a572250d689cc58426537 svgalib-1.9.18.ebuild 3364
-MD5 1402731fa550025c06ed2dc36fd11704 svgalib-1.4.3-r4.ebuild 2565
-MD5 ae00198d9110c4de5bc6dd4d6424ab26 files/digest-svgalib-1.4.3-r4 132
-MD5 c2977469108170b5851b7706829ad646 files/svgalib-1.9.17-gentoo.patch 11536
-MD5 0209cd9462a2c845466526a2a4017104 files/svgalib-1.9.18-gentoo.patch 3622
+MD5 a9aa78998b682bc30b2ba7e3ef14bea1 ChangeLog 5142
+MD5 b3845e961f29a0e3754831e90ff5e798 svgalib-1.4.3-r4.ebuild 2566
+MD5 7aae39539c1f87ab37a6d216f9f9be87 svgalib-1.9.17-r3.ebuild 3180
+MD5 9c9bec5553c4cea54d66704b3ef472a8 svgalib-1.9.18.ebuild 3365
+MD5 08beaed909b549304425870873b67c19 files/svgalib-1.9.18-gcc33.patch 426
+MD5 80817f5a0e398576901c43b38df8a2a8 files/svgalib-1.9.18-linux2.6.patch 8199
MD5 19b74fedfd6953bd3537a803abecc4d3 files/svgalib-1.4.3-gentoo.diff 10364
+MD5 0d7d045fc55ccf3f4a26bc54286a3b8a files/digest-svgalib-1.9.18 66
MD5 0ded96494b4c3f4f744474ff89033c18 files/svgalib-1.9.17-linux2.6.patch 38611
-MD5 c4b69ccaea188c0ee4b32111b769ae6d files/svgalib-1.4.3-userpriv.patch 1267
MD5 3538c97a42a76d7c1b210319171d3daa files/svgalib-1.4.3-linux2.6.patch 195
-MD5 08beaed909b549304425870873b67c19 files/svgalib-1.9.18-gcc33.patch 426
-MD5 72bba0fb5841145da689fda817c7e2d9 files/svgalib-1.4.3-gcc3.patch 303
-MD5 0d7d045fc55ccf3f4a26bc54286a3b8a files/digest-svgalib-1.9.18 66
-MD5 9e8f47b421194ae42b3ff7e3a8ba8aed files/svgalib-1.9.17-modversions_h.patch 2414
-MD5 4d9ab623ff913d0a7417bd908feefa9b files/svgalib-1.9.18-linux2.6.patch 7691
+MD5 0209cd9462a2c845466526a2a4017104 files/svgalib-1.9.18-gentoo.patch 3622
MD5 e4ead3e3192f5a945ff177331122d7ae files/digest-svgalib-1.9.17-r3 66
+MD5 c2977469108170b5851b7706829ad646 files/svgalib-1.9.17-gentoo.patch 11536
+MD5 c4b69ccaea188c0ee4b32111b769ae6d files/svgalib-1.4.3-userpriv.patch 1267
+MD5 9e8f47b421194ae42b3ff7e3a8ba8aed files/svgalib-1.9.17-modversions_h.patch 2414
+MD5 ae00198d9110c4de5bc6dd4d6424ab26 files/digest-svgalib-1.4.3-r4 132
+MD5 72bba0fb5841145da689fda817c7e2d9 files/svgalib-1.4.3-gcc3.patch 303
diff --git a/media-libs/svgalib/files/svgalib-1.9.18-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.18-linux2.6.patch
index 66bd65354ba2..c1b489473499 100644
--- a/media-libs/svgalib/files/svgalib-1.9.18-linux2.6.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.18-linux2.6.patch
@@ -44,6 +44,29 @@ diff -urpN svgalib-1.9.18/kernel/svgalib_helper/Makefile svgalib-1.9.18.new/kern
diff -urpN svgalib-1.9.18/kernel/svgalib_helper/kernel26compat.h svgalib-1.9.18.new/kernel/svgalib_helper/kernel26compat.h
--- svgalib-1.9.18/kernel/svgalib_helper/kernel26compat.h 2003-10-04 15:42:01.000000000 +0200
+++ svgalib-1.9.18.new/kernel/svgalib_helper/kernel26compat.h 2004-02-23 00:41:03.176196576 +0200
+@@ -1,5 +1,8 @@
+ #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)
+
+@@ -9,9 +12,11 @@
+
+ # define my_io_remap_page_range(vma, start, ofs, len, prot) io_remap_page_range(start,ofs,len,prot)
+
++# if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23)
+ typedef void irqreturn_t;
+-# define IRQ_NONE
+-# define IRQ_HANDLED
++# define IRQ_NONE
++# define IRQ_HANDLED
++# endif
+
+ #else /* Kernel 2.6 */
+
@@ -43,9 +43,36 @@ static inline int devfs_unregister_chrde
}
#endif