Accepting request 59120 from home:msmeissn:branches:devel:libraries:c_c++

ok

OBS-URL: https://build.opensuse.org/request/show/59120
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libmtp?expand=0&rev=23

0001-do-not-match-PTP-generic-interface.patch

@@ -0,0 +1,33 @@
+From 9e516b92147fe6abbfe8c8eca593fb98e542e297 Mon Sep 17 00:00:00 2001
+From: Marcus Meissner <meissner@novell.com>
+Date: Tue, 25 Jan 2011 16:05:02 +0100
+Subject: [PATCH] do not match PTP generic interface
+
+---
+ src/libusb-glue.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/libusb-glue.c b/src/libusb-glue.c
+index ea22384..e7fee3d 100644
+--- a/src/libusb-glue.c
++++ b/src/libusb-glue.c
+@@ -269,6 +269,8 @@ static int probe_device_descriptor(struct usb_device *dev, FILE *dumpfile)
+ 	  struct usb_interface_descriptor *intf =
+ 	    &dev->config[i].interface[j].altsetting[k];
+ 
++#if 0
++	/* This detects _all_ PTP cameras and marks them as MTP devices. Not good. -Marcus */
+ 	  /*
+ 	   * Check for Still Image Capture class with PIMA 15740 protocol,
+ 	   * also known as PTP
+@@ -284,6 +286,7 @@ static int probe_device_descriptor(struct usb_device *dev, FILE *dumpfile)
+             usb_close(devh);
+             return 1;
+ 	  }
++#endif
+           buf[0] = '\0';
+           ret = usb_get_string_simple(devh,
+ 				      dev->config[i].interface[j].altsetting[k].iInterface,
+-- 
+1.7.3.4
+

libmtp.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 25 16:08:21 CET 2011 - meissner@suse.de
+
+- do not greedily match all PTP cameras in the udev rules.
+
 -------------------------------------------------------------------
 Mon Jan 10 10:28:34 CET 2011 - meissner@suse.de
 

libmtp.spec

@@ -29,6 +29,7 @@ Summary:        Commandline utilities for access to MTP Players
 Version:        1.0.4
 Release:        1
 Source0:        %name-%version.tar.bz2
+Patch0:         0001-do-not-match-PTP-generic-interface.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -120,6 +121,7 @@ Authors:
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static