Hello community,
here is the log from the commit of package libgphoto2
checked in at Wed Apr 5 17:31:24 CEST 2006.
--------
--- GNOME/libgphoto2/libgphoto2.changes 2006-03-27 13:24:54.000000000 +0200
+++ libgphoto2/libgphoto2.changes 2006-04-05 14:45:20.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 5 14:44:09 CEST 2006 - meissner@suse.de
+
+- Report MTP Music Players correctly via FDI (hackish solution) #163015
+- Some more new PTP ids.
+
+-------------------------------------------------------------------
New:
----
libgphoto2-music-player.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libgphoto2.spec ++++++
--- /var/tmp/diff_new_pack.XEH9ZM/_old 2006-04-05 17:30:44.000000000 +0200
+++ /var/tmp/diff_new_pack.XEH9ZM/_new 2006-04-05 17:30:44.000000000 +0200
@@ -18,11 +18,12 @@
Group: Hardware/Other
Summary: A Digital Camera Library
Version: 2.1.99.0head
-Release: 17
+Release: 19
Source0: libgphoto2-%{version}.tar.bz2
Patch0: libgphoto2-map-mp3.patch
Patch1: libgphoto2-mtp-fixes.patch
Patch2: libgphoto2-new-usbids.patch
+Patch3: libgphoto2-music-player.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: udev resmgr
%if %suse_version > 920
@@ -90,6 +91,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{?suse_update_config:%{suse_update_config -f . libgphoto2_port}}
@@ -173,6 +175,9 @@
%run_ldconfig
%changelog -n libgphoto2
+* Wed Apr 05 2006 - meissner@suse.de
+- Report MTP Music Players correctly via FDI (hackish solution) #163015
+- Some more new PTP ids.
* Mon Mar 27 2006 - meissner@suse.de
- Merged some important fixes from CVS.
- libgphoto2-map-mp3.patch: Map MP3 mimetypes correctly to PTP
++++++ libgphoto2-music-player.patch ++++++
--- libgphoto2/packaging/generic/print-camera-list.c 2006-03-16 10:35:22.000000000 +0100
+++ libgphoto2/packaging/generic/print-camera-list.c 2006-04-05 14:38:43.000000000 +0200
@@ -381,6 +381,7 @@
const CameraAbilities *a)
{
char *s, *d, model[256];
+ int ismusicplayer = 0;
if (!(a->port & GP_PORT_USB))
return 0;
@@ -398,6 +399,15 @@
}
*d = '\0';
+ /* Match out some MTP device vendors and mark them up as musicplayers */
+ if ( (a->usb_vendor == 0x041e) || /* Creative Zen */
+ (a->usb_vendor == 0x4102) || /* iRiver Zen */
+ (a->usb_vendor == 0x0471) || /* Philipps HDx */
+ (a->usb_vendor == 0x413c) || /* Dell */
+ (a->usb_vendor == 0x0930) /* Toshiba */
+ )
+ ismusicplayer = 1;
+
if (a->usb_vendor == 0x07b4 && a->usb_product == 0x105) {
/* Marcus says: The Olympus Sierra/Storage dual mode camera firmware.
* Some HAL using software gets deeply confused by this being here
@@ -409,16 +419,27 @@
if (a->usb_vendor) { /* usb product id might be 0! */
printf(" \n", a->usb_vendor);
printf(" \n", a->usb_product);
- printf(" camera</merge>\n");
- printf(" camera</append>\n");
- /* HACK alert ... but the HAL / gnome-volume-manager guys want that */
- if (NULL!=strstr(a->library,"ptp"))
- printf(" ptp</merge>\n");
- else
- printf(" proprietary</merge>\n");
- printf(" %s</merge>\n", model);
- printf(" true</merge>\n");
+ if (!ismusicplayer) { /* CAMERA */
+ printf(" camera</merge>\n");
+ printf(" camera</append>\n");
+
+ /* HACK alert ... but the HAL / gnome-volume-manager guys want that */
+ if (NULL!=strstr(a->library,"ptp"))
+ printf(" ptp</merge>\n");
+ else
+ printf(" proprietary</merge>\n");
+ printf(" %s</merge>\n", model);
+ printf(" true</merge>\n");
+ } else {
+ printf(" portable_audio_player</merge>\n");
+ printf(" portable_audio_player</append>\n");
+ printf(" libgphoto2</merge>\n");
+ printf(" mtp</merge>\n");
+
+ /* FIXME: needs true formats ... But all of them can do MP3 */
+ printf(" audio/mpeg</append>\n");
+ }
printf(" </match>\n");
printf(" </match>\n");
++++++ libgphoto2-new-usbids.patch ++++++
--- /var/tmp/diff_new_pack.XEH9ZM/_old 2006-04-05 17:30:45.000000000 +0200
+++ /var/tmp/diff_new_pack.XEH9ZM/_new 2006-04-05 17:30:45.000000000 +0200
@@ -9,17 +9,27 @@
/* Giulio Salani */
{"Kodak:C310", 0x040a, 0x058a, 0},
/* Brandon Sharitt */
-@@ -359,7 +359,9 @@
+@@ -359,7 +359,10 @@
{"Sony:DSC-P93 (PTP mode)", 0x054c, 0x004e, 0},
{"Sony:DSC-P100 (PTP mode)", 0x054c, 0x004e, 0},
{"Sony:DSC-P120 (PTP mode)", 0x054c, 0x004e, 0},
+ {"Sony:DSC-P200 (PTP mode)", 0x054c, 0x004e, 0},
{"Sony:DSC-R1 (PTP mode)", 0x054c, 0x004e, 0},
++ {"Sony:DSC-S40 (PTP mode)", 0x054c, 0x004e, 0},
+ {"Sony:DSC-S60 (PTP mode)", 0x054c, 0x004e, 0},
{"Sony:DSC-S75 (PTP mode)", 0x054c, 0x004e, 0},
{"Sony:DSC-S85 (PTP mode)", 0x054c, 0x004e, 0},
{"Sony:DSC-T1 (PTP mode)", 0x054c, 0x004e, 0},
-@@ -452,6 +454,12 @@
+@@ -429,6 +432,8 @@
+ {"Nikon:D50 (PTP mode)", 0x04b0, 0x040a, 0},
+
+ {"Nikon:DSC D70s (PTP mode)", 0x04b0, 0x040e, 0},
++ /* Jana Jaeger */
++ {"Nikon:DSC D200 (PTP mode)", 0x04b0, 0x0410, 0},
+
+ /* Thomas Luzat */
+ {"Panasonic:DMC-FZ20 (alternate id)", 0x04da, 0x2372, 0},
+@@ -452,6 +457,12 @@
{"Olympus:C-310Z", 0x07b4, 0x0114, 0},
{"Olympus:D-540Z", 0x07b4, 0x0114, 0},
{"Olympus:X-100", 0x07b4, 0x0114, 0},
@@ -32,7 +42,7 @@
/* (at least some) newer Canon cameras can be switched between
* PTP and "normal" (i.e. Canon) mode
-@@ -504,6 +512,10 @@
+@@ -504,6 +515,10 @@
{"Canon:PowerShot A510 (PTP mode)", 0x04a9, 0x30c2, PTPBUG_DELETE_SENDS_EVENT},
{"Canon:EOS 1D Mark II (PTP mode)", 0x04a9, 0x30ea, PTPBUG_DCIM_WRONG_PARENT},
{"Canon:EOS 20D (PTP mode)", 0x04a9, 0x30ec, PTPBUG_DCIM_WRONG_PARENT},
@@ -43,7 +53,16 @@
/* 30ef is the ID in explicit PTP mode.
* 30ee is the ID with the camera in Canon mode, but the camera reacts to
-@@ -568,13 +580,22 @@
+@@ -529,6 +544,8 @@
+ {"Canon:PowerShot SD450 (PTP mode)", 0x04a9, 0x30ff, PTPBUG_DELETE_SENDS_EVENT},
+ /* Nick Richards */
+ {"Canon:Digital IXUS 50 (PTP mode)", 0x04a9, 0x310e, PTPBUG_DELETE_SENDS_EVENT},
++ /* https://sourceforge.net/tracker/?func=detail&atid=358874&aid=1456391&group_id=8874 */
++ {"Canon:EOS 30D (PTP mode)", 0x04a9, 0x3113, PTPBUG_DELETE_SENDS_EVENT},
+ {"Canon:Digital IXUS 750 (PTP mode)", 0x04a9, 0x3116, PTPBUG_DELETE_SENDS_EVENT},
+
+ /* Konica-Minolta PTP cameras */
+@@ -568,13 +585,25 @@
{"iRiver:T20", 0x4102, 0x1118, 0},
/* Bruno Parente Lima */
{"iRiver:T30", 0x4102, 0x1119, 0},
@@ -53,16 +72,19 @@
{"Philipps:HDD6320", 0x0471, 0x01eb, 0},
-
+ /* borrowed from libmtp source */
-+ {"Creative Zen Vision", 0x041e, 0x411f, 0},
-+ {"Creative Portable Media Center", 0x041e, 0x4123, 0},
-+ {"Creative Zen Xtra", 0x041e, 0x4128, 0},
++ {"Creative:Zen Vision", 0x041e, 0x411f, 0},
++ {"Creative:Portable Media Center", 0x041e, 0x4123, 0},
++ {"Creative:Zen Xtra", 0x041e, 0x4128, 0},
+ {"Second generation Dell DJ", 0x041e, 0x412f, 0},
-+ {"Creative Zen Micro", 0x041e, 0x4130, 0},
-+ {"Creative Zen Touch", 0x041e, 0x4131, 0},
-+ {"Creative Zen Sleek", 0x041e, 0x4137, 0},
++ {"Creative:Zen Micro", 0x041e, 0x4130, 0},
++ {"Creative:Zen Touch", 0x041e, 0x4131, 0},
++ {"Creative:Zen Sleek", 0x041e, 0x4137, 0},
/* Jennifer Scalf */
{"Creative:Zen MicroPhoto", 0x041e, 0x413c, 0},
-+ {"Creative Zen Vision:M", 0x041e, 0x413e, 0},
++ {"Creative:Zen Vision:M", 0x041e, 0x413e, 0},
++
++ /* IRC reporter */
++ {"Dell:DJ Itty", 0x413c, 0x4500, 0},
+
+ /* Marcoen Hirschberg */
+ {"Toshiba:Gigabeat", 0x0930, 0x000c, 0},
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...