diff --git a/libmtp-add-more-nokia-phones.patch b/libmtp-add-more-nokia-phones.patch index f265c3c..e11d1ba 100644 --- a/libmtp-add-more-nokia-phones.patch +++ b/libmtp-add-more-nokia-phones.patch @@ -1,11 +1,22 @@ -Index: src/music-players.h -=================================================================== -RCS file: /cvsroot/libmtp/libmtp/src/music-players.h,v -retrieving revision 1.84 -diff -u -p -u -p -r1.84 music-players.h ---- src/music-players.h 24 Oct 2008 20:52:48 -0000 1.84 -+++ src/music-players.h 25 Oct 2008 14:19:44 -0000 -@@ -468,6 +468,14 @@ +--- 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 }, @@ -20,7 +31,7 @@ diff -u -p -u -p -r1.84 music-players.h // From: Christian Rusa { "Nokia", 0x0421, "5700 XpressMusic Mobile Phone", 0x04b4, DEVICE_FLAG_NONE }, // From: Mitchell Hicks -@@ -476,6 +484,8 @@ +@@ -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 }, @@ -29,3 +40,46 @@ diff -u -p -u -p -r1.84 music-players.h // 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-nokia-n82.patch b/libmtp-nokia-n82.patch deleted file mode 100644 index fd7a47f..0000000 --- a/libmtp-nokia-n82.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: src/music-players.h -=================================================================== -RCS file: /cvsroot/libmtp/libmtp/src/music-players.h,v -retrieving revision 1.83 -diff -u -p -u -p -r1.83 music-players.h ---- src/music-players.h 21 Oct 2008 14:24:24 -0000 1.83 -+++ src/music-players.h 24 Oct 2008 19:57:02 -0000 -@@ -474,6 +474,8 @@ - { "Nokia", 0x0421, "N73 Mobile Phone", 0x04d1, DEVICE_FLAG_UNLOAD_DRIVER }, - // From Swapan - { "Nokia", 0x0421, "N75 Mobile Phone", 0x04e1, DEVICE_FLAG_NONE }, -+ // From Bastien Nocera -+ { "Nokia", 0x0421, "N82 Mobile Phone", 0x0074, DEVICE_FLAG_NONE }, - // From Anonymous Sourceforge User - { "Nokia", 0x0421, "N95 Mobile Phone", 0x04ef, DEVICE_FLAG_NONE }, - // From: Pat Nicholls diff --git a/libmtp.spec b/libmtp.spec index c31d3a2..6f2bf55 100644 --- a/libmtp.spec +++ b/libmtp.spec @@ -3,7 +3,7 @@ Name: libmtp Version: 0.3.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A software library for MTP media players URL: http://libmtp.sourceforge.net/ @@ -17,8 +17,7 @@ BuildRequires: libusb-devel BuildRequires: doxygen Patch0: libmtp-0.2.6.1-simpler-rules.patch -Patch1: libmtp-nokia-n82.patch -Patch2: libmtp-add-more-nokia-phones.patch +Patch1: libmtp-add-more-nokia-phones.patch %description This package provides a software library for communicating with MTP @@ -48,8 +47,7 @@ library for MTP media players. %prep %setup -q %patch0 -p1 -b .rules -%patch1 -p0 -b .n82 -%patch2 -p0 -b .more-nokia +%patch1 -p1 -b .more-nokia %build %configure --disable-static --program-prefix=mtp- @@ -103,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Oct 25 2008 - Bastien Nocera - 0.3.3-4 +- Update device list from CVS and fix the build + * Sat Oct 25 2008 - Bastien Nocera - 0.3.3-3 - Add support for more Nokia phones from their WMP10 drivers