[arch-commits] CVS update of extra/multimedia/ivtv (6 files)
Paul Mattal
paul at archlinux.org
Tue Oct 9 13:45:04 UTC 2007
Date: Tuesday, October 9, 2007 @ 09:45:04
Author: paul
Path: /home/cvs-extra/extra/multimedia/ivtv
Removed: PKGBUILD (1.35) firmware.md5sums (1.2) ivtv-dma-errors.patch (1.1)
ivtv.install (1.8) kernel-2.6.20.patch (1.2)
kernel-2.6.21.patch (1.1)
Removed ivtv package
-----------------------+
PKGBUILD | 45 -------------------
firmware.md5sums | 4 -
ivtv-dma-errors.patch | 12 -----
ivtv.install | 31 -------------
kernel-2.6.20.patch | 112 ------------------------------------------------
kernel-2.6.21.patch | 59 -------------------------
6 files changed, 263 deletions(-)
Index: extra/multimedia/ivtv/PKGBUILD
diff -u extra/multimedia/ivtv/PKGBUILD:1.35 extra/multimedia/ivtv/PKGBUILD:removed
--- extra/multimedia/ivtv/PKGBUILD:1.35 Thu Jun 21 21:59:40 2007
+++ extra/multimedia/ivtv/PKGBUILD Tue Oct 9 09:45:04 2007
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD,v 1.35 2007/06/22 01:59:40 paul Exp $
-# Contributor: Sasha Zbrozek <kleptophobiac at gmail.com>
-# Maintainer: Paul Mattal <paul at archlinux.org>
-
-pkgname=ivtv
-pkgver=0.10.3
-pkgrel=1
-_kernver=2.6.21-ARCH
-pkgdesc="ivtv - Drivers for many types of PVR cards"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://ivtvdriver.org"
-install="ivtv.install"
-source=(http://dl.ivtvdriver.org/ivtv/archive/0.10.x/$pkgname-$pkgver.tar.gz kernel-2.6.21.patch)
-depends=(gcc 'ivtv-utils')
-md5sums=('c2ce439bca835f972f77400774546b90' 'f41cf670dc282c050bbd02abd454414b')
-
-build() {
- cd $startdir/src || return 1
-
- # SET UP
- cd $startdir/src/$pkgname-$pkgver || return 1
- # comment in the following line to turn off DMA transfers, if they're buggy
- # for you; they still are for me with PVR150 and Asus A8V
- #patch -Np1 <../ivtv-dma-errors.patch || return 1
- #patch -Np1 -i ../kernel-2.6.21.patch || return 1
-
- # don't call depmod here; we call it in the install script
- sed -i 's|/sbin/depmod -a||' driver/Makefile i2c-drivers/Makefile || return 1
-
- # install the utils in /usr/bin, not /usr/local/bin
- sed -i "s%PREFIX = /usr/local%PREFIX = /usr%g" utils/Makefile || return 1
-
- # build
- make INSTALLDIR=/usr/bin || return 1
-
- # install
- make DESTDIR=$startdir/pkg install || return 1
-
- # tweak the install script for the right kernel version
- sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/$pkgname.install || return 1
-
- # remove the non-modules; they're already installed in the -utils package
- rm -rf $startdir/pkg/{lib/firmware,usr} || return 1
-}
Index: extra/multimedia/ivtv/firmware.md5sums
diff -u extra/multimedia/ivtv/firmware.md5sums:1.2 extra/multimedia/ivtv/firmware.md5sums:removed
--- extra/multimedia/ivtv/firmware.md5sums:1.2 Thu Aug 4 23:38:21 2005
+++ extra/multimedia/ivtv/firmware.md5sums Tue Oct 9 09:45:04 2007
@@ -1,4 +0,0 @@
-305dba74bbe5905447add8883f3ecb68 ivtv-fw-dec.bin
-d85cb08382395390dc95ac6ebc2205f9 ivtv-fw-enc.bin
-5f5fa240ada73c3565f5f7de4c7b5138 HcwFalcn.rom
-3a4803384f749d644ee1f1ca9dcb12fa HcwMakoA.ROM
Index: extra/multimedia/ivtv/ivtv-dma-errors.patch
diff -u extra/multimedia/ivtv/ivtv-dma-errors.patch:1.1 extra/multimedia/ivtv/ivtv-dma-errors.patch:removed
--- extra/multimedia/ivtv/ivtv-dma-errors.patch:1.1 Sat Dec 16 01:22:39 2006
+++ extra/multimedia/ivtv/ivtv-dma-errors.patch Tue Oct 9 09:45:04 2007
@@ -1,12 +0,0 @@
-diff -urN ivtv-0.7.0/driver/ivtv-driver.h ivtv-0.7.0-fixed/driver/ivtv-driver.h
---- ivtv-0.7.0/driver/ivtv-driver.h 2006-06-24 17:50:32.000000000 -0400
-+++ ivtv-0.7.0-fixed/driver/ivtv-driver.h 2006-07-30 22:55:58.000000000 -0400
-@@ -223,7 +223,7 @@
- #define IVTV_DEC_PIO 1
- #else
- #define IVTV_VBI_PIO 0
--#define IVTV_ENC_PIO 0
-+#define IVTV_ENC_PIO 1
- #define IVTV_DEC_PIO 0
- #endif
- /* This sometimes times out, seems to kill
Index: extra/multimedia/ivtv/ivtv.install
diff -u extra/multimedia/ivtv/ivtv.install:1.8 extra/multimedia/ivtv/ivtv.install:removed
--- extra/multimedia/ivtv/ivtv.install:1.8 Sun Apr 29 04:42:41 2007
+++ extra/multimedia/ivtv/ivtv.install Tue Oct 9 09:45:04 2007
@@ -1,31 +0,0 @@
-pre_install() {
- /bin/true
-}
-
-post_install() {
- # updating module dependencies
- echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.21-ARCH
- depmod -v $KERNEL_VERSION > /dev/null 2>&1
- /bin/true
-}
-
-post_upgrade() {
- # updating module dependencies
- echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.21-ARCH
- depmod -v $KERNEL_VERSION > /dev/null 2>&1
- /bin/true
-}
-
-post_remove() {
- # updating module dependencies
- echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.21-ARCH
- depmod -v $KERNEL_VERSION > /dev/null 2>&1
- /bin/true
-}
-
-op=$1
-shift
-$op $*
Index: extra/multimedia/ivtv/kernel-2.6.20.patch
diff -u extra/multimedia/ivtv/kernel-2.6.20.patch:1.2 extra/multimedia/ivtv/kernel-2.6.20.patch:removed
--- extra/multimedia/ivtv/kernel-2.6.20.patch:1.2 Sat Feb 17 01:51:50 2007
+++ extra/multimedia/ivtv/kernel-2.6.20.patch Tue Oct 9 09:45:04 2007
@@ -1,112 +0,0 @@
-Index: /ivtv/trunk/driver/ivtv-i2c.c
-===================================================================
---- /ivtv/trunk/driver/ivtv-i2c.c (revision 3731)
-+++ /ivtv/trunk/driver/ivtv-i2c.c (revision 3797)
-@@ -734,4 +734,7 @@
- sizeof(struct i2c_client));
- itv->i2c_client.adapter = &itv->i2c_adap;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
-+ itv->i2c_adap.dev.parent = &itv->dev->dev;
-+#endif
-
- IVTV_DEBUG_I2C("setting scl and sda to 1\n");
-@@ -749,4 +752,7 @@
- IVTV_DEBUG_I2C("i2c exit\n");
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
-+ i2c_del_adapter(&itv->i2c_adap);
-+#else
- if (itv->options.newi2c > 0) {
- i2c_del_adapter(&itv->i2c_adap);
-@@ -754,3 +760,4 @@
- i2c_bit_del_bus(&itv->i2c_adap);
- }
--}
-+#endif
-+}
-Index: /ivtv/trunk/driver/ivtv-vbi.c
-===================================================================
---- /ivtv/trunk/driver/ivtv-vbi.c (revision 3785)
-+++ /ivtv/trunk/driver/ivtv-vbi.c (revision 3797)
-@@ -455,7 +455,14 @@
- }
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
-+void vbi_work_handler(struct work_struct *work)
-+{
-+ struct vbi_info *info = container_of(work, struct vbi_info, work_queue);
-+ struct ivtv *itv = container_of(info, struct ivtv, vbi);
-+#else
- void vbi_work_handler(void *arg)
- {
- struct ivtv *itv = arg;
-+#endif
- struct v4l2_sliced_vbi_data data;
- DEFINE_WAIT(wait);
-Index: /ivtv/trunk/driver/ivtv-yuv.c
-===================================================================
---- /ivtv/trunk/driver/ivtv-yuv.c (revision 3765)
-+++ /ivtv/trunk/driver/ivtv-yuv.c (revision 3797)
-@@ -805,7 +805,14 @@
-
- /* Update the scaling register to the requested value */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
-+void ivtv_yuv_work_handler (struct work_struct *work)
-+{
-+ struct yuv_playback_info *info = container_of(work, struct yuv_playback_info, work_queue);
-+ struct ivtv *itv = container_of(info, struct ivtv, yuv_info);
-+#else
- void ivtv_yuv_work_handler (void *arg)
- {
- struct ivtv *itv = arg;
-+#endif
- DEFINE_WAIT(wait);
-
-Index: /ivtv/trunk/driver/ivtv-vbi.h
-===================================================================
---- /ivtv/trunk/driver/ivtv-vbi.h (revision 3786)
-+++ /ivtv/trunk/driver/ivtv-vbi.h (revision 3797)
-@@ -24,4 +24,8 @@
- void ivtv_disable_vbi(struct ivtv *itv);
- void ivtv_set_vbi(unsigned long arg);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
-+void vbi_work_handler(struct work_struct *work);
-+#else
- void vbi_work_handler(void *arg);
-+#endif
- void vbi_schedule_work(struct ivtv *itv);
-Index: /ivtv/trunk/driver/ivtv-yuv.h
-===================================================================
---- /ivtv/trunk/driver/ivtv-yuv.h (revision 3757)
-+++ /ivtv/trunk/driver/ivtv-yuv.h (revision 3797)
-@@ -20,3 +20,7 @@
- int ivtv_yuv_prep_frame(struct ivtv *itv, struct ivtvyuv_ioctl_dma_host_to_ivtv_args *args);
- void ivtv_yuv_close(struct ivtv *itv);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
-+void ivtv_yuv_work_handler (struct work_struct *work);
-+#else
- void ivtv_yuv_work_handler (void *arg);
-+#endif
-Index: /ivtv/trunk/driver/ivtv-driver.c
-===================================================================
---- /ivtv/trunk/driver/ivtv-driver.c (revision 3795)
-+++ /ivtv/trunk/driver/ivtv-driver.c (revision 3797)
-@@ -635,6 +635,11 @@
- }
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
-+ INIT_WORK(&itv->vbi.work_queue, vbi_work_handler);
-+ INIT_WORK(&itv->yuv_info.work_queue, ivtv_yuv_work_handler);
-+#else
- INIT_WORK(&itv->vbi.work_queue, vbi_work_handler, itv);
- INIT_WORK(&itv->yuv_info.work_queue, ivtv_yuv_work_handler, itv);
-+#endif
-
- /* start counting open_id at 1 */
-@@ -1271,6 +1276,4 @@
- /* Stop all Work Queues */
- IVTV_DEBUG_INFO(" Stop Work Queues.\n");
-- cancel_delayed_work(&itv->vbi.work_queue);
-- cancel_delayed_work(&itv->yuv_info.work_queue);
- flush_workqueue(itv->vbi.work_queues);
- flush_workqueue(itv->yuv_info.work_queues);
Index: extra/multimedia/ivtv/kernel-2.6.21.patch
diff -u extra/multimedia/ivtv/kernel-2.6.21.patch:1.1 extra/multimedia/ivtv/kernel-2.6.21.patch:removed
--- extra/multimedia/ivtv/kernel-2.6.21.patch:1.1 Sun Apr 29 04:42:41 2007
+++ extra/multimedia/ivtv/kernel-2.6.21.patch Tue Oct 9 09:45:04 2007
@@ -1,59 +0,0 @@
-diff -u -r 0.10.1/driver/ivtv-ioctl.c 0.10.1p/driver/ivtv-ioctl.c
---- 0.10.1/driver/ivtv-ioctl.c 2007-02-18 04:34:16.000000000 -0500
-+++ 0.10.1p/driver/ivtv-ioctl.c 2007-04-27 13:37:55.000000000 -0400
-@@ -556,8 +556,8 @@
- /* ioctls to allow direct access to the encoder registers for testing */
- case VIDIOC_INT_G_REGISTER:
- IVTV_DEBUG_IOCTL("VIDIOC_INT_G_REGISTER\n");
-- if (reg->i2c_id)
-- return ivtv_i2c_id(itv, reg->i2c_id, cmd, reg);
-+ if (reg->match_type == V4L2_CHIP_MATCH_I2C_DRIVER)
-+ return ivtv_i2c_id(itv, reg->match_chip, cmd, reg);
- return ivtv_itvc(itv, cmd, arg);
-
- case VIDIOC_INT_S_REGISTER:
-@@ -566,8 +566,8 @@
- cmd = VIDIOC_INT_S_REGISTER;
- #endif
- IVTV_DEBUG_IOCTL("VIDIOC_INT_S_REGISTER\n");
-- if (reg->i2c_id)
-- return ivtv_i2c_id(itv, reg->i2c_id, cmd, reg);
-+ if (reg->match_type == V4L2_CHIP_MATCH_I2C_DRIVER)
-+ return ivtv_i2c_id(itv, reg->match_chip, cmd, reg);
- return ivtv_itvc(itv, cmd, arg);
-
- case VIDIOC_INT_S_AUDIO_ROUTING: {
-diff -u -r 0.10.1/i2c-drivers/saa717x.c 0.10.1p/i2c-drivers/saa717x.c
---- 0.10.1/i2c-drivers/saa717x.c 2006-11-24 08:48:32.000000000 -0500
-+++ 0.10.1p/i2c-drivers/saa717x.c 2007-04-27 14:02:55.000000000 -0400
-@@ -62,6 +62,11 @@
- #include <linux/i2c.h>
- #include <media/v4l2-common.h>
-
-+#ifdef VIDIOC_DBG_S_REGISTER
-+#define VIDIOC_INT_S_REGISTER VIDIOC_DBG_S_REGISTER
-+#define VIDIOC_INT_G_REGISTER VIDIOC_DBG_G_REGISTER
-+#endif
-+
- MODULE_DESCRIPTION("Philips SAA717x video decoder driver");
- MODULE_AUTHOR("Kevin Thayer, K. Ohta");
- MODULE_LICENSE("GPL");
-@@ -1257,7 +1262,7 @@
- {
- struct v4l2_register *reg = arg;
-
-- if (reg->i2c_id != I2C_DRIVERID_SAA717X)
-+ if (reg->match_type == V4L2_CHIP_MATCH_I2C_DRIVER && reg->match_chip != I2C_DRIVERID_SAA717X)
- return -EINVAL;
- reg->val = saa717x_read(client, reg->reg);
- break;
-@@ -1269,7 +1274,7 @@
- u16 addr = reg->reg & 0xffff;
- u8 val = reg->val & 0xff;
-
-- if (reg->i2c_id != I2C_DRIVERID_SAA717X)
-+ if (reg->match_type == V4L2_CHIP_MATCH_I2C_DRIVER && reg->match_chip != I2C_DRIVERID_SAA717X)
- return -EINVAL;
- if (!capable(CAP_SYS_ADMIN))
- return -EPERM;
-
More information about the arch-commits
mailing list