From: Samuli Suominen Date: Mon, 26 Feb 2007 16:43:34 +0000 (+0000) Subject: above, to fix compatibility with 2.6.20 kernelsOH[3~ thanks to zzam for reportin... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e555ed27601b02cfae93e7ac2d8a18f2710ad59d;p=gentoo.git above, to fix compatibility with 2.6.20 kernelsOH[3~ thanks to zzam for reporting. arg , need a new keyboard. Package-Manager: portage-2.1.2-r11 --- 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 + +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 em8300-modules-0.15.3.ebuild: diff --git a/media-video/em8300-modules/Manifest b/media-video/em8300-modules/Manifest index a5001b604e91..e3585e6e83f4 100644 --- a/media-video/em8300-modules/Manifest +++ b/media-video/em8300-modules/Manifest @@ -1,3 +1,7 @@ +AUX em8300-modules-0.16.0-i2c.patch 616 RMD160 9c6ffd8b6cd648207a6dd61455698ddf51067b48 SHA1 991e98ad930c9a01b9b8e0bbbbce223557093e2f SHA256 ad58fd49ba857cdcdc875f9bb52b999843d1b024029a6e4cf8757cdac86c6df9 +MD5 a0971051ef68d3b422a66d4017435568 files/em8300-modules-0.16.0-i2c.patch 616 +RMD160 9c6ffd8b6cd648207a6dd61455698ddf51067b48 files/em8300-modules-0.16.0-i2c.patch 616 +SHA256 ad58fd49ba857cdcdc875f9bb52b999843d1b024029a6e4cf8757cdac86c6df9 files/em8300-modules-0.16.0-i2c.patch 616 AUX modules.em8300 28 RMD160 e97b956f9a1579cbba5923f8949f937621334dc1 SHA1 76661fadd926194f7658391536901fdefdeaf409 SHA256 9ff4d147004d6df8b063b27da32f27eda4f83450046337a9cbf99206828ab038 MD5 40448834cd5bc1bdc07ab84d8a3727cc files/modules.em8300 28 RMD160 e97b956f9a1579cbba5923f8949f937621334dc1 files/modules.em8300 28 @@ -8,14 +12,18 @@ EBUILD em8300-modules-0.15.3.ebuild 2309 RMD160 ff0beed06512785874d9f5a3c689d80a MD5 a29138adb4db202288bd8d73fb7521ca em8300-modules-0.15.3.ebuild 2309 RMD160 ff0beed06512785874d9f5a3c689d80ad137b95e em8300-modules-0.15.3.ebuild 2309 SHA256 2ac34bdfa202482ce04dad337e3041da5d3797194c6916604cd174eaa4090420 em8300-modules-0.15.3.ebuild 2309 +EBUILD em8300-modules-0.16.0-r1.ebuild 1106 RMD160 bc6ac803c8ffc75fc9356c5349b43edac38de219 SHA1 3c58b7bdf4a5533a96d2e0be37efd466507ca569 SHA256 565ff660ddcb94ba4d3b19aaf4edad0f71295d3341835d68ae467751e8a88fb1 +MD5 87479438eb4d570f170b4a0173be81b1 em8300-modules-0.16.0-r1.ebuild 1106 +RMD160 bc6ac803c8ffc75fc9356c5349b43edac38de219 em8300-modules-0.16.0-r1.ebuild 1106 +SHA256 565ff660ddcb94ba4d3b19aaf4edad0f71295d3341835d68ae467751e8a88fb1 em8300-modules-0.16.0-r1.ebuild 1106 EBUILD em8300-modules-0.16.0.ebuild 1016 RMD160 41309d53d036588e90008a8560a266db44cc29a8 SHA1 35db89365bbc9a3596997c7ada9b433074f43b18 SHA256 9a72da3980492424009b41cd9ada2d5a61ac55c6f53958700c55333c6f6a4d13 MD5 d17b595c88a9a09e24c0c14462918306 em8300-modules-0.16.0.ebuild 1016 RMD160 41309d53d036588e90008a8560a266db44cc29a8 em8300-modules-0.16.0.ebuild 1016 SHA256 9a72da3980492424009b41cd9ada2d5a61ac55c6f53958700c55333c6f6a4d13 em8300-modules-0.16.0.ebuild 1016 -MISC ChangeLog 6394 RMD160 7223a0c260521c7a15f098d5b37de9337a159b27 SHA1 cd1f1c0bbcc43a16339fbfb9f49cef69e660075c SHA256 3ecb9e50b262e9f2446f3d0cfa124f943b6b4546e1c5b29a023f5eccd82d030a -MD5 ea1037cf94db0f2d97d3e0647d4cdad4 ChangeLog 6394 -RMD160 7223a0c260521c7a15f098d5b37de9337a159b27 ChangeLog 6394 -SHA256 3ecb9e50b262e9f2446f3d0cfa124f943b6b4546e1c5b29a023f5eccd82d030a ChangeLog 6394 +MISC ChangeLog 6713 RMD160 f8657b8f3e0bb4a6ca289432a4e2434bbffca727 SHA1 b0150dd1a2fa0a3925141f2e3111bcd6a9e861f7 SHA256 392c50b01972228d7a88a6538037c8abd797e1b15e4db756ef2c066d04d5318a +MD5 fd3bbb7cfc747274dccf8d097e2a58af ChangeLog 6713 +RMD160 f8657b8f3e0bb4a6ca289432a4e2434bbffca727 ChangeLog 6713 +SHA256 392c50b01972228d7a88a6538037c8abd797e1b15e4db756ef2c066d04d5318a ChangeLog 6713 MISC metadata.xml 249 RMD160 bf10e2ee9d850361c49284554d91564803df1985 SHA1 400d00b2c367b0d849889de29cb949d8c21ef0ba SHA256 1c102c50e101576d7f964d072a588b98dd391ea7049a41a184f08d61d516937b MD5 c68b999553f3dfef40460ed05ae79ff1 metadata.xml 249 RMD160 bf10e2ee9d850361c49284554d91564803df1985 metadata.xml 249 @@ -26,3 +34,6 @@ SHA256 9c324ceae1dd7f03998b2e4fc4d68ab2c988ecbe88c7e88aee934ad79d9830c2 files/di MD5 aee4cf4cc17aab30f080e921710e0d05 files/digest-em8300-modules-0.16.0 241 RMD160 8d1c727d97f866e2531fdf5b764525074273f82c files/digest-em8300-modules-0.16.0 241 SHA256 53f1437c57da800d33ab234a3e7fbc2656120d857b3ced04ae4eb9cef30a6690 files/digest-em8300-modules-0.16.0 241 +MD5 aee4cf4cc17aab30f080e921710e0d05 files/digest-em8300-modules-0.16.0-r1 241 +RMD160 8d1c727d97f866e2531fdf5b764525074273f82c files/digest-em8300-modules-0.16.0-r1 241 +SHA256 53f1437c57da800d33ab234a3e7fbc2656120d857b3ced04ae4eb9cef30a6690 files/digest-em8300-modules-0.16.0-r1 241 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)