Added patch to compile with kernel 2.6.22

(Portage version: 2.1.3_rc8)

4 files changed, 92 insertions, 1 deletions

diff --git a/media-video/em84xx-modules/ChangeLog b/media-video/em84xx-modules/ChangeLog
index f8f8af01f7d2..3d7434bebab5 100644
--- a/media-video/em84xx-modules/ChangeLog
+++ b/media-video/em84xx-modules/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/em84xx-modules
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/em84xx-modules/ChangeLog,v 1.1 2007/05/21 20:21:40 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em84xx-modules/ChangeLog,v 1.2 2007/07/16 20:51:07 zzam Exp $
+
+*em84xx-modules-0.2.1-r1 (16 Jul 2007)
+
+  16 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/em84xx-modules-0.2.1-kernel-2.6.22.diff,
+  +em84xx-modules-0.2.1-r1.ebuild:
+  Added patch to compile with kernel 2.6.22
 
 *em84xx-modules-0.2.1 (21 May 2007)
 
diff --git a/media-video/em84xx-modules/em84xx-modules-0.2.1-r1.ebuild b/media-video/em84xx-modules/em84xx-modules-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..66fef49005f1
--- /dev/null
+++ b/media-video/em84xx-modules/em84xx-modules-0.2.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/em84xx-modules/em84xx-modules-0.2.1-r1.ebuild,v 1.1 2007/07/16 20:51:07 zzam Exp $
+
+inherit linux-mod eutils
+
+SF_PROJECT=${PN%-modules}
+
+MY_PN=realmagic
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="kernel modules for em84xx based mpeg-decoder cards"
+HOMEPAGE="http://sourceforge.net/projects/em84xx/"
+SRC_URI="mirror://sourceforge/${SF_PROJECT}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/linux-sources"
+
+S=${WORKDIR}/${MY_PN}
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	MODULE_NAMES="realmagic84xx(video:${S})"
+	BUILD_PARAMS="KDIR=${KV_DIR}"
+	BUILD_TARGETS="all"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-kernel-2.6.19.diff
+	epatch ${FILESDIR}/${P}-kernel-2.6.22.diff
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc README TODO HISTORY
+}
diff --git a/media-video/em84xx-modules/files/digest-em84xx-modules-0.2.1-r1 b/media-video/em84xx-modules/files/digest-em84xx-modules-0.2.1-r1
new file mode 100644
index 000000000000..cd67ca19e81f
--- /dev/null
+++ b/media-video/em84xx-modules/files/digest-em84xx-modules-0.2.1-r1
@@ -0,0 +1,3 @@
+MD5 dd7b11ea4121128bd0a7b8d27adea6e7 realmagic-0.2.1.tar.gz 8341
+RMD160 3a53bd86c79896e8c9979ed471328807cb579b0c realmagic-0.2.1.tar.gz 8341
+SHA256 235859c47841bc5a93343c29f4f282ca49be5c41e23fb568680f19b914af9cd4 realmagic-0.2.1.tar.gz 8341
diff --git a/media-video/em84xx-modules/files/em84xx-modules-0.2.1-kernel-2.6.22.diff b/media-video/em84xx-modules/files/em84xx-modules-0.2.1-kernel-2.6.22.diff
new file mode 100644
index 000000000000..5c9a2bdb2f77
--- /dev/null
+++ b/media-video/em84xx-modules/files/em84xx-modules-0.2.1-kernel-2.6.22.diff
@@ -0,0 +1,35 @@
+diff -ru realmagic/dma.c realmagic-patched/dma.c
+--- realmagic/dma.c	2006-02-23 17:38:37.000000000 +0100
++++ realmagic-patched/dma.c	2007-07-16 22:43:24.753547782 +0200
+@@ -26,6 +26,7 @@
+ /*****************************************************************************/
+ 
+ #define __NO_VERSION__
++#include <linux/sched.h>
+ #include <linux/pagemap.h>
+ #include <asm/io.h>
+ 
+diff -ru realmagic/realmagicdev.c realmagic-patched/realmagicdev.c
+--- realmagic/realmagicdev.c	2007-07-16 21:55:44.997008531 +0200
++++ realmagic-patched/realmagicdev.c	2007-07-16 21:59:32.517440991 +0200
+@@ -229,7 +229,7 @@
+ 
+     pci_set_master(dev);
+ 
+-    if (request_irq(dev->irq, quasar_interrupt, SA_SHIRQ, INTERRUPT_ENTRY_NAME, dev)) {
++    if (request_irq(dev->irq, quasar_interrupt, IRQF_SHARED, INTERRUPT_ENTRY_NAME, dev)) {
+         printk( KERN_ERR "em84xx: IRQ %d not free.\n", dev->irq );
+         return -EIO;
+     }
+@@ -284,9 +284,9 @@
+     register_driver();
+ 
+     if (register_chrdev(REALMAGIC_MAJOR, REALMAGIC_DEVICE_NAME, &realmagic_fops) == 0) {
+-        if( pci_module_init(&realmagic_drv) == 0 )
++        if( pci_register_driver(&realmagic_drv) == 0 )
+             return 0;
+-        printk("em84xx: pci_module_init failed!\n");
++        printk("em84xx: pci_register_driver!\n");
+         unregister_chrdev(REALMAGIC_MAJOR, REALMAGIC_DEVICE_NAME);
+     } else
+         printk("em84xx: register_chrdev failed!\n");