summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2007-01-02 18:32:47 +0000
committeradam <adam@pkgsrc.org>2007-01-02 18:32:47 +0000
commitcc7c4c5624a05f6b0ba12f0c713f740bcece2f16 (patch)
tree493b247378c809c0c99c6157a8a30e1290163169
parent6f379a50f35a1557594e92c8f7c17c07f8b37438 (diff)
downloadpkgsrc-cc7c4c5624a05f6b0ba12f0c713f740bcece2f16.tar.gz
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
-rw-r--r--devel/libgphoto2/Makefile30
-rw-r--r--devel/libgphoto2/PLIST.Linux3
-rw-r--r--devel/libgphoto2/PLIST.common147
-rw-r--r--devel/libgphoto2/PLIST.common_end12
-rw-r--r--devel/libgphoto2/buildlink3.mk3
-rw-r--r--devel/libgphoto2/distinfo13
-rw-r--r--devel/libgphoto2/patches/patch-aa13
-rw-r--r--devel/libgphoto2/patches/patch-ab21
-rw-r--r--devel/libgphoto2/patches/patch-ac8
9 files changed, 132 insertions, 118 deletions
diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile
index b3732776c84..8c763af2b99 100644
--- a/devel/libgphoto2/Makefile
+++ b/devel/libgphoto2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2006/06/17 19:05:33 rillig Exp $
-#
+# $NetBSD: Makefile,v 1.32 2007/01/02 18:32:47 adam Exp $
-DISTNAME= libgphoto2-2.1.6
-PKGREVISION= 2
+DISTNAME= libgphoto2-2.3.1
CATEGORIES= devel graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gphoto/}
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://gphoto.sourceforge.net/proj/libgphoto2/
@@ -13,26 +12,25 @@ COMMENT= Digital camera access library
CONFLICTS+= gphoto<2.1.1
USE_TOOLS+= pkg-config
-USE_LIBTOOL= YES
+USE_LIBTOOL= yes
+USE_PKGLOCALEDIR= yes
+GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= libgphoto2/libgphoto2.pc.in
-USE_PKGLOCALEDIR= YES
-GNU_CONFIGURE= YES
-
-SUBST_CLASSES+= libexif-update
-SUBST_STAGE.libexif-update= pre-configure
-SUBST_MESSAGE.libexif-update= Fix configure script checks for libexif-0.6.13
-SUBST_FILES.libexif-update= configure
-SUBST_SED.libexif-update= -e s,exif-,libexif/exif-,g
.include "../../mk/bsd.prefs.mk"
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
.if ${OPSYS} == "SunOS"
PLIST_SUBST+= HAVE_LIBUSB="@comment "
.else
.include "../../devel/libusb/buildlink3.mk"
PLIST_SUBST+= HAVE_LIBUSB=""
.endif
+
+# remove symbolic link
+post-install:
+ rm ${PREFIX}/include/gphoto2/gphoto2
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgphoto2/PLIST.Linux b/devel/libgphoto2/PLIST.Linux
index 7e91e2ab6bd..e98412fd919 100644
--- a/devel/libgphoto2/PLIST.Linux
+++ b/devel/libgphoto2/PLIST.Linux
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST.Linux,v 1.2 2006/05/13 19:00:56 minskim Exp $
+@comment $NetBSD: PLIST.Linux,v 1.3 2007/01/02 18:32:47 adam Exp $
lib/libgphoto2/print-usb-usermap
share/doc/libgphoto2/linux-hotplug/usbcam.console
share/doc/libgphoto2/linux-hotplug/usbcam.group
share/doc/libgphoto2/linux-hotplug/usbcam.user
share/doc/libgphoto2/linux-hotplug/usbcam.x11-app
+@dirrm share/doc/libgphoto2/linux-hotplug
diff --git a/devel/libgphoto2/PLIST.common b/devel/libgphoto2/PLIST.common
index 098b313a76f..03e5f5d2f23 100644
--- a/devel/libgphoto2/PLIST.common
+++ b/devel/libgphoto2/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.8 2006/04/17 07:07:17 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.9 2007/01/02 18:32:47 adam Exp $
bin/gphoto2-config
bin/gphoto2-port-config
include/gphoto2/gphoto2-abilities-list.h
@@ -19,71 +19,104 @@ include/gphoto2/gphoto2-setting.h
include/gphoto2/gphoto2-version.h
include/gphoto2/gphoto2-widget.h
include/gphoto2/gphoto2.h
-lib/gphoto2/${PKGVERSION}/libgphoto2_adc65.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_agfa_cl20.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_aox.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_barbie.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_canon.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_casio_qv.la
-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
-lib/gphoto2/${PKGVERSION}/libgphoto2_kodak_dc210.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_kodak_dc240.la
-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
-lib/gphoto2/${PKGVERSION}/libgphoto2_panasonic_dc1580.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_panasonic_l859.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_pccam300.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_pccam600.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_polaroid_pdc320.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_polaroid_pdc640.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_polaroid_pdc700.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_ptp2.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_ricoh.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_ricoh_g3.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_samsung.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_sierra.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_sipix_blink.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_sipix_blink2.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_sipix_web2.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_smal.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_sony_dscf1.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_sony_dscf55.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_soundvision.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_spca50x.la
-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_pdrm11.la
-lib/gphoto2_port/0.5.1/libgphoto2_port_serial.la
-${HAVE_LIBUSB}lib/gphoto2_port/0.5.1/libgphoto2_port_usb.la
lib/libgphoto2.la
+lib/libgphoto2/print-camera-list
lib/libgphoto2_port.la
+lib/libgphoto2/${PKGVERSION}/adc65.la
+lib/libgphoto2/${PKGVERSION}/agfa_cl20.la
+lib/libgphoto2/${PKGVERSION}/aox.la
+lib/libgphoto2/${PKGVERSION}/barbie.la
+lib/libgphoto2/${PKGVERSION}/canon.la
+lib/libgphoto2/${PKGVERSION}/casio_qv.la
+lib/libgphoto2/${PKGVERSION}/clicksmart310.la
+lib/libgphoto2/${PKGVERSION}/digigr8.la
+lib/libgphoto2/${PKGVERSION}/digita.la
+lib/libgphoto2/${PKGVERSION}/dimagev.la
+lib/libgphoto2/${PKGVERSION}/dimera3500.la
+lib/libgphoto2/${PKGVERSION}/directory.la
+lib/libgphoto2/${PKGVERSION}/enigma13.la
+lib/libgphoto2/${PKGVERSION}/fuji.la
+lib/libgphoto2/${PKGVERSION}/gsmart300.la
+lib/libgphoto2/${PKGVERSION}/hp215.la
+lib/libgphoto2/${PKGVERSION}/iclick.la
+lib/libgphoto2/${PKGVERSION}/jamcam.la
+lib/libgphoto2/${PKGVERSION}/jd11.la
+lib/libgphoto2/${PKGVERSION}/kodak_dc120.la
+lib/libgphoto2/${PKGVERSION}/kodak_dc210.la
+lib/libgphoto2/${PKGVERSION}/kodak_dc240.la
+lib/libgphoto2/${PKGVERSION}/kodak_dc3200.la
+lib/libgphoto2/${PKGVERSION}/kodak_ez200.la
+lib/libgphoto2/${PKGVERSION}/konica.la
+lib/libgphoto2/${PKGVERSION}/konica_qm150.la
+lib/libgphoto2/${PKGVERSION}/largan.la
+lib/libgphoto2/${PKGVERSION}/lg_gsm.la
+lib/libgphoto2/${PKGVERSION}/mars.la
+lib/libgphoto2/${PKGVERSION}/mustek.la
+lib/libgphoto2/${PKGVERSION}/panasonic_coolshot.la
+lib/libgphoto2/${PKGVERSION}/panasonic_dc1000.la
+lib/libgphoto2/${PKGVERSION}/panasonic_dc1580.la
+lib/libgphoto2/${PKGVERSION}/panasonic_l859.la
+lib/libgphoto2/${PKGVERSION}/pccam300.la
+lib/libgphoto2/${PKGVERSION}/pccam600.la
+lib/libgphoto2/${PKGVERSION}/polaroid_pdc320.la
+lib/libgphoto2/${PKGVERSION}/polaroid_pdc640.la
+lib/libgphoto2/${PKGVERSION}/polaroid_pdc700.la
+lib/libgphoto2/${PKGVERSION}/ptp2.la
+lib/libgphoto2/${PKGVERSION}/ricoh.la
+lib/libgphoto2/${PKGVERSION}/ricoh_g3.la
+lib/libgphoto2/${PKGVERSION}/samsung.la
+lib/libgphoto2/${PKGVERSION}/sierra.la
+lib/libgphoto2/${PKGVERSION}/sipix_blink2.la
+lib/libgphoto2/${PKGVERSION}/sipix_web2.la
+lib/libgphoto2/${PKGVERSION}/smal.la
+lib/libgphoto2/${PKGVERSION}/sonix.la
+lib/libgphoto2/${PKGVERSION}/sony_dscf1.la
+lib/libgphoto2/${PKGVERSION}/sony_dscf55.la
+lib/libgphoto2/${PKGVERSION}/soundvision.la
+lib/libgphoto2/${PKGVERSION}/spca50x.la
+lib/libgphoto2/${PKGVERSION}/sq905.la
+lib/libgphoto2/${PKGVERSION}/stv0674.la
+lib/libgphoto2/${PKGVERSION}/stv0680.la
+lib/libgphoto2/${PKGVERSION}/sx330z.la
+lib/libgphoto2/${PKGVERSION}/toshiba_pdrm11.la
lib/pkgconfig/libgphoto2.pc
man/man3/libgphoto2.3
man/man3/libgphoto2_port.3
share/doc/libgphoto2/AUTHORS
-share/doc/libgphoto2/CHANGES
share/doc/libgphoto2/COPYING
share/doc/libgphoto2/NEWS
share/doc/libgphoto2/README
+share/doc/libgphoto2/camlibs/README.913C
+share/doc/libgphoto2/camlibs/README.adc65
+share/doc/libgphoto2/camlibs/README.agfa-cl20
+share/doc/libgphoto2/camlibs/README.aox
+share/doc/libgphoto2/camlibs/README.barbie
+share/doc/libgphoto2/camlibs/README.canon
+share/doc/libgphoto2/camlibs/README.clicksmart310
+share/doc/libgphoto2/camlibs/README.digigr8
+share/doc/libgphoto2/camlibs/README.enigma13
+share/doc/libgphoto2/camlibs/README.gsmart300
+share/doc/libgphoto2/camlibs/README.iclick
+share/doc/libgphoto2/camlibs/README.jamcam
+share/doc/libgphoto2/camlibs/README.konica
+share/doc/libgphoto2/camlibs/README.largan-lmini
+share/doc/libgphoto2/camlibs/README.lg_gsm
+share/doc/libgphoto2/camlibs/README.mars
+share/doc/libgphoto2/camlibs/README.minolta-dimagev
+share/doc/libgphoto2/camlibs/README.mustek
+share/doc/libgphoto2/camlibs/README.panasonic
+share/doc/libgphoto2/camlibs/README.panasonic-coolshot
+share/doc/libgphoto2/camlibs/README.panasonic-l859
+share/doc/libgphoto2/camlibs/README.pccam300
+share/doc/libgphoto2/camlibs/README.pccam600
+share/doc/libgphoto2/camlibs/README.ptp2
+share/doc/libgphoto2/camlibs/README.smal
+share/doc/libgphoto2/camlibs/README.sonix
+share/doc/libgphoto2/camlibs/README.sonydscf1
+share/doc/libgphoto2/camlibs/README.soundvision
+share/doc/libgphoto2/camlibs/README.spca50x
+share/doc/libgphoto2/camlibs/README.sq905
+share/doc/libgphoto2/camlibs/README.toshiba-pdrm11
share/doc/libgphoto2_port/AUTHORS
share/doc/libgphoto2_port/NEWS
share/doc/libgphoto2_port/README
diff --git a/devel/libgphoto2/PLIST.common_end b/devel/libgphoto2/PLIST.common_end
index 38c3ebcaed9..82fa3cb8d67 100644
--- a/devel/libgphoto2/PLIST.common_end
+++ b/devel/libgphoto2/PLIST.common_end
@@ -1,13 +1,9 @@
-@comment $NetBSD: PLIST.common_end,v 1.2 2004/05/07 12:06:47 cjep Exp $
+@comment $NetBSD: PLIST.common_end,v 1.3 2007/01/02 18:32:47 adam Exp $
@dirrm share/libgphoto2/${PKGVERSION}/konica
@dirrm share/libgphoto2/${PKGVERSION}
@dirrm share/libgphoto2
-@dirrm share/doc/libgphoto2_port
-@exec ${MKDIR} %D/share/doc/libgphoto2/linux-hotplug
-@dirrm share/doc/libgphoto2/linux-hotplug
+@dirrm share/doc/libgphoto2/camlibs
@dirrm share/doc/libgphoto2
-@dirrm lib/gphoto2_port/0.5.1
-@dirrm lib/gphoto2_port
-@dirrm lib/gphoto2/${PKGVERSION}
-@dirrm lib/gphoto2
+@dirrm lib/libgphoto2/${PKGVERSION}
+@dirrm lib/libgphoto2
@dirrm include/gphoto2
diff --git a/devel/libgphoto2/buildlink3.mk b/devel/libgphoto2/buildlink3.mk
index deaa19ad1cc..bb8d30c6d3a 100644
--- a/devel/libgphoto2/buildlink3.mk
+++ b/devel/libgphoto2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2007/01/02 18:32:47 adam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGPHOTO2_BUILDLINK3_MK:= ${LIBGPHOTO2_BUILDLINK3_MK}+
@@ -19,6 +19,7 @@ BUILDLINK_PKGSRCDIR.libgphoto2?= ../../devel/libgphoto2
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgphoto2/distinfo b/devel/libgphoto2/distinfo
index 6dc911815c7..83761b83eb9 100644
--- a/devel/libgphoto2/distinfo
+++ b/devel/libgphoto2/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.8 2005/11/07 18:38:36 joerg Exp $
+$NetBSD: distinfo,v 1.9 2007/01/02 18:32:47 adam Exp $
-SHA1 (libgphoto2-2.1.6.tar.gz) = 22be325303fa10a4a3f519d71b25364b3f84d653
-RMD160 (libgphoto2-2.1.6.tar.gz) = ef32357d9722a69d20a02098bd30c13165c27e6a
-Size (libgphoto2-2.1.6.tar.gz) = 3205731 bytes
-SHA1 (patch-aa) = 205330cb3a9a65d22f48c4d3460ddf5b55ca4d89
-SHA1 (patch-ab) = 0c9edd27c904eb5a168e18837aec0f7bccfe739d
-SHA1 (patch-ac) = c9dd7f2cd24eb273f6db2b93e9b54614101d6c2b
+SHA1 (libgphoto2-2.3.1.tar.bz2) = 13cc3f05ee298b33cd03ba4b772ef05a3aa49b97
+RMD160 (libgphoto2-2.3.1.tar.bz2) = ab678a5006a89ef1fe9f052dac1f9738961cc3a8
+Size (libgphoto2-2.3.1.tar.bz2) = 3230934 bytes
+SHA1 (patch-ab) = 921eea83471110dd85197a7171278c7d0556536b
+SHA1 (patch-ac) = f5d3e72163f6de85c4e5a9b5f4b32d8d628e7b30
diff --git a/devel/libgphoto2/patches/patch-aa b/devel/libgphoto2/patches/patch-aa
deleted file mode 100644
index cd91f5e3194..00000000000
--- a/devel/libgphoto2/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/11/07 18:38:37 joerg Exp $
-
---- libgphoto2_port/serial/unix.c.orig 2005-11-07 18:17:05.000000000 +0000
-+++ libgphoto2_port/serial/unix.c
-@@ -438,7 +438,7 @@ gp_port_serial_open (GPPort *dev)
- }
- dev->pl->fd = -1;
-
--#if defined(__FreeBSD__) || defined(__APPLE__)
-+#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__)
- dev->pl->fd = open (port, O_RDWR | O_NOCTTY | O_NONBLOCK);
- #elif OS2
- fd = open (port, O_RDWR | O_BINARY);
diff --git a/devel/libgphoto2/patches/patch-ab b/devel/libgphoto2/patches/patch-ab
index 38bd0975e38..f37d0fd0de3 100644
--- a/devel/libgphoto2/patches/patch-ab
+++ b/devel/libgphoto2/patches/patch-ab
@@ -1,13 +1,12 @@
-$NetBSD: patch-ab,v 1.3 2005/11/07 18:38:37 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2007/01/02 18:32:47 adam Exp $
---- camlibs/sonydscf1/chotplay.c.orig 2005-11-07 18:27:21.000000000 +0000
-+++ camlibs/sonydscf1/chotplay.c
-@@ -28,8 +28,6 @@
- #include "getuint.h"
- #include "pmp.h"
+--- camlibs/ptp2/config.c.orig 2007-01-02 17:01:25.000000000 +0100
++++ camlibs/ptp2/config.c
+@@ -23,6 +23,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <time.h>
++#include <netinet/in.h>
--extern int errno;
--
- #define MAX_PICTURE_NUM 200
-
- u_char picture_index[MAX_PICTURE_NUM];
+ #include <gphoto2/gphoto2-library.h>
+ #include <gphoto2/gphoto2-port-log.h>
diff --git a/devel/libgphoto2/patches/patch-ac b/devel/libgphoto2/patches/patch-ac
index 06ffc453ba3..96c92891ea9 100644
--- a/devel/libgphoto2/patches/patch-ac
+++ b/devel/libgphoto2/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2005/01/05 15:52:52 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2007/01/02 18:32:47 adam Exp $
---- camlibs/ptp2/ptp.c.orig 2004-12-19 17:23:14.000000000 +0100
+--- camlibs/ptp2/ptp.c.orig 2006-12-24 16:16:20.000000000 +0100
+++ camlibs/ptp2/ptp.c
-@@ -336,6 +336,9 @@ static inline uint16_t
+@@ -524,6 +524,9 @@ static inline uint16_t
ptp_usb_event (PTPParams* params, PTPContainer* event, int wait)
{
uint16_t ret;
@@ -12,7 +12,7 @@ $NetBSD: patch-ac,v 1.1 2005/01/05 15:52:52 drochner Exp $
unsigned int rlen;
PTPUSBEventContainer usbevent;
PTP_CNT_INIT(usbevent);
-@@ -345,8 +348,24 @@ ptp_usb_event (PTPParams* params, PTPCon
+@@ -533,8 +536,24 @@ ptp_usb_event (PTPParams* params, PTPCon
switch(wait) {
case PTP_EVENT_CHECK: