head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.18
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.16
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.14
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.12
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.10
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.8
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.6
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.4
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.2
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.2.0.10
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.8
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.6
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.4
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.2
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.1.0.16
	pkgsrc-2006Q4-base:1.1
	pkgsrc-2006Q3:1.1.0.14
	pkgsrc-2006Q3-base:1.1
	pkgsrc-2006Q2:1.1.0.12
	pkgsrc-2006Q2-base:1.1
	pkgsrc-2006Q1:1.1.0.10
	pkgsrc-2006Q1-base:1.1
	pkgsrc-2005Q4:1.1.0.8
	pkgsrc-2005Q4-base:1.1
	pkgsrc-2005Q3:1.1.0.6
	pkgsrc-2005Q3-base:1.1
	pkgsrc-2005Q2:1.1.0.4
	pkgsrc-2005Q2-base:1.1
	pkgsrc-2005Q1:1.1.0.2
	pkgsrc-2005Q1-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2008.04.29.09.31.09;	author sborrill;	state dead;
branches;
next	1.2;

1.2
date	2007.01.02.18.32.47;	author adam;	state Exp;
branches;
next	1.1;

1.1
date	2005.01.05.15.52.52;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Changes:
libgphoto2 2.4.1

This is a 2.4 release branch update.

Package / System integration:
   * HAL FDI files now use "info.subsystem" instead of "info.bus", required
     by hal after March 2008.

   * Suppress another Olympus camera in FDI file that is better of done
     using Mass Storage only.

libgphoto2_port:
   * Suppress more known network filesystems in "disk" autodetection
   * disabled usb_reset for Canon cameras in "usb", broke EOS cameras.

PTP2 driver:
   * Merged all new Camera IDs from TRUNK.
   * Configuration bugfix for multiple options with the same name.
   * Capture bugfix for Nikon Coolpix
   * Various small bugfixes.

Canon driver:
   * Increased the event timeout, so operations work again.
   * Fixed a bug in interval capture
   * some additional configuration values for newer cameras

Mars driver:
   * Synced with SVN TRUNK (1:1 copy).
           * Better whitebalance postprocessing
           * Camera ids added
           * Decompression fixes

Digigr8 driver:
   * Synced with SVN TRUNK (1:1 copy).
           * bugfixes

Sonix driver:
   * Synced with SVN TRUNK (1:1 copy).
           * bugfixes

+ changes from 2.3.x
@
text
@$NetBSD: patch-ac,v 1.2 2007/01/02 18:32:47 adam Exp $

--- camlibs/ptp2/ptp.c.orig	2006-12-24 16:16:20.000000000 +0100
+++ camlibs/ptp2/ptp.c
@@@@ -524,6 +524,9 @@@@ static inline uint16_t
 ptp_usb_event (PTPParams* params, PTPContainer* event, int wait)
 {
 	uint16_t ret;
+	uint32_t packetlen;
+	size_t toread;
+	unsigned char *bp;
 	unsigned int rlen;
 	PTPUSBEventContainer usbevent;
 	PTP_CNT_INIT(usbevent);
@@@@ -533,8 +536,24 @@@@ ptp_usb_event (PTPParams* params, PTPCon
 	
 	switch(wait) {
 		case PTP_EVENT_CHECK:
-			ret=params->check_int_func((unsigned char*)&usbevent,
-				sizeof(usbevent), params->data, &rlen);
+			ret=params->check_int_func((unsigned char*)&packetlen,
+				sizeof(packetlen), params->data, &rlen);
+			if (ret!=PTP_RC_OK)
+				break;
+			if (rlen != sizeof(packetlen)) {
+				ret = PTP_ERROR_IO;
+				break;
+			}
+			toread = dtoh32(packetlen) - sizeof(packetlen);
+			bp = (unsigned char*)&usbevent.type;
+			while (toread > 0) {
+				ret=params->check_int_func(bp,
+				     toread, params->data, &rlen);
+				if (ret!=PTP_RC_OK)
+					break;
+				toread -= rlen;
+				bp += rlen;
+			}
 			break;
 		case PTP_EVENT_CHECK_FAST:
 			ret=params->check_int_fast_func((unsigned char*)
@


1.2
log
@Changes 2.3.1:

PTP:
   * Fixed a memory leak in continuous Nikon / Canon capture mode.
Bindings:
   * Moved all bindings into separate packages.
Package / System integration:
   * Add README.packaging file.
   * Removed obsolete print-usb-usermap. Use
     "print-camera-list usb-usermap usbcam" instead.
   * Fix libgphoto2 symbol list: Removed gpi_gphoto_port_type_map
   * Add new permission setup script doing class based matching for
     PTP class cameras not listed explicitly by USB IDs.

Changes 2.3.0:

PTP:
   * Improved Nikon remote control
   * Improved Canon file download
	- faster directory retrieval (especially on cameras with lots of files)
	- "new" images are marked (gphoto2 --new, digikam)
   * MTP Playlist support (upload and download)
   * MTP Metadata support (upload and download, Artist, Title, Playtime ... )
   * Lots of other MTP related fixes.
   * MTP autodetection on Microsoft OS Descriptor.
   * New devices:
          Canon PowerShot A540, A530, S3 IS, SD430, SD600, SD700, IXUS 800
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@update to 2.1.5
changes:
-many cameras added, misc driver enhancements and fixes
-support for multiple USB devices
@
text
@d3 1
a3 1
--- camlibs/ptp2/ptp.c.orig	2004-12-19 17:23:14.000000000 +0100
d5 1
a5 1
@@@@ -336,6 +336,9 @@@@ static inline uint16_t
d15 1
a15 1
@@@@ -345,8 +348,24 @@@@ ptp_usb_event (PTPParams* params, PTPCon
@