rpms/libmtp/devel libmtp-add-more-nokia-phones.patch, 1.1, 1.2 libmtp.spec, 1.27, 1.28 libmtp-nokia-n82.patch, 1.1, NONE

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/libmtp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21697

Modified Files:
	libmtp-add-more-nokia-phones.patch libmtp.spec 
Removed Files:
	libmtp-nokia-n82.patch 
Log Message:
* Sat Oct 25 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.3-4
- Update device list from CVS and fix the build


libmtp-add-more-nokia-phones.patch:

Index: libmtp-add-more-nokia-phones.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libmtp/devel/libmtp-add-more-nokia-phones.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmtp-add-more-nokia-phones.patch	25 Oct 2008 14:32:10 -0000	1.1
+++ libmtp-add-more-nokia-phones.patch	25 Oct 2008 14:45:40 -0000	1.2
@@ -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 <hadess at hadess.net>
++  { "Nokia", 0x0421, "N82 Mobile Phone", 0x0074, DEVICE_FLAG_NONE },
+   // From: danielw
    { "Nokia", 0x0421, "E71", 0x00e4, DEVICE_FLAG_NONE },
    // From: Laurent Bigonville <bigon at users.sourceforge.net>
    { "Nokia", 0x0421, "E66", 0x00e5, DEVICE_FLAG_NONE },
@@ -20,7 +31,7 @@
    // From: Christian Rusa <kristous at users.sourceforge.net>
    { "Nokia", 0x0421, "5700 XpressMusic Mobile Phone", 0x04b4, DEVICE_FLAG_NONE },
    // From: Mitchell Hicks <mitchix at yahoo.com>
-@@ -476,6 +484,8 @@
+@@ -470,6 +484,8 @@
    { "Nokia", 0x0421, "N73 Mobile Phone", 0x04d1, DEVICE_FLAG_UNLOAD_DRIVER },
    // From Swapan <swapan at yahoo.com>
    { "Nokia", 0x0421, "N75 Mobile Phone", 0x04e1, DEVICE_FLAG_NONE },
@@ -29,3 +40,46 @@
    // From Anonymous Sourceforge User
    { "Nokia", 0x0421, "N95 Mobile Phone", 0x04ef, DEVICE_FLAG_NONE },
    // From: Pat Nicholls <pat at patandannie.co.uk>
+@@ -584,25 +600,35 @@
+   // Reported by Jean-Marc Bourguet <jm at bourguet.org>
+   { "Sony", 0x054c, "Walkman NWZ-S716F", 0x035a, DEVICE_FLAG_UNLOAD_DRIVER },
+   // Reported by Anon SF User / Anthon van der Neut <avanderneut at avid.com>
+-  { "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 <niekez at users.sourceforge.net>
+   { "Sony", 0x054c, "Walkman NWZ-A728B", 0x035c, DEVICE_FLAG_UNLOAD_DRIVER },
++  // Reported by Mehdi AMINI <mehdi.amini - at - ulp.u-strasbg.fr>
++  { "Sony", 0x054c, "Walkman NWZ-B135", 0x036e, DEVICE_FLAG_UNLOAD_DRIVER },
++  // Reported by Marco Filipe Nunes Soares Abrantes Pereira <marcopereira at ua.pt>
++  { "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 <stegaro at users.sourceforge.net>
+-  { "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 <zackdvd at users.sourceforge.net>
+-  { "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 <linusakesson at users.sourceforge.net>
+-  { "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 <christian at zuckschwerdt.org>
++  { "SonyEricsson", 0x0fce, "W980", 0x00da, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST },
+ 
+   /*
+    * Motorola


Index: libmtp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libmtp/devel/libmtp.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libmtp.spec	25 Oct 2008 14:32:10 -0000	1.27
+++ libmtp.spec	25 Oct 2008 14:45:40 -0000	1.28
@@ -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:  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 @@
 %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 @@
 
 
 %changelog
+* Sat Oct 25 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.3-4
+- Update device list from CVS and fix the build
+
 * Sat Oct 25 2008 - Bastien Nocera <bnocera at redhat.com> - 0.3.3-3
 - Add support for more Nokia phones from their WMP10 drivers
 


--- libmtp-nokia-n82.patch DELETED ---