add support for linux-2.6.14+ with a fix by Michael Cramer #111059

Package-Manager: portage-2.0.53_rc7

diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index 0f89156ebc4d8d21da9f5a70ffb2f236d9cd94f0..06c4afdc9922d62418a81887cfd8657f8203a158 100644 (file)
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -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 669918046939615fbe96031aa10be6d2 files/svgalib-1.9.21-linux2.6.patch 1550
+MD5 3c32f17eaa514a736d422ee0f26d5e5a files/svgalib-1.9.21-linux2.6.patch 1703
 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)
 
-iD8DBQFDZuQMgIKl8Uu19MoRAoEFAJ4syHW6i/NmVCTmhavVNSfZPAVtvQCcCUdQ
-Dqnc+hOLLgEMkfq7gp2X6zs=
-=E/9L
+iD8DBQFDb+QRgIKl8Uu19MoRAmqbAJ9w0G+XS8eKSeOMOJZxYbKaSuVUqQCfTsgM
+VgLKgOfyBECmGxTamrimDI8=
+=+0X7
 -----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 ba3e84abb83f25354861f075b72abeb440b33bc7..c0fc1e2bc526031bc928d23dfc162f801de6b619 100644 (file)
--- a/media-libs/svgalib/files/svgalib-1.9.21-linux2.6.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.21-linux2.6.patch
@@ -1,6 +1,8 @@
-diff -urpwN svgalib-1.9.18/kernel/svgalib_helper/Makefile.alt svgalib-1.9.18.kernel2.6/kernel/svgalib_helper/Makefile.alt
---- svgalib-1.9.18/kernel/svgalib_helper/Makefile.alt   2002-10-28 18:25:47.000000000 +0200
-+++ svgalib-1.9.18.kernel2.6/kernel/svgalib_helper/Makefile.alt 2003-08-03 14:34:40.000000000 +0200
+ - touch up the Makefile to let the ebuild handle the module details
+ - fix support with io remap stuff in newer kernels
+
+--- svgalib/kernel/svgalib_helper/Makefile.alt
++++ svgalib/kernel/svgalib_helper/Makefile.alt
 @@ -37,7 +37,7 @@
  CFLAGS += -DSVGALIB_HELPER_MAJOR=$(SVGALIB_HELPER_MAJOR)
  
@@ -31,14 +33,19 @@ diff -urpwN svgalib-1.9.18/kernel/svgalib_helper/Makefile.alt svgalib-1.9.18.ker
  
  device:
        rm -f /dev/svgalib_helper* /dev/svga_helper* /dev/svga /dev/svga?
---- svgalib-1.9.19/kernel/svgalib_helper/kernel26compat.h.orig 2004-07-20 19:05:13.491390800 -0400
-+++ svgalib-1.9.19/kernel/svgalib_helper/kernel26compat.h      2004-07-20 19:05:29.217999992 -0400
-@@ -7,7 +7,7 @@
- #  undef KERNEL_2_6
- # endif
+--- svgalib/kernel/svgalib_helper/kernel26compat.h
++++ svgalib/kernel/svgalib_helper/kernel26compat.h
+@@ -10,9 +10,12 @@
+ # define PCI_GET_CLASS pci_find_class
+ # define PCI_GET_DEVICE pci_find_device
  
 -# if defined (PG_chainlock)
 +# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,3)
  #  define my_io_remap_page_range(vma, start, ofs, len, prot) \
                io_remap_page_range(vma,start,ofs,len,prot)
++# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)
++#  define my_io_remap_page_range(vma, start, ofs, len, prot) \
++              io_remap_pfn_range(vma,start,ofs,len,prot)
  # else
+ #  ifdef __alpha__ /* Is alpha really the issue here ??? */
+ #   define my_io_remap_page_range(vma, start, ofs, len, prot) \