diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-04-12 19:12:12 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-04-12 19:12:12 +0000 |
commit | ff1d94c0fef2069833a33d624f7ba21977448615 (patch) | |
tree | 96a0c21474b52d287a2f66fa8cb3fdd9d7d0babe /media-video/em8300-modules | |
parent | fix manifest, previous commit ended in a cvs timeout (diff) | |
download | gentoo-2-ff1d94c0fef2069833a33d624f7ba21977448615.tar.gz gentoo-2-ff1d94c0fef2069833a33d624f7ba21977448615.tar.bz2 gentoo-2-ff1d94c0fef2069833a33d624f7ba21977448615.zip |
old
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-video/em8300-modules')
11 files changed, 0 insertions, 508 deletions
diff --git a/media-video/em8300-modules/Manifest b/media-video/em8300-modules/Manifest index d2f02760292e..0f9cf734d89f 100644 --- a/media-video/em8300-modules/Manifest +++ b/media-video/em8300-modules/Manifest @@ -1,31 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -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 -DIST em8300-0.16.4.tar.gz 345908 RMD160 77251d225594d303e0080f302907b822a673f2ec SHA1 145add157debc04541be2501f4c9596c08a58079 SHA256 37a1005d5ea4665b24a508419371ef4dee08e66f1eadb4c52c72ed576c4c40b9 -DIST em8300-0.17.2.tar.gz 388334 RMD160 bab01517c0728f05851252ff4aca9e2524ffb1b4 SHA1 47949e966b3975c117c20680dd8e6f05c3553363 SHA256 b3f1e4b7cd4c262fa23fab2a0c371f3fd721d4a9522d1aade1a7aa8cba67ca75 DIST em8300-0.17.4.tar.gz 394137 RMD160 7f24dd9b3458811aadfb3d4dea4e14f55fb416f4 SHA1 94bf0e783c57d5c661e84c3a4a5b4f8850de735a SHA256 1dda9ed6ae350a22087df4ebafb495e4cff2f54b7b744ef062ec5f52a1ef0631 DIST em8300-0.18.0.tar.gz 395500 RMD160 0c9189f54a472c8378254ddcc30aec4dcfe1ce7e SHA1 f779cc74faa9dd97d37248ee379741b481b36d2a SHA256 c598d6dfceb6180c13f7575e493405c9a576322e09e06857d322a9b30f4cc960 -EBUILD em8300-modules-0.16.0-r1.ebuild 1144 RMD160 06508465cc5b02187e4a55d4da5fc108841ca251 SHA1 9268ba746c392a2a3ebd4f5204586722a8fe1236 SHA256 befe369a26844fdaff7c54cb52e4697ddf3a510f8bd58de02543ac70b0f23cc1 -EBUILD em8300-modules-0.16.2.ebuild 1200 RMD160 179b0eae2494db4f7e131e66350bca3eaf7f2dce SHA1 05f3685f3d4bf16fffad6742650b4bf3e3f34678 SHA256 d4bc5edf14499942da65c7070945473767db0cb71357b35c0b15a72794d2ee5b -EBUILD em8300-modules-0.16.4-r1.ebuild 1606 RMD160 253c958891c520d0f83dd16a91c3c394f5ce93eb SHA1 fe3b0f1368b78f09bd3abeec41a4aa769494a559 SHA256 dd839024e475153d01da3579e351d8c1fd2dc88912482ecc16ae3a260f942dcc -EBUILD em8300-modules-0.16.4.ebuild 1104 RMD160 b5dc1428ed9d604d31c7abc99f27e83d5f99f90b SHA1 6081dce2fb06004574ea37f9c30372098b6acd5e SHA256 7967c946b701bb3c5e225e95a71fb82a548fdd91afa88719f3276c5ae944fddc -EBUILD em8300-modules-0.17.2-r1.ebuild 1664 RMD160 5f9036c14f8b7aa0a84084fb323529df527d177e SHA1 d36e4cb1ebf173ecc81d826fec1b799ca8b27637 SHA256 3f99c87391058550cc25efc9b0459ff016c7e1a94e8f102bd77368c442b79050 -EBUILD em8300-modules-0.17.2.ebuild 1463 RMD160 a5a7ba179055c50e08418905bdd592441580f8f4 SHA1 f933e54a50fe9264382490bd507854633267f2d9 SHA256 99d6a0959176f12f058dc6693163b5d952557db051d00af34f4ca94e07fbcd41 EBUILD em8300-modules-0.17.4.ebuild 1661 RMD160 b9dfe1a9b7bf70052edc7587c16fdc8940edc015 SHA1 816a4e9a9748fe42d3205e0b3b4e0c36efa181ca SHA256 b3758fa0441e4fe3ad3905f600eaaf8f29e69d5c171f5198a9aa9b4e8907d148 EBUILD em8300-modules-0.18.0.ebuild 1542 RMD160 81d123a5b5b3661e720e1480f7b14b815ac3814b SHA1 d85138b11578f7df4d8f7a735a63259bb3653611 SHA256 7a2218e8af46edd92c1b27fd5a883f26d0974347cbc553e91c3f4076492ace27 MISC ChangeLog 9754 RMD160 9bcd2d1a9ed289d2fae8ba2ff42c5ee8b580487c SHA1 93f75ba72d0fd2ae8edb7a1847ffd4ae122dd16d SHA256 dbea76d7e01ef347ffff469e05cf5a0223e1c1ebed6ae8f366ea02b4a61b6318 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAkvDbbgACgkQkKaRLQcq0GKMFACdG725BEvaraxWExcpc1fdbNMu -9iwAn047yOplgc/vcLBz9kZ9l3PoxKCD -=WwbC ------END PGP SIGNATURE----- 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 deleted file mode 100644 index b3e8962afb9b..000000000000 --- a/media-video/em8300-modules/em8300-modules-0.16.0-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2008 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.7 2008/10/30 20:12:32 dertobi123 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 KERNEL_LOCATION="${KERNEL_DIR}" || 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/em8300-modules-0.16.2.ebuild b/media-video/em8300-modules/em8300-modules-0.16.2.ebuild deleted file mode 100644 index 597205b23bca..000000000000 --- a/media-video/em8300-modules/em8300-modules-0.16.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# 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.2.ebuild,v 1.4 2007/11/27 12:25:13 zzam 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}-pci-module-init.patch" - epatch "${FILESDIR}/${P}-kernel-2.6.23.patch" -} - -src_compile() { - set_arch_to_kernel - cd "${S}" - emake KERNEL_LOCATION="${KERNEL_DIR}" || 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/em8300-modules-0.16.4-r1.ebuild b/media-video/em8300-modules/em8300-modules-0.16.4-r1.ebuild deleted file mode 100644 index e54929bee3c5..000000000000 --- a/media-video/em8300-modules/em8300-modules-0.16.4-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# 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.16.4-r1.ebuild,v 1.3 2009/06/18 15:11:51 zzam 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}/.." -} - -src_compile() { - set_arch_to_kernel - cd "${S}" - emake KERNEL_LOCATION="${KERNEL_DIR}" || die "emake failed." -} - -src_install() { - linux-mod_src_install - - dodoc README-modoptions README-modules.conf - - newsbin devices.sh em8300-devices.sh - - insinto /etc/modprobe.d - newins "${FILESDIR}"/modules.em8300 em8300.conf - - insinto /etc/udev/rules.d - newins em8300-udev.rules 15-em8300.rules -} - -pkg_preinst() { - linux-mod_pkg_preinst - - local old1="${ROOT}/etc/modprobe.d/em8300" - local old2="${ROOT}/etc/modules.d/em8300" - local new="${ROOT}/etc/modprobe.d/em8300.conf" - - if [[ ! -a ${new} ]]; then - if [[ -a ${old1} ]]; then - elog "Renaming em8300-modprobe configuration to em8300.conf" - mv "${old1}" "${new}" - elif [[ -a ${old2} ]]; then - elog "Moving old em8300 configuration in /etc/modules.d to new" - elog "location in /etc/modprobe.d" - mv "${old2}" "${new}" - fi - fi -} diff --git a/media-video/em8300-modules/em8300-modules-0.16.4.ebuild b/media-video/em8300-modules/em8300-modules-0.16.4.ebuild deleted file mode 100644 index 5cbcbe006f0a..000000000000 --- a/media-video/em8300-modules/em8300-modules-0.16.4.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2008 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.4.ebuild,v 1.1 2008/02/29 10:27:16 zzam 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}/.." -} - -src_compile() { - set_arch_to_kernel - cd "${S}" - emake KERNEL_LOCATION="${KERNEL_DIR}" || 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/em8300-modules-0.17.2-r1.ebuild b/media-video/em8300-modules/em8300-modules-0.17.2-r1.ebuild deleted file mode 100644 index 1f32da4d8158..000000000000 --- a/media-video/em8300-modules/em8300-modules-0.17.2-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# 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-r1.ebuild,v 1.1 2009/06/18 15:11:51 zzam 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" -RDEPEND="" - -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}-kernel-2.6.30.patch" -} - -src_compile() { - set_arch_to_kernel - cd "${S}" - emake KERNEL_LOCATION="${KERNEL_DIR}" || die "emake failed." -} - -src_install() { - linux-mod_src_install - - dodoc README-modoptions README-modules.conf - - newsbin devices.sh em8300-devices.sh - - insinto /etc/modprobe.d - newins "${FILESDIR}"/modules.em8300 em8300.conf - - insinto /etc/udev/rules.d - newins em8300-udev.rules 15-em8300.rules -} - -pkg_preinst() { - linux-mod_pkg_preinst - - local old1="${ROOT}/etc/modprobe.d/em8300" - local old2="${ROOT}/etc/modules.d/em8300" - local new="${ROOT}/etc/modprobe.d/em8300.conf" - - if [[ ! -a ${new} ]]; then - if [[ -a ${old1} ]]; then - elog "Renaming em8300-modprobe configuration to em8300.conf" - mv "${old1}" "${new}" - elif [[ -a ${old2} ]]; then - elog "Moving old em8300 configuration in /etc/modules.d to new" - elog "location in /etc/modprobe.d" - mv "${old2}" "${new}" - fi - fi -} diff --git a/media-video/em8300-modules/em8300-modules-0.17.2.ebuild b/media-video/em8300-modules/em8300-modules-0.17.2.ebuild deleted file mode 100644 index fcc9b6f85da7..000000000000 --- a/media-video/em8300-modules/em8300-modules-0.17.2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# 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.2 2009/06/12 19:26:56 zzam 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" -RDEPEND="" - -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}-kernel-2.6.30.patch" -} - -src_compile() { - set_arch_to_kernel - cd "${S}" - emake KERNEL_LOCATION="${KERNEL_DIR}" || die "emake failed." -} - -src_install() { - linux-mod_src_install - - dodoc README-modoptions README-modules.conf - - newsbin devices.sh em8300-devices.sh - - insinto /etc/modprobe.d - newins "${FILESDIR}"/modules.em8300 em8300 - - insinto /etc/udev/rules.d - newins em8300-udev.rules 15-em8300.rules -} - -pkg_preinst() { - linux-mod_pkg_preinst - - local old="${ROOT}/etc/modules.d/em8300" - local new="${ROOT}/etc/modprobe.d/em8300" - - if [[ -a ${old} && ! -a ${new} ]]; then - elog "Moving old em8300 configuration in /etc/modules.d to new" - elog "location in /etc/modprobe.d" - mv "${old}" "${new}" - fi -} 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 deleted file mode 100644 index 61c273044d6a..000000000000 --- a/media-video/em8300-modules/files/em8300-modules-0.16.0-i2c.patch +++ /dev/null @@ -1,17 +0,0 @@ -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) diff --git a/media-video/em8300-modules/files/em8300-modules-0.16.2-kernel-2.6.23.patch b/media-video/em8300-modules/files/em8300-modules-0.16.2-kernel-2.6.23.patch deleted file mode 100644 index f01b28b3a2cb..000000000000 --- a/media-video/em8300-modules/files/em8300-modules-0.16.2-kernel-2.6.23.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/modules/em8300_ioctl.c 2007-10-11 10:46:18.678481128 +0200 -+++ b/modules/em8300_ioctl.c 2007-10-11 10:46:03.847449878 +0200 -@@ -15,6 +15,7 @@ - #include <linux/string.h> - #include <linux/pci.h> - #include <asm/io.h> -+#include <asm/ioctl.h> - #include <asm/uaccess.h> - #include <linux/wait.h> - diff --git a/media-video/em8300-modules/files/em8300-modules-0.16.2-pci-module-init.patch b/media-video/em8300-modules/files/em8300-modules-0.16.2-pci-module-init.patch deleted file mode 100644 index 02ba84ef885d..000000000000 --- a/media-video/em8300-modules/files/em8300-modules-0.16.2-pci-module-init.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- ChangeLog.old 2007-07-10 11:25:41.639463587 +0200 -+++ ChangeLog 2007-07-10 12:19:05.650671612 +0200 -@@ -1,4 +1,12 @@ - 2007-05-06 Nicolas Boullis <nboullis@debian.org> -+2007-05-14 Nicolas Boullis <nboullis@debian.org> -+ * modules/em8300_main.c: -+ Use pci_register_driver instead pci_module_init since the latter -+ is removed in linux 2.6.22. Thanks to Adam who noticed the problem -+ with linux 2.6.21-git5. The only expected change in behavior is -+ that the module won't fail to load with linux 2.4 kernels if no -+ em8300-based board is present. -+ - * configure.in, - modules/Makefile: - Release 0.16.2. ---- modules/em8300_main.c.old 2007-07-10 11:25:53.637633244 +0200 -+++ modules/em8300_main.c 2007-07-10 12:19:05.650671612 +0200 -@@ -800,10 +800,8 @@ - } - } - -- if ((err = pci_module_init(&em8300_driver)) < 0) { --#ifdef MODULE -- printk(KERN_ERR "Sigmadesigns EM8300 not found or device busy\n"); --#endif -+ if ((err = pci_register_driver(&em8300_driver)) < 0) { -+ printk(KERN_ERR "em8300: unable to register PCI driver\n"); - goto err_init; - } - 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 deleted file mode 100644 index 6064c3528f40..000000000000 --- a/media-video/em8300-modules/files/em8300-modules-0.17.2-kernel-2.6.30.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- 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 |