update to 2.1.5

changes:
-many cameras added, misc driver enhancements and fixes
-support for multiple USB devices

6 files changed, 53 insertions, 65 deletions

diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile
index 21ba02ff4b9..e5977c759d4 100644
--- a/devel/libgphoto2/Makefile
+++ b/devel/libgphoto2/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2004/10/30 00:59:01 minskim Exp $
+# $NetBSD: Makefile,v 1.20 2005/01/05 15:52:52 drochner Exp $
 #
 
-DISTNAME=	libgphoto2-2.1.4
-PKGREVISION=	3
+DISTNAME=	libgphoto2-2.1.5
 CATEGORIES=	devel graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gphoto/}
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://gphoto.sourceforge.net/proj/libgphoto2/
diff --git a/devel/libgphoto2/PLIST.common b/devel/libgphoto2/PLIST.common
index d23bf31f216..6e88d58d13f 100644
--- a/devel/libgphoto2/PLIST.common
+++ b/devel/libgphoto2/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.4 2004/09/22 08:09:27 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.5 2005/01/05 15:52:52 drochner Exp $
 bin/gphoto2-config
 bin/gphoto2-port-config
 include/gphoto2/gphoto2-abilities-list.h
@@ -28,8 +28,11 @@ lib/gphoto2/${PKGVERSION}/libgphoto2_digita.la
 lib/gphoto2/${PKGVERSION}/libgphoto2_dimagev.la
 lib/gphoto2/${PKGVERSION}/libgphoto2_dimera3500.la
 lib/gphoto2/${PKGVERSION}/libgphoto2_directory.la
+lib/gphoto2/${PKGVERSION}/libgphoto2_enigma13.la
+lib/gphoto2/${PKGVERSION}/libgphoto2_ez200.la
 lib/gphoto2/${PKGVERSION}/libgphoto2_fuji.la
 lib/gphoto2/${PKGVERSION}/libgphoto2_gsmart300.la
+lib/gphoto2/${PKGVERSION}/libgphoto2_iclick.la
 lib/gphoto2/${PKGVERSION}/libgphoto2_jamcam.la
 lib/gphoto2/${PKGVERSION}/libgphoto2_jd11.la
 lib/gphoto2/${PKGVERSION}/libgphoto2_kodak_dc120.la
@@ -39,6 +42,7 @@ lib/gphoto2/${PKGVERSION}/libgphoto2_kodak_dc3200.la
 lib/gphoto2/${PKGVERSION}/libgphoto2_konica.la
 lib/gphoto2/${PKGVERSION}/libgphoto2_konica_qm150.la
 lib/gphoto2/${PKGVERSION}/libgphoto2_largan.la
+lib/gphoto2/${PKGVERSION}/libgphoto2_mars.la
 lib/gphoto2/${PKGVERSION}/libgphoto2_mustek.la
 lib/gphoto2/${PKGVERSION}/libgphoto2_panasonic_coolshot.la
 lib/gphoto2/${PKGVERSION}/libgphoto2_panasonic_dc1000.la
@@ -66,7 +70,7 @@ lib/gphoto2/${PKGVERSION}/libgphoto2_sq905.la
 lib/gphoto2/${PKGVERSION}/libgphoto2_stv0674.la
 lib/gphoto2/${PKGVERSION}/libgphoto2_stv0680.la
 lib/gphoto2/${PKGVERSION}/libgphoto2_sx330z.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_toshiba.la
+lib/gphoto2/${PKGVERSION}/libgphoto2_toshiba_pdrm11.la
 lib/gphoto2_port/0.5.1/libgphoto2_port_serial.la
 lib/gphoto2_port/0.5.1/libgphoto2_port_usb.la
 lib/libgphoto2.la
@@ -102,8 +106,6 @@ ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgphoto2-2.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgphoto2_port-0.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgphoto2-2.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgphoto2_port-0.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgphoto2-2.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgphoto2_port-0.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libgphoto2_port-0.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgphoto2-2.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgphoto2_port-0.mo
diff --git a/devel/libgphoto2/distinfo b/devel/libgphoto2/distinfo
index 2b3dfc8b141..dac8a5eb709 100644
--- a/devel/libgphoto2/distinfo
+++ b/devel/libgphoto2/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2004/02/21 22:58:08 cube Exp $
+$NetBSD: distinfo,v 1.5 2005/01/05 15:52:52 drochner Exp $
 
-SHA1 (libgphoto2-2.1.4.tar.bz2) = aa437f6bff0f58049b84ded2f96fee89e124cb34
-Size (libgphoto2-2.1.4.tar.bz2) = 1819325 bytes
-SHA1 (patch-aa) = db286753834c8a792abc8d2d4b3d1ddfc1d78b19
-SHA1 (patch-ab) = fdf52725d0cf10bec23e98e936c277f71b3b4b5f
+SHA1 (libgphoto2-2.1.5.tar.gz) = b5576fe22dd8a83bf69238a79ad9496a8f081384
+Size (libgphoto2-2.1.5.tar.gz) = 2946757 bytes
+SHA1 (patch-ac) = c9dd7f2cd24eb273f6db2b93e9b54614101d6c2b
diff --git a/devel/libgphoto2/patches/patch-aa b/devel/libgphoto2/patches/patch-aa
deleted file mode 100644
index 9736e53ad2c..00000000000
--- a/devel/libgphoto2/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/02/21 22:58:08 cube Exp $
-
---- camlibs/aox/aox.c.orig	Sun Jan 18 19:47:00 2004
-+++ camlibs/aox/aox.c
-@@ -39,10 +39,10 @@
- int aox_init (GPPort *port, Model *model, Info *info) 
- {
- 	unsigned char c[4];
--	memset(c,0,sizeof(c));
- 	unsigned char hi[2];
--	memset (hi,0,2);
- 	unsigned char lo[2];
-+	memset(c,0,sizeof(c));
-+	memset (hi,0,2);
- 	memset (lo,0,2);
- 
- 	GP_DEBUG("Running aox_init\n");
-@@ -86,11 +86,11 @@ int aox_get_num_hi_pics      (Info *info
- 
- int aox_get_picture_size  (GPPort *port, int lo, int hi, int n, int k) 
- {
-+	unsigned char c[4];
-+        unsigned int size;
- 	GP_DEBUG("Running aox_get_picture_size\n");
- 
--	unsigned char c[4];
- 	memset (c,0,4);
--        unsigned int size;
- 
- 	if ( ( (lo) && ( n ==k ) && (k ==0)) ) {
- 	    	READ(port, 0x04, 0x1, 0x1, c, 2);	
diff --git a/devel/libgphoto2/patches/patch-ab b/devel/libgphoto2/patches/patch-ab
deleted file mode 100644
index 884586ad3ba..00000000000
--- a/devel/libgphoto2/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/02/21 22:58:08 cube Exp $
-
---- camlibs/aox/library.c.orig	Sun Jan 18 19:47:00 2004
-+++ camlibs/aox/library.c
-@@ -202,6 +202,7 @@ get_file_func (CameraFilesystem *fs, con
- 			gp_file_adjust_name_for_mime_type (file);
- 		}
- 		if ((w == 640)){
-+			int header_len;
- 			/* Stripping useless header */
- 			p_data = data + 0x98;
- 			/* Picture is mirror-imaged.*/
-@@ -222,7 +223,7 @@ get_file_func (CameraFilesystem *fs, con
- 			GP_DEBUG("size of data = %i\n", sizeof(data));
- 			GP_DEBUG("size of p_data = %i\n", sizeof(p_data));
- 			/* And now create a ppm file, with our own header */
--			int  header_len = snprintf(header, 127, 
-+			header_len = snprintf(header, 127, 
- 				"P6\n" 
- 				"# CREATOR: gphoto2, aox library\n" 
- 				"%d %d\n" 
diff --git a/devel/libgphoto2/patches/patch-ac b/devel/libgphoto2/patches/patch-ac
new file mode 100644
index 00000000000..06ffc453ba3
--- /dev/null
+++ b/devel/libgphoto2/patches/patch-ac
@@ -0,0 +1,41 @@
+$NetBSD: patch-ac,v 1.1 2005/01/05 15:52:52 drochner Exp $
+
+--- camlibs/ptp2/ptp.c.orig	2004-12-19 17:23:14.000000000 +0100
++++ camlibs/ptp2/ptp.c
+@@ -336,6 +336,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);
+@@ -345,8 +348,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*)