Fix building with linux-2.6.24 #207594 by Eric Bosch.

Package-Manager: portage-2.1.4

3 files changed, 57 insertions, 14 deletions

diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index 4d4d6be7f818..651b3c37d0ac 100644
--- a/media-libs/svgalib/ChangeLog
+++ b/media-libs/svgalib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/svgalib
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.76 2007/12/30 18:06:11 vapier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.77 2008/01/27 11:31:34 vapier Exp $
+
+  27 Jan 2008; Mike Frysinger <vapier@gentoo.org>
+  files/svgalib-1.9.25-linux2.6.patch:
+  Fix building with linux-2.6.24 #207594 by Eric Bosch.
 
   30 Dec 2007; Mike Frysinger <vapier@gentoo.org>
   files/svgalib-1.9.25-linux2.6.patch:
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index cec4389633e3..a92841fa67d6 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -9,10 +9,10 @@ AUX svgalib-1.9.25-build.patch 1834 RMD160 725fa79a06dabb2b45cc8f325ab13cd3f982d
 MD5 7e271545b9debb59b52b363794315af5 files/svgalib-1.9.25-build.patch 1834
 RMD160 725fa79a06dabb2b45cc8f325ab13cd3f982d931 files/svgalib-1.9.25-build.patch 1834
 SHA256 8e27610d4050f55301a611c9abb438bd4aa757d8fecc98b43cdc352dbf747e54 files/svgalib-1.9.25-build.patch 1834
-AUX svgalib-1.9.25-linux2.6.patch 4065 RMD160 b6dacf712d56af6ecbe607ea80d7a3efdb0d2bec SHA1 8b1d0f998d0724a0bdb579bbb23dfa35e93525d1 SHA256 037b7cc2d2c30fdf4114715ce0c0e012ec7e9428bba241400dbf2b33f9a61593
-MD5 0ad3a1d275074f8f683be8d6142f9169 files/svgalib-1.9.25-linux2.6.patch 4065
-RMD160 b6dacf712d56af6ecbe607ea80d7a3efdb0d2bec files/svgalib-1.9.25-linux2.6.patch 4065
-SHA256 037b7cc2d2c30fdf4114715ce0c0e012ec7e9428bba241400dbf2b33f9a61593 files/svgalib-1.9.25-linux2.6.patch 4065
+AUX svgalib-1.9.25-linux2.6.patch 5409 RMD160 1d41705bd28aefed33034ca3c8b845745c9bab3e SHA1 fa7ba65b1e99f3d8be70224c4e3c14f37e012a44 SHA256 8367be9a2893c6f7fd8176a495ad7d448c607f42d000c4e05d4af23cee0131ee
+MD5 98956b3c79aa1fe370815ecdd87c0c73 files/svgalib-1.9.25-linux2.6.patch 5409
+RMD160 1d41705bd28aefed33034ca3c8b845745c9bab3e files/svgalib-1.9.25-linux2.6.patch 5409
+SHA256 8367be9a2893c6f7fd8176a495ad7d448c607f42d000c4e05d4af23cee0131ee files/svgalib-1.9.25-linux2.6.patch 5409
 AUX svgalib.devfs 219 RMD160 921df16f9e771fcdb75ab9e6f44e4840ff72fd4b SHA1 c587ce84dff7f0e8f222660c004256b3b867d00a SHA256 3aa888f06d84d3ad49b9714986e43cad845082a1b2f6e06baa4637967920414a
 MD5 d137b721449f3fe88d6ec08a3cf6c51a files/svgalib.devfs 219
 RMD160 921df16f9e771fcdb75ab9e6f44e4840ff72fd4b files/svgalib.devfs 219
@@ -30,10 +30,10 @@ EBUILD svgalib-1.9.25.ebuild 3916 RMD160 4942841153e8c9be7f8ab9d4cf561cf718318e5
 MD5 7603fa0576395a17e6d9700e548ffee0 svgalib-1.9.25.ebuild 3916
 RMD160 4942841153e8c9be7f8ab9d4cf561cf718318e57 svgalib-1.9.25.ebuild 3916
 SHA256 9a7f1287a26a86bd7bbb3c4dc00a47dded4467398514375af18c8046c0017a8b svgalib-1.9.25.ebuild 3916
-MISC ChangeLog 13318 RMD160 76c0cc362644a04beab68724f8e3aac76dcb1d92 SHA1 35c8f5bb06b50daf2800e29934a22ac131d34622 SHA256 0f8f79708356f61d2860ebd4de3ec8327ce59d6947a033e640bf55c8cf57d4d5
-MD5 953f030b97a7a1356c9847b04fb0fa67 ChangeLog 13318
-RMD160 76c0cc362644a04beab68724f8e3aac76dcb1d92 ChangeLog 13318
-SHA256 0f8f79708356f61d2860ebd4de3ec8327ce59d6947a033e640bf55c8cf57d4d5 ChangeLog 13318
+MISC ChangeLog 13464 RMD160 7f83ebfb7d366ea44bcf37718ddc829963dc442d SHA1 e1b258940ff05360b13f1884eb8eea7dcef0679b SHA256 4cab571b6cb23717f76a7756b986eab8f313279c121fe4fd2773e7c342a9c4ed
+MD5 365867661dd2c05bf8674c780e4eec6f ChangeLog 13464
+RMD160 7f83ebfb7d366ea44bcf37718ddc829963dc442d ChangeLog 13464
+SHA256 4cab571b6cb23717f76a7756b986eab8f313279c121fe4fd2773e7c342a9c4ed ChangeLog 13464
 MISC metadata.xml 303 RMD160 1bc9684eb1b1f3b3c360df61b39b143ce2090916 SHA1 c273b6ce5b51e9d5690e54ae84982d9c2cf617d2 SHA256 08bfae407186f5088cd2b118396e784d8eaf7ab82ecc162cf8a73ff9cabcf717
 MD5 69845288d94413820ea3441dc9e60b24 metadata.xml 303
 RMD160 1bc9684eb1b1f3b3c360df61b39b143ce2090916 metadata.xml 303
@@ -44,7 +44,7 @@ SHA256 ddcc343b075e1ebcbceb0952eaa273fb40fd3a0bc00bb00b7d64e1c500a6cac4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHnGFpj9hvisErhMIRAvsKAJwJfhqu29budO4H21zJ5cIAAMH5XwCg1WNS
-7RBLIrKQWXMlwYtRaSJ4ZAQ=
-=uzON
+iD8DBQFHnGubj9hvisErhMIRAr0AAJ9kpxd/ttleD+oslZhOf3zR3OARpgCgzQYE
+8er0kz9qZrgt1Wdn3trVm7k=
+=/HMP
 -----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 96d54cbc7518..ae3617da0f7c 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
@@ -13,7 +13,7 @@
  
  
 -CLASS_SIMPLE := $(shell grep class_simple_create $(KDIR)/include/linux/device.h)
-+CLASS_SIMPLE := $(shell grep class_simple_create $(KDIR)/include/linux/device.h 2>/dev/null)
++CLASS_SIMPLE := $(shell grep -s class_simple_create $(KDIR)/include/linux/device.h)
  
  ifneq ($(CLASS_SIMPLE),)
    CLASS_CFLAGS = -DCLASS_SIMPLE=1
@@ -82,6 +82,14 @@
  }
  #endif
  
+@@ -167,3 +167,7 @@
+ #ifndef PCI_VENDOR_ID_RENDITION 
+ #define PCI_VENDOR_ID_RENDITION               0x1163
+ #endif
++
++#ifndef IRQF_SHARED
++# define IRQF_SHARED SA_SHIRQ
++#endif
 --- svgalib/kernel/svgalib_helper/main.c
 +++ svgalib/kernel/svgalib_helper/main.c
 @@ -1,5 +1,3 @@
@@ -122,6 +130,37 @@
  int num_devices=0;
  
  static char *sdev_id="svgalib_helper";
+@@ -103,7 +103,11 @@
+ static volatile int vsync=0;
+ static wait_queue_head_t vsync_wait;
+ 
+-static irqreturn_t vsync_interrupt(int irq, void *dev_id, struct pt_regs *regs)
++static irqreturn_t vsync_interrupt(int irq, void *dev_id
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
++, struct pt_regs *regs
++#endif
++)
+ {
+     struct sh_pci_device *dev = (struct sh_pci_device *)dev_id;
+ 
+@@ -360,7 +364,7 @@
+                 vsync=1;
+                 i=0;
+                 while(irqs[i]!=-1)
+-                    request_irq(irqs[i++], vsync_interrupt, SA_SHIRQ, "svgalib_helper", sdev_id);
++                    request_irq(irqs[i++], vsync_interrupt, IRQF_SHARED, "svgalib_helper", sdev_id);
+                 vga_enable_vsync((void *)sdev_id);
+ 				wait_event_interruptible(vsync_wait, !vsync);
+                 i=0;
+@@ -448,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)
+-			request_irq(i, vsync_interrupt, SA_SHIRQ, "svgalib_helper", sh_pci_devs[minor]);
++			request_irq(i, vsync_interrupt, IRQF_SHARED, "svgalib_helper", sh_pci_devs[minor]);
+ 	}
+ 
+ #ifndef KERNEL_2_6
 @@ -770,10 +770,15 @@
  
  }