From d04e09010c4b3ecbb687d19dad0aab190214f086939d133eb51cb2e2702358c8 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 10 Jan 2011 17:00:37 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/libmtp revision 37.0 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libmtp?expand=0&rev=81927145ed7dec94fb2e3c43052d9814 --- libmtp.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libmtp.spec b/libmtp.spec index 2297c03..a6eae47 100644 --- a/libmtp.spec +++ b/libmtp.spec @@ -1,7 +1,7 @@ # -# spec file for package libmtp (Version 1.0.3) +# spec file for package libmtp (Version 1.0.4) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -140,8 +140,6 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la %defattr(-, root, root) %{_prefix}/bin/* - - %files -n libmtp8 %defattr(-, root, root) %doc COPYING README ChangeLog AUTHORS From 51f5a4f22ce913675e1a5f2ee829e2310e857ad7dcb3b2fad2ed42494d47215e Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 25 Jan 2011 15:57:48 +0000 Subject: [PATCH 2/2] 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 | 33 +++++++++++++++++++ libmtp.changes | 5 +++ libmtp.spec | 2 ++ 3 files changed, 40 insertions(+) create mode 100644 0001-do-not-match-PTP-generic-interface.patch diff --git a/0001-do-not-match-PTP-generic-interface.patch b/0001-do-not-match-PTP-generic-interface.patch new file mode 100644 index 0000000..05c83ea --- /dev/null +++ b/0001-do-not-match-PTP-generic-interface.patch @@ -0,0 +1,33 @@ +From 9e516b92147fe6abbfe8c8eca593fb98e542e297 Mon Sep 17 00:00:00 2001 +From: Marcus Meissner +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 + diff --git a/libmtp.changes b/libmtp.changes index 1aa34bc..3d07af7 100644 --- a/libmtp.changes +++ b/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 diff --git a/libmtp.spec b/libmtp.spec index a6eae47..bfe34ee 100644 --- a/libmtp.spec +++ b/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