summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-12-30 18:06:12 +0000
committerMike Frysinger <vapier@gentoo.org>2007-12-30 18:06:12 +0000
commit5fcdcfd6324ee055b48d8f1ea350bae16f12be83 (patch)
treeeaa3d77af47b56438c4d94f16852492361683f21 /media-libs/svgalib
parentVersion bump. (diff)
downloadhistorical-5fcdcfd6324ee055b48d8f1ea350bae16f12be83.tar.gz
historical-5fcdcfd6324ee055b48d8f1ea350bae16f12be83.tar.bz2
historical-5fcdcfd6324ee055b48d8f1ea350bae16f12be83.zip
Fix building with linux-2.6.23 #195632.
Package-Manager: portage-2.1.4_rc11
Diffstat (limited to 'media-libs/svgalib')
-rw-r--r--media-libs/svgalib/ChangeLog6
-rw-r--r--media-libs/svgalib/Manifest24
-rw-r--r--media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch22
3 files changed, 39 insertions, 13 deletions
diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index 00de0e9624e1..4d4d6be7f818 100644
--- a/media-libs/svgalib/ChangeLog
+++ b/media-libs/svgalib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/svgalib
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.75 2007/02/12 05:09:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.76 2007/12/30 18:06:11 vapier Exp $
+
+ 30 Dec 2007; Mike Frysinger <vapier@gentoo.org>
+ files/svgalib-1.9.25-linux2.6.patch:
+ Fix building with linux-2.6.23 #195632.
12 Feb 2007; Mike Frysinger <vapier@gentoo.org> svgalib-1.9.24.ebuild,
svgalib-1.9.25.ebuild:
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index 33f76d9a7913..98445e1051c2 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -29,10 +29,10 @@ AUX svgalib-1.9.25-gentoo.patch 1298 RMD160 a3a19dda08ea60a7b410ee6dd2cffea667e3
MD5 b6162183ce7332f19e01ff9195d4d79b files/svgalib-1.9.25-gentoo.patch 1298
RMD160 a3a19dda08ea60a7b410ee6dd2cffea667e355d7 files/svgalib-1.9.25-gentoo.patch 1298
SHA256 eaea5e2cd0e808279070c067f2d88a64fce5a5904bc7cdf36678f45876e27fb5 files/svgalib-1.9.25-gentoo.patch 1298
-AUX svgalib-1.9.25-linux2.6.patch 3421 RMD160 b759e0b7e5bfa3a6491036a404305874b188a0ed SHA1 357453de37c4978e2eba9bdbfd0a1476e7e53cdd SHA256 fdb4373d418e42ba2ab3102cf4364c019350ad1152b51d2f965990e9433e3dac
-MD5 b96b10e69f74e0cf41f53f87123ccd42 files/svgalib-1.9.25-linux2.6.patch 3421
-RMD160 b759e0b7e5bfa3a6491036a404305874b188a0ed files/svgalib-1.9.25-linux2.6.patch 3421
-SHA256 fdb4373d418e42ba2ab3102cf4364c019350ad1152b51d2f965990e9433e3dac files/svgalib-1.9.25-linux2.6.patch 3421
+AUX svgalib-1.9.25-linux2.6.patch 4065 RMD160 b6dacf712d56af6ecbe607ea80d7a3efdb0d2bec SHA1 8b1d0f998d0724a0bdb579bbb23dfa35e93525d1 SHA256 037b7cc2d2c30fdf4114715ce0c0e012ec7e9428bba241400dbf2b33f9a61593
+MD5 0ad3a1d275074f8f683be8d6142f9169 files/svgalib-1.9.25-linux2.6.patch 4065
+RMD160 b6dacf712d56af6ecbe607ea80d7a3efdb0d2bec files/svgalib-1.9.25-linux2.6.patch 4065
+SHA256 037b7cc2d2c30fdf4114715ce0c0e012ec7e9428bba241400dbf2b33f9a61593 files/svgalib-1.9.25-linux2.6.patch 4065
AUX svgalib.devfs 219 RMD160 921df16f9e771fcdb75ab9e6f44e4840ff72fd4b SHA1 c587ce84dff7f0e8f222660c004256b3b867d00a SHA256 3aa888f06d84d3ad49b9714986e43cad845082a1b2f6e06baa4637967920414a
MD5 d137b721449f3fe88d6ec08a3cf6c51a files/svgalib.devfs 219
RMD160 921df16f9e771fcdb75ab9e6f44e4840ff72fd4b files/svgalib.devfs 219
@@ -55,10 +55,10 @@ EBUILD svgalib-1.9.25.ebuild 4106 RMD160 4d57a9e255f63394ad5bf35f748de2e24b07e80
MD5 f2a048c1bf199cc9246cdb65526360fc svgalib-1.9.25.ebuild 4106
RMD160 4d57a9e255f63394ad5bf35f748de2e24b07e80f svgalib-1.9.25.ebuild 4106
SHA256 8d841aea844fe554f22705d5d95cd0002d8999dde51502e1f35af015374be247 svgalib-1.9.25.ebuild 4106
-MISC ChangeLog 13186 RMD160 c4fec16ddd2082c363a5f19638375f4d35b78d9a SHA1 70b30e8494edb391eabee2a770ed8ab28ed4a5d3 SHA256 c733fc49cac7276f76f10f284c2d148560e43cfa02d492ad41a041ec56258f14
-MD5 132ae0534c51f9c5f02c7a55d88522d1 ChangeLog 13186
-RMD160 c4fec16ddd2082c363a5f19638375f4d35b78d9a ChangeLog 13186
-SHA256 c733fc49cac7276f76f10f284c2d148560e43cfa02d492ad41a041ec56258f14 ChangeLog 13186
+MISC ChangeLog 13318 RMD160 76c0cc362644a04beab68724f8e3aac76dcb1d92 SHA1 35c8f5bb06b50daf2800e29934a22ac131d34622 SHA256 0f8f79708356f61d2860ebd4de3ec8327ce59d6947a033e640bf55c8cf57d4d5
+MD5 953f030b97a7a1356c9847b04fb0fa67 ChangeLog 13318
+RMD160 76c0cc362644a04beab68724f8e3aac76dcb1d92 ChangeLog 13318
+SHA256 0f8f79708356f61d2860ebd4de3ec8327ce59d6947a033e640bf55c8cf57d4d5 ChangeLog 13318
MISC metadata.xml 303 RMD160 1bc9684eb1b1f3b3c360df61b39b143ce2090916 SHA1 c273b6ce5b51e9d5690e54ae84982d9c2cf617d2 SHA256 08bfae407186f5088cd2b118396e784d8eaf7ab82ecc162cf8a73ff9cabcf717
MD5 69845288d94413820ea3441dc9e60b24 metadata.xml 303
RMD160 1bc9684eb1b1f3b3c360df61b39b143ce2090916 metadata.xml 303
@@ -70,9 +70,9 @@ MD5 ce3612b32d5d810bc066f94884ad1651 files/digest-svgalib-1.9.25 244
RMD160 b58d83ff0bf0aece90a1a8fac86924e53ba1a704 files/digest-svgalib-1.9.25 244
SHA256 ddcc343b075e1ebcbceb0952eaa273fb40fd3a0bc00bb00b7d64e1c500a6cac4 files/digest-svgalib-1.9.25 244
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
-iD8DBQFFz/an8bi6rjpTunYRAvmOAJ4jW+mFHrbRUanPJzzs9fX3KrS3HwCfRTln
-VkKX7mf6UCqScpEtYPHmt/M=
-=ulRF
+iEYEARECAAYFAkd33hkACgkQj9hvisErhMK9UgCfTekRGnSL/4igZXhIgVQMz4jS
+xc8AoOlmDlafKTtrtV8z+3r05geVXJMn
+=mLHZ
-----END PGP SIGNATURE-----
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 01bcaf856ca4..96d54cbc7518 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
@@ -60,6 +60,28 @@
# define my_io_remap_page_range(vma, start, ofs, len, prot) \
io_remap_page_range(vma,start,ofs,len,prot)
# else
+@@ -70,6 +70,7 @@
+
+ /* These are also not present in 2.6 kernels ... */
+ #if (!defined _LINUX_DEVFS_FS_KERNEL_H) || (defined KERNEL_2_6)
++#include <linux/fs.h>
+ static inline int devfs_register_chrdev (unsigned int major, const char *name,
+ struct file_operations *fops)
+ {
+@@ -77,7 +78,12 @@
+ }
+ static inline int devfs_unregister_chrdev (unsigned int major,const char *name)
+ {
+- return unregister_chrdev (major, name);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
++ return unregister_chrdev (major, name);
++#else
++ unregister_chrdev (major, name);
++ return 0;
++#endif
+ }
+ #endif
+
--- svgalib/kernel/svgalib_helper/main.c
+++ svgalib/kernel/svgalib_helper/main.c
@@ -1,5 +1,3 @@