Fix compilation with Kernel 2.6.30. Thanks to Helmut Auer <helmut@helmutauer.de>.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 98 insertions, 9 deletions

diff --git a/media-video/em8300-modules/ChangeLog b/media-video/em8300-modules/ChangeLog
index 2810a6fd3c8b..d5d38d91dd6e 100644
--- a/media-video/em8300-modules/ChangeLog
+++ b/media-video/em8300-modules/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/em8300-modules
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.48 2009/03/03 10:49:48 zzam Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.49 2009/06/12 19:26:56 zzam Exp $
+
+  12 Jun 2009; Matthias Schwarzott <zzam@gentoo.org>
+  em8300-modules-0.17.2.ebuild,
+  +files/em8300-modules-0.17.2-kernel-2.6.30.patch:
+  Fix compilation with Kernel 2.6.30. Thanks to Helmut Auer
+  <helmut@helmutauer.de>.
 
 *em8300-modules-0.17.2 (03 Mar 2009)
 
diff --git a/media-video/em8300-modules/Manifest b/media-video/em8300-modules/Manifest
index 7e27c07b19b3..176605e232a8 100644
--- a/media-video/em8300-modules/Manifest
+++ b/media-video/em8300-modules/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX em8300-modules-0.16.0-i2c.patch 616 RMD160 9c6ffd8b6cd648207a6dd61455698ddf51067b48 SHA1 991e98ad930c9a01b9b8e0bbbbce223557093e2f SHA256 ad58fd49ba857cdcdc875f9bb52b999843d1b024029a6e4cf8757cdac86c6df9
 AUX em8300-modules-0.16.2-kernel-2.6.23.patch 297 RMD160 66a74b9a7bc554b54ea0fcac387d5807e95493b8 SHA1 2f03be91ed8326af61dc079e6425f57f72c729c4 SHA256 bc5d97ded343bc385494c0b4751cd428dc2ef8813123760544b93ebe62f520a3
 AUX em8300-modules-0.16.2-pci-module-init.patch 1063 RMD160 37503a6bc5cb0ca9d9f3af33f65bcffb79af578c SHA1 95ac5a0b1ff608d1937f1ef60e6cc2e96f5ae515 SHA256 8f19661300d64f21313378910a48106988d9b4aaace1ba81df348fb181ea2285
+AUX em8300-modules-0.17.2-kernel-2.6.30.patch 2389 RMD160 7c4c1d2a9df30f59ded77f9143ffd35dda5681c6 SHA1 d01e8f3133d4e51df56026535a7587f46af23285 SHA256 dfe4e0bb73d66e6781f9152df9ed31918adb9bc4c7f3f62671883fd9fe9fab71
 AUX modules.em8300 28 RMD160 e97b956f9a1579cbba5923f8949f937621334dc1 SHA1 76661fadd926194f7658391536901fdefdeaf409 SHA256 9ff4d147004d6df8b063b27da32f27eda4f83450046337a9cbf99206828ab038
 DIST em8300-0.16.0.tar.gz 338100 RMD160 1732b036740f806c3aeec5d616debdb8478609a4 SHA1 e0bc558256b3620ab98894f267a7aa08df99f342 SHA256 9a0eb004b80362c57f94ec49cbcb131bcba23ad63207464cb9196060a893f1a5
 DIST em8300-0.16.2.tar.gz 343468 RMD160 0d07f0808fa98f7d650273f5004ba6316a8ab294 SHA1 d92c9424533abdbd463d7603d68ae9784326635a SHA256 a21fdad6e9098d862ce7674bdf1856012f89fd71be3d26b02b83920c2b26d410
@@ -13,13 +14,13 @@ EBUILD em8300-modules-0.16.0-r1.ebuild 1144 RMD160 06508465cc5b02187e4a55d4da5fc
 EBUILD em8300-modules-0.16.2.ebuild 1200 RMD160 179b0eae2494db4f7e131e66350bca3eaf7f2dce SHA1 05f3685f3d4bf16fffad6742650b4bf3e3f34678 SHA256 d4bc5edf14499942da65c7070945473767db0cb71357b35c0b15a72794d2ee5b
 EBUILD em8300-modules-0.16.4-r1.ebuild 1413 RMD160 95e5acd88c945e0a034569c40c7ffa4363810ff4 SHA1 ae9061401689ff8c8beaf76f9754fa853a5753d5 SHA256 f72591ed16c293d111f61412f987281f992bf4873c8be6f3a17463682b393c77
 EBUILD em8300-modules-0.16.4.ebuild 1104 RMD160 b5dc1428ed9d604d31c7abc99f27e83d5f99f90b SHA1 6081dce2fb06004574ea37f9c30372098b6acd5e SHA256 7967c946b701bb3c5e225e95a71fb82a548fdd91afa88719f3276c5ae944fddc
-EBUILD em8300-modules-0.17.2.ebuild 1416 RMD160 bb9260b150f8c208d3993db1e66934d7adcfdf5a SHA1 c2d0e1d57772a6c61b9439b65bb387167dd6bd1e SHA256 fb35c81f06392c6dd24df6966c58a05425bb526389fcf6c3d73973f959318b3c
-MISC ChangeLog 8685 RMD160 fa17d21d94936f6c056e3c72e4af6262546e96bc SHA1 abc4b3f694c8106286cbb0a39a3036d1de8bef0f SHA256 9bd849ed08cc33a2c2bb790997ee43f6dcd7ed4109792c72da6aa623560ac5a4
+EBUILD em8300-modules-0.17.2.ebuild 1463 RMD160 a5a7ba179055c50e08418905bdd592441580f8f4 SHA1 f933e54a50fe9264382490bd507854633267f2d9 SHA256 99d6a0959176f12f058dc6693163b5d952557db051d00af34f4ca94e07fbcd41
+MISC ChangeLog 8909 RMD160 e76941e0bd305e81ae3412841ebc29158ca68bc7 SHA1 140b7b968e75b6c7416db356b294d0d772057ae0 SHA256 45739efc9e2285f23747bd17734e72167ba8ad72fb742fa4cb235d16c32862f4
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmtC1IACgkQt2vP6XvVdOfZsQCaAtvPTZRwKpDFweOyvUxSQOy+
-S/gAoOCUudnsh8BBq1EZzlFW+tSZyLNo
-=BlJA
+iEYEARECAAYFAkoyrAcACgkQt2vP6XvVdOetVwCeP2rJaWaasSgyWoBxwkUwz31I
+REMAoLkVEPofUbsI9b0O0lyRHenrYSoG
+=JiML
 -----END PGP SIGNATURE-----
diff --git a/media-video/em8300-modules/em8300-modules-0.17.2.ebuild b/media-video/em8300-modules/em8300-modules-0.17.2.ebuild
index ee9219dc4b16..fcc9b6f85da7 100644
--- a/media-video/em8300-modules/em8300-modules-0.17.2.ebuild
+++ b/media-video/em8300-modules/em8300-modules-0.17.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.17.2.ebuild,v 1.1 2009/03/03 10:49:48 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.17.2.ebuild,v 1.2 2009/06/12 19:26:56 zzam Exp $
 
 inherit eutils linux-mod
 
@@ -26,6 +26,7 @@ S="${WORKDIR}/${MY_P}/modules"
 src_unpack() {
 	unpack ${A}
 	cd "${S}/.."
+	epatch "${FILESDIR}/${P}-kernel-2.6.30.patch"
 }
 
 src_compile() {
diff --git a/media-video/em8300-modules/files/em8300-modules-0.17.2-kernel-2.6.30.patch b/media-video/em8300-modules/files/em8300-modules-0.17.2-kernel-2.6.30.patch
new file mode 100644
index 000000000000..6064c3528f40
--- /dev/null
+++ b/media-video/em8300-modules/files/em8300-modules-0.17.2-kernel-2.6.30.patch
@@ -0,0 +1,81 @@
+--- modules/adv717x.c	2008-11-03 01:21:31.000000000 +0100
++++ modules/adv717x.c	2009-06-12 10:51:09.000000000 +0200
+@@ -44,7 +44,9 @@
+ 
+ #include <linux/i2c.h>
+ #include <linux/i2c-algo-bit.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+ #include <linux/video_encoder.h>
++#endif
+ 
+ #include "em8300_compat24.h"
+ #include "em8300_reg.h"
+--- modules/bt865.c	2008-11-03 01:21:31.000000000 +0100
++++ modules/bt865.c	2009-06-12 10:51:03.000000000 +0200
+@@ -48,7 +48,9 @@
+ 
+ #include <linux/i2c.h>
+ #include <linux/i2c-algo-bit.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+ #include <linux/video_encoder.h>
++#endif
+ 
+ #include "em8300_compat24.h"
+ #include "bt865.h"
+--- modules/em8300_procfs.c	2008-11-03 01:21:31.000000000 +0100
++++ modules/em8300_procfs.c	2009-06-12 11:00:08.000000000 +0200
+@@ -154,7 +154,9 @@
+ 		if (proc) {
+ 			proc->data = (void *) em;
+ 			proc->read_proc = em8300_proc_read;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+ 			proc->owner = THIS_MODULE;
++#endif			
+ 		}
+ 	}
+ }
+@@ -180,11 +182,17 @@
+ 	em8300_proc = create_proc_entry(EM8300_PROCFS_DIR,
+ 					S_IFDIR | S_IRUGO | S_IXUGO,
+ 					NULL);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
++	if (!em8300_proc) {
++		printk(KERN_ERR "em8300: unable to register proc entry!\n");
++	}
++#else	
+ 	if (em8300_proc) {
+ 		em8300_proc->owner = THIS_MODULE;
+ 	} else {
+ 		printk(KERN_ERR "em8300: unable to register proc entry!\n");
+ 	}
++#endif	
+ }
+ 
+ struct em8300_registrar_s em8300_procfs_registrar =
+--- modules/em8300_ucode.c	2008-11-03 01:21:31.000000000 +0100
++++ modules/em8300_ucode.c	2009-06-12 10:56:18.000000000 +0200
+@@ -199,7 +199,11 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ 		if (request_firmware(&fw_entry, "em8300.bin", &em->dev->dev) != 0) {
+ 			printk(KERN_ALERT "%s: firmware %s is missing, cannot start.\n",
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)			
++			       dev_name(em->dev), "em8300.bin");
++#else
+ 			       em->dev->dev.bus_id, "em8300.bin");
++#endif			       
+ 			return;
+ 		}
+ #else
+--- modules/em8300_compat24.h	2009-06-12 11:14:52.000000000 +0200
++++ modules/em8300_compat24.h	2009-06-12 11:14:26.000000000 +0200
+@@ -27,8 +27,10 @@
+ #ifndef IRQ_NONE
+ #define IRQ_NONE
+ #define IRQ_HANDLED
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+ typedef void irqreturn_t;
+ #endif
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
+ #ifndef IRQF_DISABLED