[arch-commits] CVS update of extra/modules/km (3 files)
Eric Belanger
eric at archlinux.org
Wed Dec 12 06:47:54 UTC 2007
Date: Wednesday, December 12, 2007 @ 01:47:54
Author: eric
Path: /home/cvs-extra/extra/modules/km
Removed: PKGBUILD (1.1) build-2.6.20.patch (1.1) module.install (1.1)
extra repo cleanup
--------------------+
PKGBUILD | 28 -----
build-2.6.20.patch | 252 ---------------------------------------------------
module.install | 19 ---
3 files changed, 299 deletions(-)
Index: extra/modules/km/PKGBUILD
diff -u extra/modules/km/PKGBUILD:1.1 extra/modules/km/PKGBUILD:removed
--- extra/modules/km/PKGBUILD:1.1 Mon Feb 12 03:42:07 2007
+++ extra/modules/km/PKGBUILD Wed Dec 12 01:47:54 2007
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD,v 1.1 2007/02/12 08:42:07 aaron Exp $
-# Maintainer: damir <damir at archlinux.org>
-# Maintainer : Aaron Griffin <aaron at archlinux.org>
-
-pkgname=km
-pkgver=0.6.1
-pkgrel=1
-_kernver=2.6.20-ARCH
-pkgdesc="Video4linux interface to video capture capabilities of Mach64, Rage128 and Radeon cards for the Kernel 2.6"
-url="http://gatos.sourceforge.net/km.php"
-replaces=('kernel26-km')
-install=module.install
-source=(http://easynews.dl.sourceforge.net/sourceforge/gatos/$pkgname-$pkgver.tgz
- build-2.6.20.patch)
-md5sums=('0bec695aaa0b4d9793a5c65e91842771' '7a3ab57fa4ffbc34261d56042bb32ef2')
-
-build() {
- cd $startdir/src/km
-
- cp Makefile-2.6 Makefile
- patch -up1 < ../build-2.6.20.patch
-
- make KDIR=/lib/modules/$_kernver/build || return 1
- make INSTALL_MOD_PATH=$startdir/pkg KDIR=/lib/modules/$_kernver/build \
- install || return 1
-
- sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/*.install
-}
Index: extra/modules/km/build-2.6.20.patch
diff -u extra/modules/km/build-2.6.20.patch:1.1 extra/modules/km/build-2.6.20.patch:removed
--- extra/modules/km/build-2.6.20.patch:1.1 Mon Feb 12 03:42:07 2007
+++ extra/modules/km/build-2.6.20.patch Wed Dec 12 01:47:54 2007
@@ -1,252 +0,0 @@
-diff -ur km/km.c kmcvs/km.c
---- km/km.c 2005-06-19 02:18:43.000000000 -0500
-+++ kmcvs/km.c 2006-12-05 10:28:36.000000000 -0600
-@@ -20,9 +20,9 @@
- #endif
-
- #include <linux/types.h>
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
-+#include <linux/moduleparam.h>
- #include <linux/kmod.h>
- #include <linux/kernel.h>
- #include <linux/sched.h>
-@@ -32,8 +32,11 @@
- #ifndef LINUX_2_6
- #include <linux/wrapper.h>
- #endif
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17)
-+#include <media/v4l2-dev.h>
-+#else
- #include <linux/videodev.h>
--
-+#endif
-
- #include "km_api.h"
- #include "km.h"
-@@ -47,20 +50,17 @@
- MODULE_LICENSE("GPL");
- #endif
-
-+int km_debug=0;
-+int km_buffers=5;
-+
- MODULE_DESCRIPTION("km_drv");
--MODULE_PARM(km_debug, "i");
--MODULE_PARM(km_debug_overruns, "i");
--MODULE_PARM(km_buffers, "i");
-+module_param(km_debug, int, 0);
-+module_param(km_buffers, int, 0);
- MODULE_PARM_DESC(km_debug, "kmultimedia debugging level");
--MODULE_PARM_DESC(km_debug_overruns, "kmultimedia debug overruns");
- MODULE_PARM_DESC(km_buffers, "how many buffers to use for video capture per each device");
-
- #define POINTER_TO_INT( x ) ((unsigned long)(x))
-
--int km_debug=0;
--int km_debug_overruns=0;
--int km_buffers=5;
--
- int find_free_buffer(KM_STREAM *stream)
- {
- int next;
-@@ -632,7 +632,7 @@
- kms->vbi.info_du=-1;
- spin_lock_init(&(kms->kms_lock));
- printk(KERN_DEBUG "km: using irq %ld\n", kms->irq);
-- printk(KERN_DEBUG "Register aperture is 0x%08lx 0x%08lx\n", pci_resource_start(dev, 2), pci_resource_len(dev, 2));
-+ printk(KERN_DEBUG "Register aperture is 0x%08llx 0x%08llx\n", (long long)pci_resource_start(dev, 2), (long long)pci_resource_len(dev, 2));
- /*
- if (!request_mem_region(pci_resource_start(dev,2),
- pci_resource_len(dev,2),
-@@ -1023,10 +1023,13 @@
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RAGE128},
- #endif
- /* Radeons */
-+ /* Kernel 2.6.15 does not define these */
-+#ifdef PCI_DEVICE_ID_ATI_RADEON_LE
- {PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_LE,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RADEON},
- {PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_LF,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RADEON},
-+#endif
- {PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_N1,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RADEON},
- {PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_N2,
-@@ -1083,15 +1086,12 @@
- printk(KERN_INFO "Kmultimedia module version %s loaded\n", KM_VERSION);
- printk(KERN_DEBUG "Page size is %ld sizeof(bm_list_descriptor)=%ld sizeof(KM_STRUCT)=%ld\n", PAGE_SIZE, (unsigned long)sizeof(bm_list_descriptor), (unsigned long)sizeof(KM_STRUCT));
- num_devices=0;
-- pci_module_init( &km_pci_driver );
--
-- return 0;
-+ return pci_module_init( &km_pci_driver );
- }
-
- void __exit km_cleanup_module(void)
- {
- pci_unregister_driver( &km_pci_driver );
-- return;
- }
-
- module_init(km_init_module);
-diff -ur km/km_api.c kmcvs/km_api.c
---- km/km_api.c 2004-12-16 08:30:56.000000000 -0600
-+++ kmcvs/km_api.c 2006-12-04 13:45:00.000000000 -0600
-@@ -19,13 +19,15 @@
- #include <linux/proc_fs.h>
-
- #include <linux/types.h>
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/sched.h>
- #include <linux/init.h>
- #include <linux/poll.h>
-+#ifndef LINUX_2_6
-+#include <linux/config.h>
-+#endif
-
- #include "km_api.h"
- #include "km_api_data.h"
-@@ -93,7 +95,6 @@
-
- if(kmfpd->br_free+10>=kmfpd->br_size)expand_buffer(kmfpd, 10);
- kmfpd->br_free+=sprintf(kmfpd->buffer_read+kmfpd->br_free, "+STATUS\n");
--
- for(i=0;kmd->fields[i].type!=KM_FIELD_TYPE_EOL;i++){
- f=&(kmd->fields[i]);
- switch(f->type){
-diff -ur km/km_api_data.c kmcvs/km_api_data.c
---- km/km_api_data.c 2005-03-09 02:35:36.000000000 -0600
-+++ kmcvs/km_api_data.c 2006-12-04 13:45:00.000000000 -0600
-@@ -19,7 +19,6 @@
- #include <linux/proc_fs.h>
-
- #include <linux/types.h>
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
-@@ -27,6 +26,9 @@
- #include <linux/init.h>
- #include <linux/poll.h>
- #include <linux/pci.h>
-+#ifndef LINUX_2_6
-+#include <linux/config.h>
-+#endif
-
- #include "km_api_data.h"
- #include "km_memory.h"
-diff -ur km/km_api_data.h kmcvs/km_api_data.h
---- km/km_api_data.h 2003-02-09 10:37:02.000000000 -0600
-+++ kmcvs/km_api_data.h 2006-12-04 13:45:03.000000000 -0600
-@@ -9,6 +9,7 @@
- #ifndef __KM_DATA_H__
- #define __KM_DATA_H__
-
-+#include <linux/poll.h>
- #include <linux/spinlock.h>
-
-
-diff -ur km/km_memory.c kmcvs/km_memory.c
---- km/km_memory.c 2004-01-11 15:10:23.000000000 -0600
-+++ kmcvs/km_memory.c 2006-12-04 13:45:03.000000000 -0600
-@@ -15,7 +15,6 @@
- #endif
-
- #include <linux/types.h>
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
-@@ -24,6 +23,7 @@
- #include <linux/pci.h>
- #include <linux/interrupt.h>
- #ifndef LINUX_2_6
-+#include <linux/config.h>
- #include <linux/wrapper.h>
- #endif
- #include <linux/mm.h>
-diff -ur km/km_v4l.c kmcvs/km_v4l.c
---- km/km_v4l.c 2005-04-26 03:06:04.000000000 -0500
-+++ kmcvs/km_v4l.c 2006-12-04 13:45:03.000000000 -0600
-@@ -14,7 +14,6 @@
- #endif
-
- #include <linux/types.h>
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
-@@ -22,7 +21,11 @@
- #include <linux/init.h>
- #include <linux/pci.h>
- #include <linux/interrupt.h>
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17)
-+#include <media/v4l2-dev.h>
-+#else
- #include <linux/videodev.h>
-+#endif
-
- #include "km.h"
- #include "km_memory.h"
-diff -ur km/mach64.c kmcvs/mach64.c
---- km/mach64.c 2005-04-04 07:16:05.000000000 -0500
-+++ kmcvs/mach64.c 2006-12-04 13:45:03.000000000 -0600
-@@ -17,7 +17,6 @@
- #endif
-
- #include <linux/types.h>
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
-@@ -26,6 +25,7 @@
- #include <linux/pci.h>
- #include <linux/interrupt.h>
- #ifndef LINUX_2_6
-+#include <linux/config.h>
- #include <linux/wrapper.h>
- #endif
- #include <linux/videodev.h>
-diff -ur km/radeon.c kmcvs/radeon.c
---- km/radeon.c 2004-11-22 12:50:06.000000000 -0600
-+++ kmcvs/radeon.c 2006-12-04 13:45:03.000000000 -0600
-@@ -17,7 +17,6 @@
- #endif
-
- #include <linux/types.h>
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
-@@ -26,6 +25,7 @@
- #include <linux/pci.h>
- #include <linux/interrupt.h>
- #ifndef LINUX_2_6
-+#include <linux/config.h>
- #include <linux/wrapper.h>
- #endif
- #include <linux/videodev.h>
-diff -ur km/rage128.c kmcvs/rage128.c
---- km/rage128.c 2005-04-04 07:16:05.000000000 -0500
-+++ kmcvs/rage128.c 2006-12-04 13:45:03.000000000 -0600
-@@ -17,7 +17,6 @@
- #endif
-
- #include <linux/types.h>
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
-@@ -26,6 +25,7 @@
- #include <linux/pci.h>
- #include <linux/interrupt.h>
- #ifndef LINUX_2_6
-+#include <linux/config.h>
- #include <linux/wrapper.h>
- #endif
- #include <linux/videodev.h>
Index: extra/modules/km/module.install
diff -u extra/modules/km/module.install:1.1 extra/modules/km/module.install:removed
--- extra/modules/km/module.install:1.1 Mon Feb 12 03:42:07 2007
+++ extra/modules/km/module.install Wed Dec 12 01:47:54 2007
@@ -1,19 +0,0 @@
-post_install() {
- KERNEL_VERSION='2.6.20-ARCH'
- depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1
-}
-
-post_upgrade() {
- KERNEL_VERSION='2.6.20-ARCH'
- depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1
-
-}
-
-post_remove() {
- KERNEL_VERSION='2.6.20-ARCH'
- depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1
-}
-
-op=$1
-shift
-$op $*
More information about the arch-commits
mailing list