New upstream version.

This bumps soname so dependencies need to be rebuilt.

Signed-off-by: Linus Walleij <triad@df.lth.se>
This commit is contained in:
Linus Walleij 2011-06-08 21:05:24 +02:00
parent 94725784cb
commit 0bff02e1f7
4 changed files with 10 additions and 24 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ libmtp-1.0.3.tar.gz
*.rpm *.rpm
i386 i386
/libmtp-1.0.6.tar.gz /libmtp-1.0.6.tar.gz
/libmtp-1.1.0.tar.gz

View File

@ -2,14 +2,13 @@
# RPM repository. # RPM repository.
Name: libmtp Name: libmtp
Version: 1.0.6 Version: 1.1.0
Release: 3%{?dist} Release: 1%{?dist}
Summary: A software library for MTP media players Summary: A software library for MTP media players
URL: http://libmtp.sourceforge.net/ URL: http://libmtp.sourceforge.net/
Group: System Environment/Libraries Group: System Environment/Libraries
Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0: probe-3-ep-only.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+ License: LGPLv2+
Requires: udev Requires: udev
@ -43,7 +42,6 @@ library for MTP media players.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
%configure --disable-static \ %configure --disable-static \
@ -103,6 +101,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Jun 08 2011 Linus Walleij <triad@df.lth.se> 1.1.0-1
- New upstream version including fixed bugs and the patch we
used to carry. Dependecies need to be rebuilt. (New
soversion)
* Tue Jun 07 2011 Linus Walleij <triad@df.lth.se> 1.0.6-3 * Tue Jun 07 2011 Linus Walleij <triad@df.lth.se> 1.0.6-3
- Nuke HAL dependency. - Nuke HAL dependency.

View File

@ -1,18 +0,0 @@
diff --git a/src/libusb-glue.c b/src/libusb-glue.c
index 5d7889b..3c0a124 100644
--- a/src/libusb-glue.c
+++ b/src/libusb-glue.c
@@ -284,6 +284,13 @@ static int probe_device_descriptor(struct usb_device *dev, FILE *dumpfile)
&dev->config[i].interface[j].altsetting[k];
/*
+ * MTP interfaces have three endpoints, two bulk and one
+ * interrupt. Don't probe anything else.
+ */
+ if (intf->bNumEndpoints != 3)
+ continue;
+
+ /*
* We only want to probe for the OS descriptor if the
* device is USB_CLASS_VENDOR_SPEC or one of the interfaces
* in it is, so flag if we find an interface like this.

View File

@ -1 +1 @@
7d3c624d768adba8537f8bc9c0a82cbf libmtp-1.0.6.tar.gz fd7b293436528f4c780a9da6e5cc5398 libmtp-1.1.0.tar.gz