packages: kernel-misc-lmpcm_usb/kernel-misc-lmpcm_usb.spec, kernel-misc-lmp...

[charles]

Author: charles                      Date: Mon Jul 26 18:45:40 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 0.5.8

---- Files affected:
packages/kernel-misc-lmpcm_usb:
   kernel-misc-lmpcm_usb.spec (1.15 -> 1.16) , lmpcm_usb-kernel_compatibility.patch (1.3 -> 1.4) , lmpcm_usb-print_info.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/kernel-misc-lmpcm_usb/kernel-misc-lmpcm_usb.spec
diff -u packages/kernel-misc-lmpcm_usb/kernel-misc-lmpcm_usb.spec:1.15 packages/kernel-misc-lmpcm_usb/kernel-misc-lmpcm_usb.spec:1.16
--- packages/kernel-misc-lmpcm_usb/kernel-misc-lmpcm_usb.spec:1.15	Sun May  3 14:26:51 2009
+++ packages/kernel-misc-lmpcm_usb/kernel-misc-lmpcm_usb.spec	Mon Jul 26 20:45:35 2010
@@ -9,12 +9,12 @@
 Summary:	USB Logitech MediaPlay Cordless Mouse driver for Linux
 Summary(pl.UTF-8):	Sterownik do myszy USB Logitech MediaPlay Cordless
 Name:		kernel%{_alt_kernel}-misc-%{pname}
-Version:	0.5.7
+Version:	0.5.8
 Release:	%{rel}@%{_kernel_ver_str}
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	http://daemon.prozone.org/~david/projects/lmpcm_usb/%{pname}-%{version}.tar.gz
-# Source0-md5:	a90b3ad9545b59e36bcc70526c39f028
+# Source0-md5:	4a862f3bc4a06cfd808defb680f8b455
 Patch0:		%{pname}-print_info.patch
 Patch1:		%{pname}-kernel_compatibility.patch
 URL:		http://daemon.prozone.org/~david/projects/lmpcm_usb/
@@ -66,6 +66,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2010/07/26 18:45:35  charles
+- updated to 0.5.8
+
 Revision 1.15  2009/05/03 12:26:51  charles
 - updated to 0.5.7
 

================================================================
Index: packages/kernel-misc-lmpcm_usb/lmpcm_usb-kernel_compatibility.patch
diff -u packages/kernel-misc-lmpcm_usb/lmpcm_usb-kernel_compatibility.patch:1.3 packages/kernel-misc-lmpcm_usb/lmpcm_usb-kernel_compatibility.patch:1.4
--- packages/kernel-misc-lmpcm_usb/lmpcm_usb-kernel_compatibility.patch:1.3	Sun May  3 14:27:32 2009
+++ packages/kernel-misc-lmpcm_usb/lmpcm_usb-kernel_compatibility.patch	Mon Jul 26 20:45:35 2010
@@ -1,5 +1,5 @@
---- lmpcm_usb-0.5.7/lmpcm_usb.c.orig	2009-05-03 14:02:09.000000000 +0200
-+++ lmpcm_usb-0.5.7/lmpcm_usb.c	2009-05-03 14:21:55.000000000 +0200
+--- ~lmpcm_usb-0.5.8/lmpcm_usb.c	2010-07-26 20:35:30.000000000 +0200
++++ lmpcm_usb-0.5.8/lmpcm_usb.c	2010-07-26 20:41:51.000000000 +0200
 @@ -30,7 +30,7 @@
  #include <linux/module.h>
  #include <linux/init.h>
@@ -7,7 +7,7 @@
 -
 +#include <linux/version.h>
  
- #define DRIVER_VERSION	"v0.5.7"
+ #define DRIVER_VERSION	"v0.5.8"
  #define DRIVER_AUTHOR	"David Oliveira <d.oliveira at prozone.org>"
 @@ -225,7 +225,11 @@
  
@@ -21,21 +21,31 @@
  
  	if (mouse->open++)
  		return 0;
-@@ -243,9 +247,11 @@
+@@ -243,7 +247,11 @@
  
  static void usb_lmpcm_close(struct input_dev *dev) {
  
--	//lmpcm_t *mouse = dev->private;
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
 +	lmpcm_t *mouse = dev->private;
 +#else
  	lmpcm_t *mouse = input_get_drvdata(dev);
--
 +#endif
  
  	if (!--mouse->open)
  		usb_kill_urb(mouse->urb);
-@@ -273,6 +279,25 @@
+@@ -254,7 +262,11 @@
+ 
+ 	char path[64];
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
++	lmpcm_t *mouse = dev->private;
++#else
+ 	lmpcm_t *mouse = (lmpcm_t *) input_get_drvdata(inputdev);
++#endif
+ 
+ 	int
+ 		x,
+@@ -271,6 +283,25 @@
  	for ( x = 0 ; keys[x] ; x++ )
  		set_bit(keys[x],inputdev->keybit);
  
@@ -61,7 +71,7 @@
  	// Add basic buttons
  
  	inputdev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE) |
-@@ -290,7 +315,7 @@
+@@ -288,7 +319,7 @@
  	// Private data structure
  
  	input_set_drvdata(inputdev, mouse);
@@ -70,7 +80,7 @@
  	// Input file operations
  
  	inputdev->open = usb_lmpcm_open;
-@@ -319,7 +344,7 @@
+@@ -317,7 +348,7 @@
  
  	struct usb_endpoint_descriptor *endpoint;
  	lmpcm_t *mouse;
@@ -79,7 +89,7 @@
  	char *buf;
  
  
-@@ -388,8 +413,16 @@
+@@ -386,8 +417,16 @@
  
  	// Register input device
  

================================================================
Index: packages/kernel-misc-lmpcm_usb/lmpcm_usb-print_info.patch
diff -u packages/kernel-misc-lmpcm_usb/lmpcm_usb-print_info.patch:1.1 packages/kernel-misc-lmpcm_usb/lmpcm_usb-print_info.patch:1.2
--- packages/kernel-misc-lmpcm_usb/lmpcm_usb-print_info.patch:1.1	Tue Jun  3 09:13:01 2008
+++ packages/kernel-misc-lmpcm_usb/lmpcm_usb-print_info.patch	Mon Jul 26 20:45:35 2010
@@ -18,12 +18,3 @@
  
  	// Set usb handler interface data
  
-@@ -447,7 +447,7 @@
- 
- 	rv = usb_register(&usb_lmpcm_driver);
- 
--	info(DRIVER_VERSION ":" DRIVER_DESC);
-+	printk(KERN_INFO "lmpcm_usb: %s : %s\n", DRIVER_VERSION, DRIVER_DESC);
- 
- 	return rv;
- }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-misc-lmpcm_usb/kernel-misc-lmpcm_usb.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-misc-lmpcm_usb/lmpcm_usb-kernel_compatibility.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-misc-lmpcm_usb/lmpcm_usb-print_info.patch?r1=1.1&r2=1.2&f=u