new version of ov511 drivers, includes new kernel patch. Yay.

svn path=/nixpkgs/trunk/; revision=5718

2 files changed, 42 insertions, 43 deletions

diff --git a/pkgs/os-specific/linux/ov511/default.nix b/pkgs/os-specific/linux/ov511/default.nix
index 3a6483bd07d5..151b78e298a0 100644
--- a/pkgs/os-specific/linux/ov511/default.nix
+++ b/pkgs/os-specific/linux/ov511/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, kernel}:
 
 stdenv.mkDerivation {
-  name = "ov511-2.30";
+  name = "ov511-2.32";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/ov511-2.30.tar.bz2;
-    md5 = "9eacf9e54f2f54a59ddbf14221a53f2a";
+    url = http://www.ovcam.org/ov511/download/2.xx/distros/ov511-2.32.tar.bz2;
+    md5 = "6a08025311649356242761641a1df0f2";
   };
   patches = [./ov511-kernel.patch];
   inherit kernel;
diff --git a/pkgs/os-specific/linux/ov511/ov511-kernel.patch b/pkgs/os-specific/linux/ov511/ov511-kernel.patch
index 98b1ec35e79e..e6a3e75f188e 100644
--- a/pkgs/os-specific/linux/ov511/ov511-kernel.patch
+++ b/pkgs/os-specific/linux/ov511/ov511-kernel.patch
@@ -1,40 +1,39 @@
-diff -ruN ov511-2.30/do_install.sh ov511-2.30.new/do_install.sh
---- ov511-2.30/do_install.sh	2003-11-12 09:24:29.000000000 +0100
-+++ ov511-2.30.new/do_install.sh	2006-01-03 16:34:44.000000000 +0100
-@@ -6,10 +6,10 @@
- 	exit 1
- fi
- 
--UNAME=`uname -r`
-+UNAME=$version
- 
--INSTALL_PATH_2_4=/lib/modules/$UNAME/kernel/drivers/usb/
--INSTALL_PATH_2_6=/lib/modules/$UNAME/kernel/drivers/usb/media/
-+INSTALL_PATH_2_4=$out/lib/modules/$UNAME/kernel/drivers/usb/
-+INSTALL_PATH_2_6=$out/lib/modules/$UNAME/kernel/drivers/usb/media/
- 
- MAJMIN=`echo $UNAME | cut -d . -f 1-2`
- 
-@@ -35,7 +35,7 @@
- 	install $MODULE $INSTALL_PATH
- done
- 
--echo Finding module dependencies
--/sbin/depmod -ae
-+#echo Finding module dependencies
-+#/sbin/depmod -ae
- 
- echo All done!
-diff -ruN ov511-2.30/Makefile ov511-2.30.new/Makefile
---- ov511-2.30/Makefile	2005-10-12 11:19:27.000000000 +0200
-+++ ov511-2.30.new/Makefile	2006-01-03 16:02:41.000000000 +0100
-@@ -112,7 +112,8 @@
- 
- else  # We were called from command line
- 
--KDIR := /lib/modules/$(shell uname -r)/build
-+#KDIR := /lib/modules/$(shell uname -r)/build
-+KDIR := $(kernel)/lib/modules/$(version)/build
- PWD  := $(shell pwd)
- 
- default:
+diff -rc ov511-2.32/do_install.sh ov511-2.32.new/do_install.sh
+*** ov511-2.32/do_install.sh	2003-11-12 09:24:29.000000000 +0100
+--- ov511-2.32.new/do_install.sh	2006-07-16 19:44:56.000000000 +0200
+***************
+*** 8,15 ****
+  
+  UNAME=`uname -r`
+  
+! INSTALL_PATH_2_4=/lib/modules/$UNAME/kernel/drivers/usb/
+! INSTALL_PATH_2_6=/lib/modules/$UNAME/kernel/drivers/usb/media/
+  
+  MAJMIN=`echo $UNAME | cut -d . -f 1-2`
+  
+--- 8,15 ----
+  
+  UNAME=`uname -r`
+  
+! INSTALL_PATH_2_4=$out/lib/modules/$UNAME/kernel/drivers/usb/
+! INSTALL_PATH_2_6=$out/lib/modules/$UNAME/kernel/drivers/usb/media/
+  
+  MAJMIN=`echo $UNAME | cut -d . -f 1-2`
+  
+***************
+*** 35,41 ****
+  	install $MODULE $INSTALL_PATH
+  done
+  
+! echo Finding module dependencies
+! /sbin/depmod -ae
+  
+  echo All done!
+--- 35,41 ----
+  	install $MODULE $INSTALL_PATH
+  done
+  
+! #echo Finding module dependencies
+! #/sbin/depmod -ae
+  
+  echo All done!