From c53cf52b9b7a43af91d36bd572ab49bb9ee21f7a Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Nov 07 2008 22:51:04 +0000 Subject: New upstream version with Fedora-local patch merged. --- diff --git a/.cvsignore b/.cvsignore index 47557b1..d223caa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libmtp-0.3.3.tar.gz +libmtp-0.3.4.tar.gz diff --git a/libmtp-add-more-nokia-phones.patch b/libmtp-add-more-nokia-phones.patch deleted file mode 100644 index e11d1ba..0000000 --- a/libmtp-add-more-nokia-phones.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- libmtp-0.3.3/src/music-players.h.n82 2008-09-24 00:02:23.000000000 +0100 -+++ libmtp-0.3.3/src/music-players.h 2008-10-25 15:38:13.000000000 +0100 -@@ -438,7 +441,8 @@ - * This is actually a camera, but it has a Microsoft device descriptor - * and reports itself as supporting the MTP extension. - */ -- { "Canon", 0x04a9, "PowerShot A640 (PTP/MTP mode)", 0x3139, DEVICE_FLAG_NONE }, -+ { "Canon", 0x04a9, "PowerShot A640 (PTP/MTP mode)", 0x3139, -+ DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL }, - - /* - * Nokia -@@ -458,10 +462,20 @@ - { "Nokia", 0x0421, "5310 XpressMusic", 0x006c, DEVICE_FLAG_NONE }, - // From: robin (AT) headbank D0Tco DOTuk - { "Nokia", 0x0421, "N95 Mobile Phone 8GB", 0x006e, DEVICE_FLAG_NONE }, -+ // From Bastien Nocera -+ { "Nokia", 0x0421, "N82 Mobile Phone", 0x0074, DEVICE_FLAG_NONE }, - // From: danielw - { "Nokia", 0x0421, "E71", 0x00e4, DEVICE_FLAG_NONE }, - // From: Laurent Bigonville - { "Nokia", 0x0421, "E66", 0x00e5, DEVICE_FLAG_NONE }, -+ // From: http://nds2.nokia.com/files/support/global/phones/software/Nokia_3250_WMP10_driver.inf -+ { "Nokia", 0x0421, "3250 Mobile Phone", 0x0462, DEVICE_FLAG_NONE }, -+ // From http://nds2.nokia.com/files/support/global/phones/software/Nokia_N93_WMP10_Driver.inf -+ { "Nokia", 0x0421, "N93 Mobile Phone", 0x0478, DEVICE_FLAG_NONE }, -+ // From: http://nds2.nokia.com/files/support/global/phones/software/Nokia_5500_Sport_WMP10_driver.inf -+ { "Nokia", 0x0421, "5500 Sport Mobile Phone", 0x047e, DEVICE_FLAG_NONE }, -+ // From http://nds2.nokia.com/files/support/global/phones/software/Nokia_N91_WMP10_Driver.inf -+ { "Nokia", 0x0421, "N91 Mobile Phone", 0x0485, DEVICE_FLAG_NONE }, - // From: Christian Rusa - { "Nokia", 0x0421, "5700 XpressMusic Mobile Phone", 0x04b4, DEVICE_FLAG_NONE }, - // From: Mitchell Hicks -@@ -470,6 +484,8 @@ - { "Nokia", 0x0421, "N73 Mobile Phone", 0x04d1, DEVICE_FLAG_UNLOAD_DRIVER }, - // From Swapan - { "Nokia", 0x0421, "N75 Mobile Phone", 0x04e1, DEVICE_FLAG_NONE }, -+ // From: http://nds2.nokia.com/files/support/global/phones/software/Nokia_N93i_WMP10_driver.inf -+ { "Nokia", 0x0421, "N93i Mobile Phone", 0x04e5, DEVICE_FLAG_NONE }, - // From Anonymous Sourceforge User - { "Nokia", 0x0421, "N95 Mobile Phone", 0x04ef, DEVICE_FLAG_NONE }, - // From: Pat Nicholls -@@ -584,25 +600,35 @@ - // Reported by Jean-Marc Bourguet - { "Sony", 0x054c, "Walkman NWZ-S716F", 0x035a, DEVICE_FLAG_UNLOAD_DRIVER }, - // Reported by Anon SF User / Anthon van der Neut -- { "Sony", 0x054c, "Walkman NWZ-A828/NWZ-A829", 0x035b, DEVICE_FLAG_UNLOAD_DRIVER }, -+ { "Sony", 0x054c, "Walkman NWZ-A826/NWZ-A828/NWZ-A829", 0x035b, DEVICE_FLAG_UNLOAD_DRIVER }, - // Reported by Niek Klaverstijn - { "Sony", 0x054c, "Walkman NWZ-A728B", 0x035c, DEVICE_FLAG_UNLOAD_DRIVER }, -+ // Reported by Mehdi AMINI -+ { "Sony", 0x054c, "Walkman NWZ-B135", 0x036e, DEVICE_FLAG_UNLOAD_DRIVER }, -+ // Reported by Marco Filipe Nunes Soares Abrantes Pereira -+ { "Sony", 0x054c, "Walkman NWZ-S638F", 0x038e, DEVICE_FLAG_UNLOAD_DRIVER }, -+ - - /* - * SonyEricsson -+ * These initially seemed to support GetObjPropList but later revisions -+ * of the firmware seem to have broken it, so all are flagged as broken -+ * for now. - */ - // Reported by Øyvind Stegard -- { "SonyEricsson", 0x0fce, "K850i", 0x0075, DEVICE_FLAG_NONE }, -+ { "SonyEricsson", 0x0fce, "K850i", 0x0075, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST }, - // Reported by Michael Eriksson -- { "SonyEricsson", 0x0fce, "W910", 0x0076, DEVICE_FLAG_NONE }, -+ { "SonyEricsson", 0x0fce, "W910", 0x0076, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST }, - // Reported by Zack -- { "SonyEricsson", 0x0fce, "W890i", 0x00b3, DEVICE_FLAG_NONE }, -+ { "SonyEricsson", 0x0fce, "W890i", 0x00b3, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST }, - // Reported by robert dot ahlskog at gmail -- { "SonyEricsson", 0x0fce, "W760i", 0x00c6, DEVICE_FLAG_NONE }, -+ { "SonyEricsson", 0x0fce, "W760i", 0x00c6, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST }, - // Reported by Linus Åkesson -- { "SonyEricsson", 0x0fce, "C902", 0x00d4, DEVICE_FLAG_NONE }, -+ { "SonyEricsson", 0x0fce, "C902", 0x00d4, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST }, - // Reported by an anonymous SourceForge user -- { "SonyEricsson", 0x0fce, "C702", 0x00d9, DEVICE_FLAG_NONE }, -+ { "SonyEricsson", 0x0fce, "C702", 0x00d9, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST }, -+ // Reported by Christian Zuckschwerdt -+ { "SonyEricsson", 0x0fce, "W980", 0x00da, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST }, - - /* - * Motorola diff --git a/libmtp.spec b/libmtp.spec index 6f2bf55..45858ae 100644 --- a/libmtp.spec +++ b/libmtp.spec @@ -2,8 +2,8 @@ # RPM repository. Name: libmtp -Version: 0.3.3 -Release: 4%{?dist} +Version: 0.3.4 +Release: 1%{?dist} Summary: A software library for MTP media players URL: http://libmtp.sourceforge.net/ @@ -17,7 +17,6 @@ BuildRequires: libusb-devel BuildRequires: doxygen Patch0: libmtp-0.2.6.1-simpler-rules.patch -Patch1: libmtp-add-more-nokia-phones.patch %description This package provides a software library for communicating with MTP @@ -47,7 +46,6 @@ library for MTP media players. %prep %setup -q %patch0 -p1 -b .rules -%patch1 -p1 -b .more-nokia %build %configure --disable-static --program-prefix=mtp- @@ -101,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Nov 7 2008 Linus Walleij 0.3.4-1 +- New upstream bugfix release. +- Bastiens patch is upstreamed, dropping that patch. + * Sat Oct 25 2008 - Bastien Nocera - 0.3.3-4 - Update device list from CVS and fix the build diff --git a/sources b/sources index 4d9fadf..ab07274 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c2231df50d1755876bdfa7f3fdead7a2 libmtp-0.3.3.tar.gz +966a542542e9aec301cf0781e821dbd9 libmtp-0.3.4.tar.gz