From 975f61646cc6d9d37c493c248faefaf2180278e2 Mon Sep 17 00:00:00 2001 From: Chí-Thanh Christopher Nguyễn Date: Tue, 22 Jun 2010 13:22:37 +0000 Subject: media-tv/em28xx-new: removing due to dead upstream svn path=/sunrise/; revision=10800 --- media-tv/em28xx-new/ChangeLog | 169 --------------------- media-tv/em28xx-new/Manifest | 7 - media-tv/em28xx-new/em28xx-new-0.0.20090409.ebuild | 55 ------- media-tv/em28xx-new/em28xx-new-9999.ebuild | 46 ------ media-tv/em28xx-new/files/em28xx-new-2.6.30.patch | 169 --------------------- .../em28xx-new/files/em28xx-video.c-2.6.29.patch | 85 ----------- media-tv/em28xx-new/metadata.xml | 6 - 7 files changed, 537 deletions(-) delete mode 100644 media-tv/em28xx-new/ChangeLog delete mode 100644 media-tv/em28xx-new/Manifest delete mode 100644 media-tv/em28xx-new/em28xx-new-0.0.20090409.ebuild delete mode 100644 media-tv/em28xx-new/em28xx-new-9999.ebuild delete mode 100644 media-tv/em28xx-new/files/em28xx-new-2.6.30.patch delete mode 100644 media-tv/em28xx-new/files/em28xx-video.c-2.6.29.patch delete mode 100644 media-tv/em28xx-new/metadata.xml (limited to 'media-tv') diff --git a/media-tv/em28xx-new/ChangeLog b/media-tv/em28xx-new/ChangeLog deleted file mode 100644 index 051c0a801..000000000 --- a/media-tv/em28xx-new/ChangeLog +++ /dev/null @@ -1,169 +0,0 @@ -# ChangeLog for media-tv/em28xx-new -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 23 Jun 2009; Chi-Thanh Christopher Nguyen (chithead) - -em28xx-new-0.0.20090403.36638895894479.ebuild, - +em28xx-new-0.0.20090409.ebuild, +files/em28xx-video.c-2.6.29.patch, - +files/em28xx-new-2.6.30.patch: - updated ebuild thanks to Roman v. Gemmeren (strowi), necessary due to the - demise of upstream's mercurial repository, fixes for building against kernel - >=2.6.29 - - 04 Apr 2009; Chi-Thanh Christopher Nguyen (chithead) - -em28xx-new-0.0.20090319.23522847372761.ebuild, - +em28xx-new-0.0.20090403.36638895894479.ebuild, em28xx-new-9999.ebuild: - new snapshot, workaround upstream repository changes breaking hg pull - - 22 Mar 2009; Chi-Thanh Christopher Nguyen (chithead) - +em28xx-new-0.0.20090319.23522847372761.ebuild, - -em28xx-new-0.0.20090319.129883114507514.ebuild: - new snapshot - - 19 Mar 2009; Chi-Thanh Christopher Nguyen (chithead) - - -em28xx-new-0.0.20090310.101983678627614.ebuild, - +em28xx-new-0.0.20090319.129883114507514.ebuild, em28xx-new-9999.ebuild: - update ebuilds per scarabeus' review, switch snapshot ebuild to - mercurial.eclass - - 12 Mar 2009; Chi-Thanh Christopher Nguyen (chithead) - - -em28xx-new-0.0.20090205.141440768558291.ebuild, - +em28xx-new-0.0.20090310.101983678627614.ebuild: - new snapshot - - 02 Mar 2009; Tomas Chvatal em28xx-new-9999.ebuild: - Live ebuilds dont have keywords. - - 18 Feb 2009; Chi-Thanh Christopher Nguyen (chithead) - - -em28xx-new-0.0.20090125.196710605282964.ebuild, - +em28xx-new-0.0.20090205.141440768558291.ebuild: - new snapshot - - 30 Jan 2009; Chi-Thanh Christopher Nguyen (chithead) - - -em28xx-new-0.0.20090112.236285216521220.ebuild, - +em28xx-new-0.0.20090125.196710605282964.ebuild: - new snapshot - - 12 Jan 2009; Chi-Thanh Christopher Nguyen (chithead) - -em28xx-new-0.0.20090102.89447327636187.ebuild, - +em28xx-new-0.0.20090112.236285216521220.ebuild: - new snapshot - - 03 Jan 2009; Chi-Thanh Christopher Nguyen (chithead) - - -em28xx-new-0.0.20081210.203090309120647.ebuild, - +em28xx-new-0.0.20090102.89447327636187.ebuild: - new snapshot - - 10 Dec 2008; Chi-Thanh Christopher Nguyen (chithead) - - -em28xx-new-0.0.20081205.164442080863453.ebuild, - +em28xx-new-0.0.20081210.203090309120647.ebuild: - new snapshot - - 08 Dec 2008; Chi-Thanh Christopher Nguyen (chithead) - - -em28xx-new-0.0.20081112.215070519445879.ebuild, - +em28xx-new-0.0.20081205.164442080863453.ebuild: - new snapshot - - 04 Dec 2008; Chi-Thanh Christopher Nguyen (chithead) - - -em28xx-new-0.0.20081112.207063107214357.ebuild, - +em28xx-new-0.0.20081112.215070519445879.ebuild: - new snapshot - - 12 Nov 2008; Chi-Thanh Christopher Nguyen (chithead) - -em28xx-new-0.0.20081028.52903001459882.ebuild, - +em28xx-new-0.0.20081112.207063107214357.ebuild: - new snapshot - - 29 Oct 2008; Chi-Thanh Christopher Nguyen (chithead) - - -em28xx-new-0.0.20081009.155562523910775.ebuild, - +em28xx-new-0.0.20081028.52903001459882.ebuild: - new snapshot - - 11 Oct 2008; Chi-Thanh Christopher Nguyen (chithead) - ChangeLog: - -em28xx-new-0.0.20080925.112389404453721.ebuild, - +em28xx-new-0.0.20081009.155562523910775.ebuild: - new snapshot - - 25 Sep 2008; Chi-Thanh Christopher Nguyen (chithead) - -em28xx-new-0.0.20080901.271564563085115.ebuild, - +em28xx-new-0.0.20080925.112389404453721.ebuild: - new snapshot - - 15 Aug 2008; Chi-Thanh Christopher Nguyen (chithead) - -em28xx-new-0.0.20080728.75350857812173.ebuild, - +em28xx-new-0.0.20080810.8734391005235.ebuild: - new snapshot - - 28 Jul 2008; Chi-Thanh Christopher Nguyen (chithead) - - -em28xx-new-0.0.20080724.141858238511747.ebuild, - +em28xx-new-0.0.20080728.75350857812173.ebuild: - new snapshot, remove unused base inherit - - 24 Jul 2008; Chi-Thanh Christopher Nguyen (chithead) - -em28xx-new-0.0.20080723.48406006002114.ebuild, - +em28xx-new-0.0.20080724.141858238511747.ebuild: - new snapshot - - 23 Jul 2008; Chi-Thanh Christopher Nguyen (chithead) - - -em28xx-new-0.0.20080720.113781112210523.ebuild, - +em28xx-new-0.0.20080723.48406006002114.ebuild: - new snapshot - - 21 Jul 2008; Chi-Thanh Christopher Nguyen (chithead) - - -em28xx-new-0.0.20080709.276798609861364.ebuild, - +em28xx-new-0.0.20080720.113781112210523.ebuild, - -files/em28xx-new-2.6.26.patch: - new snapshot, no longer needs patch for kernel 2.6.26 - - 20 Jul 2008; Thomas Sachau (Tommy[D]) - -em28xx-new-0.0.20080614.160257450985987.ebuild: - Drop old version - - 19 Jul 2008; Chi-Thanh Christopher Nguyen (chithead) - em28xx-new-9999.ebuild: - change installation method on live mercurial ebuild - - 19 Jul 2008; Chi-Thanh Christopher Nguyen (chithead) - - +em28xx-new-0.0.20080709.276798609861364.ebuild, - +files/em28xx-new-2.6.26.patch: - new snapshot, add patch for kernel 2.6.26 - - 23 Jun 2008; Chi-Thanh Christopher Nguyen (chithead) - em28xx-new-0.0.20080614.160257450985987.ebuild: - Allow mercurial revisions with leading zeroes - - 23 Jun 2008; Chi-Thanh Christopher Nguyen (chithead) - -em28xx-new-0_p20080619.ebuild, - +em28xx-new-0.0.20080614.160257450985987.ebuild: - Download snapshots directly from upstream, avoid cd ${S} in src_compile - - 23 Jun 2008; Thomas Anderson - em28xx-new-0_p20080619.ebuild: - Revert revision #6351, cd ${S} is really needed - - 22 Jun 2008; Thomas Anderson - em28xx-new-0_p20080619.ebuild: - Remove redundant directory change in src_compile, src_compile starts in ${S} - - 19 Jun 2008; Chi-Thanh Christopher Nguyen (chithead) - +em28xx-new-0_p20080619.ebuild: - add em28xx-new snapshot to satisfy carlo - - 19 Jun 2008; Chi-Thanh Christopher Nguyen (chithead) - +em28xx-new-9999.ebuild, +metadata.xml: - add media-tv/em28xx-new ebuild from bug 228111 - diff --git a/media-tv/em28xx-new/Manifest b/media-tv/em28xx-new/Manifest deleted file mode 100644 index 429067487..000000000 --- a/media-tv/em28xx-new/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX em28xx-new-2.6.30.patch 6230 RMD160 c38e32888174b0a7dbd23dceea0df81716b8a457 SHA1 0142a579ea1033aefb4460a1b64bc5a7f53d3241 SHA256 710fa78fa95e648ab76efc8c30979b97fed7cdd175c3db4584b40d352b578ab1 -AUX em28xx-video.c-2.6.29.patch 2920 RMD160 9d4254d839e6f15ca21d509d0eb126177e3436ac SHA1 f885a31e79ba53df1d782cb79658da53716b2505 SHA256 773aa03fef8aab92935a3bed6777debe6a282a68689a855748d3469643e62df4 -DIST em28xx-new-20090409.tar.bz2 218765 RMD160 e38ecb7a2cfecc389f2e9c790718355d9c948ec6 SHA1 597b54ee840ccb13da89aaa1dbbb4b6dc74ca4eb SHA256 e2d78d5de3e0ca7e597052510b3dfc5f280132d7a43eaa09943348c2078e6d0f -EBUILD em28xx-new-0.0.20090409.ebuild 1346 RMD160 abaf72a4d6dbe031f73424ec7a12e9d011422d14 SHA1 a53d43d3f2c9f2bd34bbb1e849b25d5e7d9f862d SHA256 73cc1e04f0161334be5488cc0e39a5f37228a4545c8fb5f296b46a6cc7ea7c6b -EBUILD em28xx-new-9999.ebuild 1165 RMD160 8fa868fcb4da01f58ab0bcc009dd4dc15ecce890 SHA1 8c6f9207a67f70f2bb183b78daa247930b7fab00 SHA256 10f5ad177438911e17b27b217e810ca014ffe4de8e14b9e9094a7ad64d1b5cb0 -MISC ChangeLog 6484 RMD160 3fc46507a5b561a510d3e2ceaad233aef8318d5a SHA1 c10e86ea39c8f0ab66409d6c08e4cae9e0bcd1bc SHA256 b1c06b38a29d164aa16afbde5a47647ee3f9b3d01d772ec9ff7fe30c3b50929c -MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f diff --git a/media-tv/em28xx-new/em28xx-new-0.0.20090409.ebuild b/media-tv/em28xx-new/em28xx-new-0.0.20090409.ebuild deleted file mode 100644 index 22ab021f2..000000000 --- a/media-tv/em28xx-new/em28xx-new-0.0.20090409.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit linux-info linux-mod versionator - -DESCRIPTION="next generation em28xx driver including dvb support" -HOMEPAGE="http://mcentral.de/" -SRC_URI="http://upload.hasnoname.de/${PN}/${PN}-$(get_version_component_range 3).tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -S=${WORKDIR}/${PN} - -CONFIG_CHECK="VIDEO_V4L2 DVB_CORE" - -pkg_setup() { - linux-mod_pkg_setup - if kernel_is lt 2 6 21; then - eerror "You need at least kernel 2.6.21" - die "Kernel too old" - fi - - if linux_chkconfig_present VIDEO_EM28XX; then - ewarn "In-kernel em28xx drivers enabled, disable or remove them from" - ewarn "/lib/modules/${KV_FULL} if you experience problems." - fi -} - -src_prepare() { - if kernel_is eq 2 6 29; then - epatch "${FILESDIR}"/em28xx-new-video.c-2.6.29.patch - fi - - if kernel_is ge 2 6 30; then - epatch "${FILESDIR}"/em28xx-new-2.6.30.patch - fi -} - -src_compile() { - set_arch_to_kernel - emake || die "Compiling kernel modules failed" -} - -src_install() { - insinto /lib/modules/${KV_FULL}/empia - local extglob_bak=$(shopt -p extglob) - shopt -s extglob # portage disables bash extglob in ebuilds - doins $(echo {!(precompiled)/,}*.ko) || die "doins failed" - eval ${extglob_bak} # restore previous extglob status -} diff --git a/media-tv/em28xx-new/em28xx-new-9999.ebuild b/media-tv/em28xx-new/em28xx-new-9999.ebuild deleted file mode 100644 index d713706cf..000000000 --- a/media-tv/em28xx-new/em28xx-new-9999.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit linux-info linux-mod mercurial - -EHG_REPO_URI="http://mcentral.de/hg/~mrec/em28xx-new/" -EHG_PULL_CMD="hg pull --force --quiet" # necessary until bug 264921 is fixed - -DESCRIPTION="next generation em28xx driver including dvb support" -HOMEPAGE="http://mcentral.de/" -SRC_URI="" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="" - -S=${WORKDIR}/${PN} - -CONFIG_CHECK="VIDEO_V4L2 DVB_CORE" - -pkg_setup() { - linux-mod_pkg_setup - if kernel_is lt 2 6 21; then - eerror "You need at least kernel 2.6.21" - die "Kernel too old" - fi - - if linux_chkconfig_present VIDEO_EM28XX; then - ewarn "In-kernel em28xx drivers enabled, disable or remove them from" - ewarn "/lib/modules/${KV_FULL} if you experience problems." - fi -} - -src_compile() { - set_arch_to_kernel - emake || die "Compiling kernel modules failed" -} - -src_install() { - insinto /lib/modules/${KV_FULL}/empia - local extglob_bak=$(shopt -p extglob) - shopt -s extglob # portage disables bash extglob in ebuilds - doins $(echo {!(precompiled)/,}*.ko) - eval ${extglob_bak} # restore previous extglob status -} diff --git a/media-tv/em28xx-new/files/em28xx-new-2.6.30.patch b/media-tv/em28xx-new/files/em28xx-new-2.6.30.patch deleted file mode 100644 index 6b5585f06..000000000 --- a/media-tv/em28xx-new/files/em28xx-new-2.6.30.patch +++ /dev/null @@ -1,169 +0,0 @@ -diff -urN em28xx-new.orig/cx25843/em28xx-cx25843.c em28xx-new/cx25843/em28xx-cx25843.c ---- em28xx-new.orig/cx25843/em28xx-cx25843.c 2009-04-09 19:28:53.000000000 +0200 -+++ em28xx-new/cx25843/em28xx-cx25843.c 2009-06-12 15:11:43.865650156 +0200 -@@ -23,6 +23,10 @@ - - #include "em28xx-cx25843.h" - -+#define VIDIOC_INT_S_VIDEO_ROUTING _IOW ('d', 111, struct v4l2_routing) -+#define VIDIOC_INT_G_VIDEO_ROUTING _IOR ('d', 112, struct v4l2_routing) -+#define VIDIOC_INT_S_AUDIO_ROUTING _IOW ('d', 109, struct v4l2_routing) -+ - MODULE_DESCRIPTION("cx25843 for Empia em28xx based devices"); - MODULE_AUTHOR("Markus Rechberger "); - MODULE_LICENSE("GPL"); -diff -urN em28xx-new.orig/em28xx-audio.c em28xx-new/em28xx-audio.c ---- em28xx-new.orig/em28xx-audio.c 2009-04-09 19:28:53.000000000 +0200 -+++ em28xx-new/em28xx-audio.c 2009-06-12 15:09:38.869977396 +0200 -@@ -46,6 +46,8 @@ - #include "em28xx.h" - #include "xc5000/xc5000_control.h" - -+#define VIDIOC_INT_S_AUDIO_ROUTING _IOW ('d', 109, struct v4l2_routing) -+ - static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; - static int em28xx_cmd(struct em28xx *dev, int cmd, int arg); - -diff -urN em28xx-new.orig/em28xx-i2c.c em28xx-new/em28xx-i2c.c ---- em28xx-new.orig/em28xx-i2c.c 2009-04-09 19:28:53.000000000 +0200 -+++ em28xx-new/em28xx-i2c.c 2009-06-12 15:08:44.596693725 +0200 -@@ -44,6 +44,8 @@ - - #include "xc5000/xc5000_control.h" - -+#define TUNER_SET_TYPE_ADDR _IOW('d', 90, int) -+ - - /* ----------------------------------------------------------- */ - -diff -urN em28xx-new.orig/em28xx-video.c em28xx-new/em28xx-video.c ---- em28xx-new.orig/em28xx-video.c 2009-04-22 15:19:52.000000000 +0200 -+++ em28xx-new/em28xx-video.c 2009-06-12 15:07:31.429010659 +0200 -@@ -53,6 +53,10 @@ - #include "xc5000/xc5000_module.h" - #include "cx25843/em28xx-cx25843.h" - -+#define VIDIOC_INT_S_VIDEO_ROUTING _IOW ('d', 111, struct v4l2_routing) -+#define VIDIOC_INT_I2S_CLOCK_FREQ _IOW ('d', 108, u32) -+#define VIDIOC_INT_S_AUDIO_ROUTING _IOW ('d', 109, struct v4l2_routing) -+ - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0) - #include "i2c-compat.h" - #include -@@ -578,9 +582,9 @@ - * inits the device and starts isoc transfer - */ - --static int em28xx_v4l2_open(struct inode *inode, struct file *filp) -+static int em28xx_v4l2_open(struct file *filp) - { -- int minor = iminor(inode); -+ int minor = video_devdata(filp)->minor; - int errCode = 0; - int mode = V4L2_TUNER_ANALOG_TV; - int type = 0; -@@ -880,7 +884,7 @@ - * stops streaming and deallocates all resources allocated by the - * v4l2 calls and ioctls - */ --static int em28xx_v4l2_close(struct inode *inode, struct file *filp) -+static int em28xx_v4l2_close(struct file *filp) - { - int errCode; - struct em28xx_fh *fh; -@@ -1169,7 +1173,7 @@ - * em28xx_v4l2_poll() - * will allocate buffers when called for the first time - */ --static unsigned int em28xx_v4l2_poll(struct file *filp, poll_table *wait) -+static unsigned int em28xx_v4l2_poll(struct file *filp, struct poll_table_struct *wait) - { - unsigned int mask = 0; - struct em28xx_fh *fh = filp->private_data; -@@ -1919,7 +1923,7 @@ - * em28xx_v4l2_ioctl() via em28xx_video_do_ioctl(). Userspace - * copying is done already, arg is a kernel pointer. - */ --static int em28xx_do_ioctl(struct inode *inode, struct file *filp, -+static int em28xx_do_ioctl(struct file *filp, - struct em28xx *dev, unsigned int cmd, void *arg, - v4l2_kioctl driver_ioctl) - { -@@ -2436,7 +2440,7 @@ - * em28xx_v4l2_ioctl. Userspace - * copying is done already, arg is a kernel pointer. - */ --static int em28xx_video_do_ioctl(struct inode *inode, struct file *filp, -+static int em28xx_video_do_ioctl(struct file *filp, - unsigned int cmd, void *arg) - { - struct em28xx_fh *fh = filp->private_data; -@@ -2459,8 +2463,8 @@ - strlcpy(cap->driver, "em28xx", sizeof(cap->driver)); - strlcpy(cap->card, em28xx_boards[dev->model].name, - sizeof(cap->card)); -- strlcpy(cap->bus_info, dev->udev->dev.bus_id, -- sizeof(cap->bus_info)); -+ /*strlcpy(cap->bus_info, dev->udev->dev.bus_id, -+ sizeof(cap->bus_info));*/ - cap->version = EM28XX_VERSION_CODE; - cap->capabilities = - #if 0 -@@ -2875,7 +2879,7 @@ - return em28xx_do_ioctl(inode, filp, dev, cmd, arg, - em28xx_video_do_ioctl); - #else -- return em28xx_do_ioctl(inode, filp, dev, cmd, arg, -+ return em28xx_do_ioctl(filp, dev, cmd, arg, - em28xx_v4l2_ioctl); - #endif - } -@@ -2930,7 +2934,7 @@ - * struct v4l2_ioctl_ops. The struct v4l2_ioctl_ops was introduced with commit - * http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=a399810ca69d9d4bd30ab8c1678c7439e567f90b - */ --static int em28xx_v4l2_ioctl_fops(struct inode *inode, struct file *filp, -+static int em28xx_v4l2_ioctl_fops(struct file *filp, - unsigned int cmd, unsigned long arg) - { - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 28) -@@ -2940,7 +2944,7 @@ - #endif - } - --static struct file_operations em28xx_v4l_fops = { -+static struct v4l2_file_operations em28xx_v4l_fops = { - .owner = THIS_MODULE, - .open = em28xx_v4l2_open, - .release = em28xx_v4l2_close, -@@ -2948,7 +2952,6 @@ - .read = em28xx_v4l2_read, - .poll = em28xx_v4l2_poll, - .mmap = em28xx_v4l2_mmap, -- .llseek = no_llseek, - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11) - #if 0 - .compat_ioctl = v4l_compat_ioctl32, -diff -urN em28xx-new.orig/tvp5150/tvp5150.c em28xx-new/tvp5150/tvp5150.c ---- em28xx-new.orig/tvp5150/tvp5150.c 2009-04-09 19:28:53.000000000 +0200 -+++ em28xx-new/tvp5150/tvp5150.c 2009-06-14 04:58:09.246216302 +0200 -@@ -9,7 +9,7 @@ - #include - #include - #include --#include -+//#include - #include - #include - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) -@@ -21,6 +21,10 @@ - - #include "tvp5150_reg.h" - -+#define VIDIOC_INT_S_VIDEO_ROUTING _IOW ('d', 111, struct v4l2_routing) -+#define VIDIOC_INT_G_VIDEO_ROUTING _IOR ('d', 112, struct v4l2_routing) -+#define I2C_DRIVERID_TVP5150 76 -+ - MODULE_DESCRIPTION("Texas Instruments TVP5150A video decoder driver"); - MODULE_AUTHOR("Mauro Carvalho Chehab"); - MODULE_LICENSE("GPL"); diff --git a/media-tv/em28xx-new/files/em28xx-video.c-2.6.29.patch b/media-tv/em28xx-new/files/em28xx-video.c-2.6.29.patch deleted file mode 100644 index 26f86957b..000000000 --- a/media-tv/em28xx-new/files/em28xx-video.c-2.6.29.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- em28xx-video.c.orig 2009-04-22 15:19:52.775497497 +0200 -+++ em28xx-video.c 2009-04-22 18:02:38.381164273 +0200 -@@ -578,9 +578,9 @@ - * inits the device and starts isoc transfer - */ - --static int em28xx_v4l2_open(struct inode *inode, struct file *filp) -+static int em28xx_v4l2_open(struct file *filp) - { -- int minor = iminor(inode); -+ int minor = video_devdata(filp)->minor; - int errCode = 0; - int mode = V4L2_TUNER_ANALOG_TV; - int type = 0; -@@ -880,7 +880,7 @@ - * stops streaming and deallocates all resources allocated by the - * v4l2 calls and ioctls - */ --static int em28xx_v4l2_close(struct inode *inode, struct file *filp) -+static int em28xx_v4l2_close(struct file *filp) - { - int errCode; - struct em28xx_fh *fh; -@@ -1169,7 +1169,7 @@ - * em28xx_v4l2_poll() - * will allocate buffers when called for the first time - */ --static unsigned int em28xx_v4l2_poll(struct file *filp, poll_table *wait) -+static unsigned int em28xx_v4l2_poll(struct file *filp, struct poll_table_struct *wait) - { - unsigned int mask = 0; - struct em28xx_fh *fh = filp->private_data; -@@ -1919,7 +1919,7 @@ - * em28xx_v4l2_ioctl() via em28xx_video_do_ioctl(). Userspace - * copying is done already, arg is a kernel pointer. - */ --static int em28xx_do_ioctl(struct inode *inode, struct file *filp, -+static int em28xx_do_ioctl(struct file *filp, - struct em28xx *dev, unsigned int cmd, void *arg, - v4l2_kioctl driver_ioctl) - { -@@ -2436,7 +2436,7 @@ - * em28xx_v4l2_ioctl. Userspace - * copying is done already, arg is a kernel pointer. - */ --static int em28xx_video_do_ioctl(struct inode *inode, struct file *filp, -+static int em28xx_video_do_ioctl(struct file *filp, - unsigned int cmd, void *arg) - { - struct em28xx_fh *fh = filp->private_data; -@@ -2875,7 +2875,7 @@ - return em28xx_do_ioctl(inode, filp, dev, cmd, arg, - em28xx_video_do_ioctl); - #else -- return em28xx_do_ioctl(inode, filp, dev, cmd, arg, -+ return em28xx_do_ioctl(filp, dev, cmd, arg, - em28xx_v4l2_ioctl); - #endif - } -@@ -2930,7 +2930,7 @@ - * struct v4l2_ioctl_ops. The struct v4l2_ioctl_ops was introduced with commit - * http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=a399810ca69d9d4bd30ab8c1678c7439e567f90b - */ --static int em28xx_v4l2_ioctl_fops(struct inode *inode, struct file *filp, -+static int em28xx_v4l2_ioctl_fops(struct file *filp, - unsigned int cmd, unsigned long arg) - { - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 28) -@@ -2940,7 +2940,7 @@ - #endif - } - --static struct file_operations em28xx_v4l_fops = { -+static struct v4l2_file_operations em28xx_v4l_fops = { - .owner = THIS_MODULE, - .open = em28xx_v4l2_open, - .release = em28xx_v4l2_close, -@@ -2948,7 +2948,6 @@ - .read = em28xx_v4l2_read, - .poll = em28xx_v4l2_poll, - .mmap = em28xx_v4l2_mmap, -- .llseek = no_llseek, - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11) - #if 0 - .compat_ioctl = v4l_compat_ioctl32, diff --git a/media-tv/em28xx-new/metadata.xml b/media-tv/em28xx-new/metadata.xml deleted file mode 100644 index e6233b5dc..000000000 --- a/media-tv/em28xx-new/metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - -no-herd -maintainer-wanted@gentoo.org - -- cgit v1.2.3-65-gdbad