above, to fix compatibility with 2.6.20 kernelsOH[3~ thanks to zzam for reporting. arg , need a new keyboard.

(Portage version: 2.1.2-r11)

4 files changed, 77 insertions, 1 deletions

diff --git a/media-video/em8300-modules/ChangeLog b/media-video/em8300-modules/ChangeLog
index 50ab8737272c..4663c78b19e8 100644
--- a/media-video/em8300-modules/ChangeLog
+++ b/media-video/em8300-modules/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/em8300-modules
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.35 2007/01/06 14:57:42 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.36 2007/02/26 16:43:34 drac Exp $
+
+*em8300-modules-0.16.0-r1 (26 Feb 2007)
+
+  26 Feb 2007; Samuli Suominen <drac@gentoo.org>
+  +files/em8300-modules-0.16.0-i2c.patch, +em8300-modules-0.16.0-r1.ebuild:
+  Use i2c_del_adapter instead of i2c_bit_del_bus for kernels 2.6.0 and above,
+  to fix compatibility with 2.6.20 kernels. Thanks to zzam for reporting.
 
   06 Jan 2007; Matthias Schwarzott <zzam@gentoo.org>
   em8300-modules-0.15.3.ebuild:
diff --git a/media-video/em8300-modules/em8300-modules-0.16.0-r1.ebuild b/media-video/em8300-modules/em8300-modules-0.16.0-r1.ebuild
new file mode 100644
index 000000000000..a08177592bd1
--- /dev/null
+++ b/media-video/em8300-modules/em8300-modules-0.16.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2007 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.16.0-r1.ebuild,v 1.1 2007/02/26 16:43:34 drac Exp $
+
+inherit eutils linux-mod
+
+MY_P="${P/-modules/}"
+
+DESCRIPTION="em8300 (RealMagic Hollywood+/Creative DXR3) video decoder card kernel modules"
+HOMEPAGE="http://dxr3.sourceforge.net"
+SRC_URI="mirror://sourceforge/dxr3/${MY_P}.tar.gz"
+
+DEPEND="virtual/linux-sources"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+CONFIG_CHECK="I2C_ALGOBIT"
+MODULE_NAMES="em8300(video:) bt865(video:) adv717x(video:)"
+
+S="${WORKDIR}/${MY_P}/modules"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-i2c.patch
+}
+
+src_compile() {
+	set_arch_to_kernel
+	cd "${S}"
+	emake || die "emake failed."
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc README-modoptions README-modules.conf
+
+	newsbin devices.sh em8300-devices.sh
+
+	insinto /etc/modules.d
+	newins ${FILESDIR}/modules.em8300 em8300
+
+	insinto /etc/udev/rules.d
+	newins em8300-udev.rules 15-em8300.rules
+}
diff --git a/media-video/em8300-modules/files/digest-em8300-modules-0.16.0-r1 b/media-video/em8300-modules/files/digest-em8300-modules-0.16.0-r1
new file mode 100644
index 000000000000..93f9cf9b578a
--- /dev/null
+++ b/media-video/em8300-modules/files/digest-em8300-modules-0.16.0-r1
@@ -0,0 +1,3 @@
+MD5 9e9b769b99927079b4fd6ec423d95049 em8300-0.16.0.tar.gz 338100
+RMD160 1732b036740f806c3aeec5d616debdb8478609a4 em8300-0.16.0.tar.gz 338100
+SHA256 9a0eb004b80362c57f94ec49cbcb131bcba23ad63207464cb9196060a893f1a5 em8300-0.16.0.tar.gz 338100
diff --git a/media-video/em8300-modules/files/em8300-modules-0.16.0-i2c.patch b/media-video/em8300-modules/files/em8300-modules-0.16.0-i2c.patch
new file mode 100644
index 000000000000..61c273044d6a
--- /dev/null
+++ b/media-video/em8300-modules/files/em8300-modules-0.16.0-i2c.patch
@@ -0,0 +1,17 @@
+diff -ur em8300-0.16.0.orig/modules/em8300_i2c.c em8300-0.16.0/modules/em8300_i2c.c
+--- em8300-0.16.0.orig/modules/em8300_i2c.c	2006-11-18 22:30:27.000000000 +0200
++++ em8300-0.16.0/modules/em8300_i2c.c	2007-02-26 18:37:57.000000000 +0200
+@@ -245,8 +245,13 @@
+ 	/* unregister i2c_bus */
+ 	kfree(em->i2c_data_1.data);
+ 	kfree(em->i2c_data_2.data);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++	i2c_del_adapter(&em->i2c_ops_1);
++	i2c_del_adapter(&em->i2c_ops_2);
++#else
+ 	i2c_bit_del_bus(&em->i2c_ops_1);
+ 	i2c_bit_del_bus(&em->i2c_ops_2);
++#endif
+ }
+ 
+ void em8300_clockgen_write(struct em8300_s *em, int abyte)