From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 9 Nov 2005 06:01:59 +0000 (+0000)
Subject: fix support for new io_remap_pfn_range in linux-2.6.14+ properly with the help of... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8fff3be0887dfbbbc4a3095697a4d03502775da9;p=gentoo.git

fix support for new io_remap_pfn_range in linux-2.6.14+ properly with the help of Michael Cramer #111059
Package-Manager: portage-2.0.53_rc7
---

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 51d16b6550a0..fec5fb69ac3b 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,21 +1,23 @@
-MD5 a00f891e410be41127a27df7bc736b98 ChangeLog 12231
-MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
-MD5 dd5dad8f02465203f9d2aa46d3aee51b netpbm-10.26.17.ebuild 2799
-MD5 4ff1d95265184a7c760d4748a4cb1beb netpbm-10.28.ebuild 2460
-MD5 4b1a6bc24bd0b85afb5756e7c1e218e8 netpbm-10.29-r1.ebuild 2937
-MD5 44a56191027bdda13f3bd51f336a971a netpbm-10.29.ebuild 2423
-MD5 616e416b2017c1a2f0d85b78fd62fb0b netpbm-10.30-r1.ebuild 2957
+MD5 c541a63dd9eb135d3a10a7d1dbf3aecc ChangeLog 12355
 MD5 0a45793fc070f81d4d6f6806706a8a57 files/digest-netpbm-10.26.17 139
+MD5 08ce9acb79a75a5d63c62122a4d4c8ae files/digest-netpbm-10.26.18 139
 MD5 c6c3222383568021fbbdc34114b6f279 files/digest-netpbm-10.28 62
 MD5 8c4a20ca06c83687436b8cb75917d5f1 files/digest-netpbm-10.29 62
 MD5 e03ba0a74da10891ecaa41fb86191275 files/digest-netpbm-10.29-r1 136
+MD5 af57721491b0a7cd11ccba542d8e20c6 files/digest-netpbm-10.30-r1 136
 MD5 3e364cbe32c6c5bd2f329b8dbcf604d5 files/netpbm-10.29-anytopnm.patch 1562
 MD5 e3ef1ff99bf9335b47ea62db7416b625 files/netpbm-10.29-build.patch 2283
 MD5 103e8f6f6474dcc4b17ee049111bc3f6 files/netpbm-10.29-infinity.patch 5840
 MD5 d0d44fe5de727324db35e8110dc81f63 files/netpbm-10.29-pnmtopng-alpha-check.patch 603
-MD5 c63d12c2c7deaafa4fcddb6035b34169 files/netpbm-10.30-build.patch 2276
-MD5 ef9c07e7cbf6b830f8dd61e59fb0a34b files/netpbm-dSAFER.patch 818
-MD5 af57721491b0a7cd11ccba542d8e20c6 files/digest-netpbm-10.30-r1 136
 MD5 d54a93389a63382e459a5aa153484b46 files/netpbm-10.30-anytopnm.patch 1434
+MD5 c63d12c2c7deaafa4fcddb6035b34169 files/netpbm-10.30-build.patch 2276
 MD5 2dd6e3d7a2601a35259474344f7feb20 files/netpbm-10.30-pngtopnm.patch 417
 MD5 87a9972b59b90f26620b09ad990a8546 files/netpbm-10.30-tifftopnm.patch 373
+MD5 ef9c07e7cbf6b830f8dd61e59fb0a34b files/netpbm-dSAFER.patch 818
+MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
+MD5 dd5dad8f02465203f9d2aa46d3aee51b netpbm-10.26.17.ebuild 2799
+MD5 fdba89dc66d463a4fb3d50d0c046a230 netpbm-10.26.18.ebuild 2799
+MD5 4ff1d95265184a7c760d4748a4cb1beb netpbm-10.28.ebuild 2460
+MD5 4b1a6bc24bd0b85afb5756e7c1e218e8 netpbm-10.29-r1.ebuild 2937
+MD5 44a56191027bdda13f3bd51f336a971a netpbm-10.29.ebuild 2423
+MD5 616e416b2017c1a2f0d85b78fd62fb0b netpbm-10.30-r1.ebuild 2957
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index 06c4afdc9922..60c96833766e 100644
--- 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 3c32f17eaa514a736d422ee0f26d5e5a files/svgalib-1.9.21-linux2.6.patch 1703
+MD5 08f20bf4736bd6a4fa83eafcca8f8776 files/svgalib-1.9.21-linux2.6.patch 1799
 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)
 
-iD8DBQFDb+QRgIKl8Uu19MoRAmqbAJ9w0G+XS8eKSeOMOJZxYbKaSuVUqQCfTsgM
-VgLKgOfyBECmGxTamrimDI8=
-=+0X7
+iD8DBQFDcZEDgIKl8Uu19MoRAoiBAJ4xE3wRvlI8/CZIpUy+AmMogWI1PQCeMhZi
+V8Mmk564pJaOczzAl8WfK3U=
+=AXra
 -----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 c0fc1e2bc526..48d769116c4f 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
@@ -35,7 +35,7 @@
  	rm -f /dev/svgalib_helper* /dev/svga_helper* /dev/svga /dev/svga?
 --- svgalib/kernel/svgalib_helper/kernel26compat.h
 +++ svgalib/kernel/svgalib_helper/kernel26compat.h
-@@ -10,9 +10,12 @@
+@@ -10,7 +10,7 @@
  # define PCI_GET_CLASS pci_find_class
  # define PCI_GET_DEVICE pci_find_device
  
@@ -43,9 +43,18 @@
 +# 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) \
+@@ -50,8 +50,13 @@
+ # define DEVFS_MK_SYMLINK(a,b)
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+ # define my_io_remap_page_range(vma, start, ofs, len, prot) \
+ 		io_remap_page_range(vma,start,ofs,len,prot)
++#else
++# define my_io_remap_page_range(vma, start, ofs, len, prot) \
++		io_remap_pfn_range(vma,start,ofs>>PAGE_SHIFT,len,prot)
++#endif
+ 
+ # define pci_present() 1
+