diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-08-16 14:36:09 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-08-16 14:36:09 +0000 |
| commit | 1b55ffcd0736ca42807c061e46a484d56f97211c (patch) | |
| tree | 9c7904765e7779d6718d1b509f5ddde07d03f3e9 /media-libs/svgalib | |
| parent | Version bump, bug #217542 (diff) | |
| download | historical-1b55ffcd0736ca42807c061e46a484d56f97211c.tar.gz historical-1b55ffcd0736ca42807c061e46a484d56f97211c.tar.bz2 historical-1b55ffcd0736ca42807c061e46a484d56f97211c.zip | |
Fix from Brett Mravec for building with linux-2.6.26 #232117 by Marco Leogrande.
Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26.1 x86_64
Diffstat (limited to 'media-libs/svgalib')
| -rw-r--r-- | media-libs/svgalib/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/svgalib/Manifest | 12 | ||||
| -rw-r--r-- | media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch | 30 |
3 files changed, 42 insertions, 7 deletions
diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog index f7aea65b1488..48d3420357b9 100644 --- a/media-libs/svgalib/ChangeLog +++ b/media-libs/svgalib/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/svgalib # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.78 2008/04/10 04:43:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.79 2008/08/16 14:36:08 vapier Exp $ + + 16 Aug 2008; Mike Frysinger <vapier@gentoo.org> + files/svgalib-1.9.25-linux2.6.patch: + Fix from Brett Mravec for building with linux-2.6.26 #232117 by Marco + Leogrande. 10 Apr 2008; Mike Frysinger <vapier@gentoo.org> svgalib-1.9.25.ebuild: Drop MODULESD_SVGALIB_HELPER_ADDITIONS #214274. diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest index 708fde9c85cb..83971abee070 100644 --- a/media-libs/svgalib/Manifest +++ b/media-libs/svgalib/Manifest @@ -3,16 +3,16 @@ Hash: SHA1 AUX svgalib-1.9.19-pic.patch 487 RMD160 5bd8935162cdfa55292e4fabfbec1515ad80a507 SHA1 326f4132d7f625d2fd5ae04795da5f2e6f1bc36f SHA256 cbce8a1067b6618300de8b1934dd72a28130eba6953938434333dab3b29c8358 AUX svgalib-1.9.25-build.patch 1834 RMD160 725fa79a06dabb2b45cc8f325ab13cd3f982d931 SHA1 bc1cb83188c3ceb08c7cc0fda780fa5391c62208 SHA256 8e27610d4050f55301a611c9abb438bd4aa757d8fecc98b43cdc352dbf747e54 -AUX svgalib-1.9.25-linux2.6.patch 5409 RMD160 1d41705bd28aefed33034ca3c8b845745c9bab3e SHA1 fa7ba65b1e99f3d8be70224c4e3c14f37e012a44 SHA256 8367be9a2893c6f7fd8176a495ad7d448c607f42d000c4e05d4af23cee0131ee +AUX svgalib-1.9.25-linux2.6.patch 6997 RMD160 54df7b5289e4b362e7aff74757e4e64d5a1eb451 SHA1 c20fb4f4528e62b33047add768152f5bf82b6a43 SHA256 81bcc56b26920de60003b1ff4da59824181d3b960e795412f0a3ec65b69e4ea9 AUX svgalib.udev.rules.d 55 RMD160 05987efb133e53358a8f1aeb69895b8f44fb9f80 SHA1 a0851d5de96c9e3933515fcbdb0fb6de9a07339e SHA256 ae60596a1b5fdc0e6cc9d625f363d869f8674e4da631cc341e663b22870f7d81 DIST svgalib-1.9.25.tar.gz 987084 RMD160 e987f65ddb5610c575183e4a2058423eab3ce1e4 SHA1 187b2156dde0e8f397b130d14cc35237386273d6 SHA256 2ad5da713a6bd69622c483de4e4f448ed2b82f7b954db43dc477d5b6b12d8602 EBUILD svgalib-1.9.25.ebuild 3548 RMD160 e0b4b659fe653cf5541c7d2b63d9505f0171114e SHA1 f0e11849baabf1ccf3149e402dd2fe224d52eae4 SHA256 7f2bf8e1482db90b11459686248758d8247e89f787892c790407ead0a426f684 -MISC ChangeLog 13588 RMD160 52d5d8873459d4107a436d6295e63315cdbdb4a8 SHA1 f1f849e1c58201d202b5dc636e22ab4d47289188 SHA256 63de066e2826f7766523c60757795b08b42f5367de7b53d40387758aa8ad4689 +MISC ChangeLog 13763 RMD160 969f90b349e881b196afab0deee3820b0a175b33 SHA1 54c3d78cf3a5dd881dbd865875d724264e759836 SHA256 5a327c138954c097f177d9d61f31ed7d1e4350f78d0d06ab83aeeed009bd8c58 MISC metadata.xml 160 RMD160 fc502550199c2b70e26136b617c98b902a206f3a SHA1 89a4698e7e20a669a20ae8a7cadac632e27b9002 SHA256 1fadabae66954be12facca1203d0f0f486a62a8077581dafd75dad357a05b878 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.7 (GNU/Linux) +Version: GnuPG v2.0.9 (GNU/Linux) -iD8DBQFIQNmjj9hvisErhMIRAk/aAJ9OP8Hdz/XmeyAzvaDijof60Uq+8wCgrF2L -qhAkuwk5P/u5cGmwFDmAmpQ= -=s8cu +iEYEARECAAYFAkim5d0ACgkQ67wieSYcaxebBQCguvQ9tVKfFSnm9FjSvZlyDekt +3tYAnjMyE0AxZgodSoJGq6ktq2QafJRj +=m/rF -----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 ae3617da0f7c..8475d3ae0f89 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 @@ -82,6 +82,36 @@ } #endif +@@ -105,7 +109,8 @@ + class_device_create(svgalib_helper_class, \ + MKDEV(SVGALIB_HELPER_MAJOR, _minor), \ + &sh_pci_devs[_minor]->dev->dev, _name); +-#else /* 2.6.15 changed class_device_create */ ++/* 2.6.15 changed class_device_create */ ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) + # define SLH_SYSFS_ADD_CONTROL \ + class_device_create(svgalib_helper_class, NULL, \ + MKDEV(SVGALIB_HELPER_MAJOR, 0), \ +@@ -115,7 +120,18 @@ + class_device_create(svgalib_helper_class, NULL, \ + MKDEV(SVGALIB_HELPER_MAJOR, _minor), \ + &sh_pci_devs[_minor]->dev->dev, _name); +-#endif /* 2.6.15 */ ++/* 2.6.26 changed class_device_create to device_create */ ++#else ++# define SLH_SYSFS_ADD_CONTROL \ ++ device_create(svgalib_helper_class, NULL, \ ++ MKDEV(SVGALIB_HELPER_MAJOR, 0), \ ++ "svga"); ++ ++# define SLH_SYSFS_ADD_DEVICE(_name, _minor) \ ++ device_create(svgalib_helper_class, &sh_pci_devs[_minor]->dev->dev, \ ++ MKDEV(SVGALIB_HELPER_MAJOR, _minor), \ ++ _name); ++#endif + + # define SLH_SYSFS_REMOVE_DEVICE(i) \ + class_destroy(svgalib_helper_class); @@ -167,3 +167,7 @@ #ifndef PCI_VENDOR_ID_RENDITION #define PCI_VENDOR_ID_RENDITION 0x1163 |