diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-01-04 01:49:46 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-01-04 01:49:46 +0000 |
| commit | 81212784367c31ffe2a4ea47d0021f0dbe23afcc (patch) | |
| tree | fced83c129236426af8a0d91b18c2e871c3fb6ee /media-libs/svgalib | |
| parent | fixed duplication in code in mozcoreconf (diff) | |
| download | historical-81212784367c31ffe2a4ea47d0021f0dbe23afcc.tar.gz historical-81212784367c31ffe2a4ea47d0021f0dbe23afcc.tar.bz2 historical-81212784367c31ffe2a4ea47d0021f0dbe23afcc.zip | |
Fix by Aquila for building with linux-2.6.15 #115316 by Martin Mokrejs.
Package-Manager: portage-2.1_pre3-r1
Diffstat (limited to 'media-libs/svgalib')
| -rw-r--r-- | media-libs/svgalib/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/svgalib/Manifest | 10 | ||||
| -rw-r--r-- | media-libs/svgalib/files/svgalib-1.9.21-linux2.6.patch | 43 |
3 files changed, 54 insertions, 7 deletions
diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog index 02133e4bba1f..ab0983ce4fa7 100644 --- a/media-libs/svgalib/ChangeLog +++ b/media-libs/svgalib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/svgalib -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.63 2005/11/01 03:41:32 vapier Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.64 2006/01/04 01:49:46 vapier Exp $ + + 04 Jan 2006; Mike Frysinger <vapier@gentoo.org> + files/svgalib-1.9.21-linux2.6.patch: + Fix by Aquila for building with linux-2.6.15 #115316 by Martin Mokrejs. *svgalib-1.9.23 (01 Nov 2005) diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest index 5e72e1ca6a33..0135007a62ff 100644 --- a/media-libs/svgalib/Manifest +++ b/media-libs/svgalib/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 02e528c5c66ece4b73554c290dc6f856 ChangeLog 11331 +MD5 e3d8fdce72cddb51401ebd4451b36896 ChangeLog 11495 MD5 71fa9630e100dc3a6ce8672b4b4b2cff files/digest-svgalib-1.9.19-r3 66 MD5 7c5fef40667dc2dd4c54518fbafa831b files/digest-svgalib-1.9.21-r1 66 MD5 8121635a6e2d2be1c4b2067bc9d659f9 files/digest-svgalib-1.9.23 66 @@ -14,7 +14,7 @@ MD5 4a5014126880edffad4f4f209e3e7e68 files/svgalib-1.9.19-linux2.6.patch 7776 MD5 1c4684bfc1f4a5ff9daf7cbf5da699b1 files/svgalib-1.9.19-pci-get-class.patch 458 MD5 91fa4baff3dfb211bcb57a068ed7495f files/svgalib-1.9.19-pic.patch 422 MD5 8305fd946083dbe190a4fc42512e0e13 files/svgalib-1.9.21-gentoo.patch 3122 -MD5 08f20bf4736bd6a4fa83eafcca8f8776 files/svgalib-1.9.21-linux2.6.patch 1799 +MD5 cdbae1a30d329dd53d6818049d64373f files/svgalib-1.9.21-linux2.6.patch 3475 MD5 690144017f69486a911d88c0932a7d45 files/svgalib-1.9.23-gentoo.patch 2994 MD5 d137b721449f3fe88d6ec08a3cf6c51a files/svgalib.devfs 219 MD5 80fafe8076ab52d6f02f90b7f9580ddd files/svgalib.udev.perms.d 22 @@ -26,7 +26,7 @@ MD5 2d42280d70d9833840db725d273fb8bd svgalib-1.9.23.ebuild 4361 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDnj1kgIKl8Uu19MoRAkhYAJ95WbfuB1yDQDGz+Ftr2vdGZSn6pwCfWjS5 -drs56S7hEXxg6ym3if0ooj0= -=F2yd +iD8DBQFDuyn02+ySkm8kpY0RApEzAJ41h1FQUwF0iQf8IwOFyqOaoTPQNQCeKH34 +oMseMhK9MAvU9y1e0RM42x4= +=eQ7+ -----END PGP SIGNATURE----- diff --git a/media-libs/svgalib/files/svgalib-1.9.21-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.21-linux2.6.patch index 48d769116c4f..d1a34a028e74 100644 --- a/media-libs/svgalib/files/svgalib-1.9.21-linux2.6.patch +++ b/media-libs/svgalib/files/svgalib-1.9.21-linux2.6.patch @@ -58,3 +58,46 @@ # define pci_present() 1 +@@ -84,6 +84,21 @@ + # define SLH_SYSFS_REGISTER \ + svgalib_helper_class = class_create(THIS_MODULE, "svgalib_helper"); + ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) ++ ++# define SLH_SYSFS_ADD_CONTROL \ ++ class_device_create(svgalib_helper_class, NULL, \ ++ MKDEV(SVGALIB_HELPER_MAJOR, 0), \ ++ NULL, "svga"); ++ ++# define SLH_SYSFS_ADD_DEVICE(_name, _minor) \ ++ class_device_create(svgalib_helper_class, NULL, \ ++ MKDEV(SVGALIB_HELPER_MAJOR, _minor), \ ++ &sh_pci_devs[_minor]->dev->dev, _name); ++#else ++ ++ + # define SLH_SYSFS_ADD_CONTROL \ + class_device_create(svgalib_helper_class, \ + MKDEV(SVGALIB_HELPER_MAJOR, 0), \ +@@ -93,6 +108,8 @@ + class_device_create(svgalib_helper_class, \ + MKDEV(SVGALIB_HELPER_MAJOR, _minor), \ + &sh_pci_devs[_minor]->dev->dev, _name); ++#endif ++ + + # define SLH_SYSFS_REMOVE_DEVICE(i) \ + class_destroy(svgalib_helper_class); +@@ -148,6 +148,11 @@ + # define SLH_SYSFS_UNREGISTER + #endif + ++/* gregkh was so kind as to remove a ton of PCI defines in linux-2.6.15 */ ++#if !defined(PCI_VENDOR_ID_RENDITION) ++# define PCI_VENDOR_ID_RENDITION 0x1163 ++#endif ++ + #if (defined MINOR) + # define my_minor(x) MINOR(x) + #else |