Fix compilation on 2.6.27

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27.1 i686

3 files changed, 43 insertions, 36 deletions

diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index 2aefff09a649..fba4da13f4f8 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.82 2008/10/20 00:00:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.83 2008/10/28 20:09:27 pauldv Exp $
+
+  28 Oct 2008; Paul de Vrieze <pauldv@gentoo.org>
+  files/svgalib-1.9.25-linux2.6.patch:
+  Make svgalib work on 2.6.27. Fixes bug #242342, and thanks to Ed Catmur
+  <ed@catmur.co.uk> in there for providing a patch.
 
   20 Oct 2008; Mike Frysinger <vapier@gentoo.org>
   files/svgalib-1.9.25-build.patch:
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index 92e2a8bfe48b..06c123eb22dc 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX svgalib-1.9.19-pic.patch 487 RMD160 5bd8935162cdfa55292e4fabfbec1515ad80a507 SHA1 326f4132d7f625d2fd5ae04795da5f2e6f1bc36f SHA256 cbce8a1067b6618300de8b1934dd72a28130eba6953938434333dab3b29c8358
 AUX svgalib-1.9.25-build.patch 2163 RMD160 70255c504d944e173a98604ffb96a8f1839301df SHA1 9f103dd569efc1e4eb7fd2937cbf6edb5f7c9f34 SHA256 f2d5033376e02f4424a7d6252dd442eb2f6b6a3834244d8830248b7c651da361
-AUX svgalib-1.9.25-linux2.6.patch 8842 RMD160 3e4ed6f1acbad3132363b8986306834e22b6d36d SHA1 e655b9324bfa0db65c11a1d487e6b115fa9afd0d SHA256 d37afa43f45ef8860eb82bbc2d55b6dbb697954ac35d5bed1e48481c0d28b3d0
+AUX svgalib-1.9.25-linux2.6.patch 9547 RMD160 64a9b66e455da08784f464cda70e250684873441 SHA1 eb5ffc6af7c68e51897ac01c37f538b23b6ac9d0 SHA256 553b4c81a87a9c584377cae2795849b5237ca07e6bf0bef5ffc00ebb0b9a1160
 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 14223 RMD160 7e4652267dc5b9b20421986ba1dbf8ec1269d340 SHA1 1cd053456cefd592b7d5a778881f6495713de4b3 SHA256 cad3acfd7e7df77598f94c8f3920ba19f89a09632a56b69e628bc3dd7787f894
+MISC ChangeLog 14439 RMD160 a2cd85c8e99e6de5e9ee1293a9c19b45c101fa4e SHA1 37ccd4d64ac76eec47a9c819c8859df6cfd2c2c0 SHA256 2bc6c5e1eb55f527db2dbad1213357339ebde9dee71e7e63f0789b8d51bacba6
 MISC metadata.xml 251 RMD160 3c7421c813b99188eb8e1134d299d9b36f1215fc SHA1 7dc24a9a27c245d20788b2b75eaa3cde785135c2 SHA256 b3abc685df5ef7c703663125285255c5153993d4113db7ddfc64b0bc82df461e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkj7yh8ACgkQ67wieSYcaxe3DwCgyv1ffaPVZIPXmvAKLh1Rrwd3
-3ioAoLMFwHabfd2X2/kdkxIL//2R5sqv
-=nX7N
------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 f3b61e1e8e1d..20ab1fe1ed16 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
@@ -1,11 +1,11 @@
-	- get rid of warning when linux/device.h doesnt exist
-	- touch up the Makefile to let the ebuild handle the module details
-	- fix support with io remap stuff in newer kernels
-	- dont include headers that dont exist in 2.4.x kernels
-	- use module_param() for 2.6.x and MODULE_PARM() for all others
-	- dont declare all_devices as static since it is exported
-	- dont include <linux/config.h> as the build system does it for us
-	- in lrmi, map old flag names to new names for versions >= 2.6.26
+        - get rid of warning when linux/device.h doesnt exist
+        - touch up the Makefile to let the ebuild handle the module details
+        - fix support with io remap stuff in newer kernels
+        - dont include headers that dont exist in 2.4.x kernels
+        - use module_param() for 2.6.x and MODULE_PARM() for all others
+        - dont declare all_devices as static since it is exported
+        - dont include <linux/config.h> as the build system does it for us
+        - in lrmi, map old flag names to new names for versions >= 2.6.26
 
 --- svgalib/kernel/svgalib_helper/Makefile
 +++ svgalib/kernel/svgalib_helper/Makefile
@@ -83,7 +83,7 @@
  }
  #endif
  
-@@ -105,7 +109,8 @@
+@@ -99,7 +105,8 @@
       class_device_create(svgalib_helper_class,                      	\
                               MKDEV(SVGALIB_HELPER_MAJOR, _minor),       \
                               &sh_pci_devs[_minor]->dev->dev, _name);
@@ -93,13 +93,13 @@
  #  define SLH_SYSFS_ADD_CONTROL                                         \
       class_device_create(svgalib_helper_class, NULL,                	\
                               MKDEV(SVGALIB_HELPER_MAJOR, 0),            \
-@@ -115,7 +120,18 @@
+@@ -109,7 +116,30 @@
       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
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
 +#  define SLH_SYSFS_ADD_CONTROL                                          \
 +     device_create(svgalib_helper_class, NULL,                           \
 +                             MKDEV(SVGALIB_HELPER_MAJOR, 0),             \
@@ -109,11 +109,23 @@
 +     device_create(svgalib_helper_class, &sh_pci_devs[_minor]->dev->dev, \
 +                             MKDEV(SVGALIB_HELPER_MAJOR, _minor),        \
 +                             _name);
++/* 2.6.27 changed device_create to device_create_drvdata */
++#else
++#  define SLH_SYSFS_ADD_CONTROL                                          \
++     device_create_drvdata(svgalib_helper_class, NULL,                   \
++                           MKDEV(SVGALIB_HELPER_MAJOR, 0),               \
++                           "%s%d", "svga", 0);
++
++#  define SLH_SYSFS_ADD_DEVICE(_name, _minor)                            \
++     device_create_drvdata(svgalib_helper_class,                         \
++                           &sh_pci_devs[_minor]->dev->dev,               \
++                           MKDEV(SVGALIB_HELPER_MAJOR, _minor),          \
++                           "%s%d", _name, _minor);
 +#endif
  
  #  define SLH_SYSFS_REMOVE_DEVICE(i)                                    \
       class_destroy(svgalib_helper_class);
-@@ -167,3 +167,7 @@
+@@ -161,3 +191,7 @@
  #ifndef PCI_VENDOR_ID_RENDITION 
  #define PCI_VENDOR_ID_RENDITION               0x1163
  #endif
@@ -129,7 +141,7 @@
  #if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS)
  # define MODVERSIONS
  #endif
-@@ -19,15 +19,22 @@
+@@ -17,15 +15,22 @@
  #include <linux/ioport.h>
  #include <linux/interrupt.h>
  #include <linux/pci.h>
@@ -152,7 +164,7 @@
  
  #define __KERNEL_SYSCALLS__
  #include <linux/unistd.h>
-@@ -55,7 +55,7 @@
+@@ -50,7 +55,7 @@
  #include "displaystart.h"
  
  int debug=0;
@@ -161,7 +173,7 @@
  int num_devices=0;
  
  static char *sdev_id="svgalib_helper";
-@@ -103,7 +103,11 @@
+@@ -98,7 +103,11 @@
  static volatile int vsync=0;
  static wait_queue_head_t vsync_wait;
  
@@ -174,7 +186,7 @@
  {
      struct sh_pci_device *dev = (struct sh_pci_device *)dev_id;
  
-@@ -360,7 +364,7 @@
+@@ -355,7 +364,7 @@
                  vsync=1;
                  i=0;
                  while(irqs[i]!=-1)
@@ -183,7 +195,7 @@
                  vga_enable_vsync((void *)sdev_id);
  				wait_event_interruptible(vsync_wait, !vsync);
                  i=0;
-@@ -448,7 +452,7 @@
+@@ -443,7 +452,7 @@
  		int i=sh_pci_devs[minor]->dev->irq;
  		sh_pci_devs[minor]->opencount++;
  		if(sh_pci_devs[minor]->opencount==1 && i!=0 && i!=-1 && i!=255)
@@ -192,7 +204,7 @@
  	}
  
  #ifndef KERNEL_2_6
-@@ -770,10 +770,15 @@
+@@ -763,10 +772,15 @@
  
  }
  
@@ -208,11 +220,11 @@
 +
 +MODULE_PARM_DESC(debug, "Debug output level.");
  MODULE_PARM_DESC(all_devices, "Give access to all PCI devices, regardless of class.");
-
+ 
 
 --- svgalib/src/lrmi.6.c
 +++ svgalib/src/lrmi.6.c
-@@ -169,6 +169,13 @@ LRMI_free_real(void *m)
+@@ -169,6 +169,13 @@
  		}
  	}
  
@@ -228,7 +240,7 @@
  #define DEFAULT_STACK_SIZE 	0x1000
 --- svgalib/src/lrmi.9.c
 +++ svgalib/src/lrmi.9.c
-@@ -206,6 +206,13 @@ LRMI_free_real(void *m)
+@@ -206,6 +206,13 @@
  
  
  #if defined(__linux__)
@@ -244,7 +256,7 @@
  #define DEFAULT_VM86_FLAGS  (PSL_I | PSL_IOPL)
 --- svgalib/lrmi-0.6m/lrmi.c
 +++ svgalib/lrmi-0.6m/lrmi.c
-@@ -170,6 +170,14 @@ LRMI_free_real(void *m)
+@@ -170,6 +170,14 @@
  	}
  
  
@@ -261,7 +273,7 @@
  #define RETURN_TO_32_INT 	255
 --- svgalib/lrmi-0.9/lrmi.c
 +++ svgalib/lrmi-0.9/lrmi.c
-@@ -203,6 +203,13 @@ LRMI_free_real(void *m)
+@@ -203,6 +203,13 @@
  
  
  #if defined(__linux__)