head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.18 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.16 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.14 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.12 pkgsrc-2011Q2-base:1.8 pkgsrc-2009Q4:1.8.0.10 pkgsrc-2009Q4-base:1.8 pkgsrc-2008Q4:1.8.0.8 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.6 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.4 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.2 pkgsrc-2008Q2-base:1.8 pkgsrc-2008Q1:1.7.0.8 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.6 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.4 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.2 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.6.0.2 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.3.0.10 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.8 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.6 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.4 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.2 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.2.0.6 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.4 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.2 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.1.0.8 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.6 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.4 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.2 pkgsrc-2004Q1-base:1.1; locks; strict; comment @# @; 1.8 date 2008.04.29.09.31.09; author sborrill; state dead; branches; next 1.7; 1.7 date 2007.04.25.13.36.18; author sborrill; state Exp; branches; next 1.6; 1.6 date 2007.03.20.10.22.31; author abs; state Exp; branches; next 1.5; 1.5 date 2007.03.19.08.42.04; author sborrill; state Exp; branches; next 1.4; 1.4 date 2007.01.02.18.32.47; author adam; state dead; branches; next 1.3; 1.3 date 2005.11.07.18.38.37; author joerg; state Exp; branches; next 1.2; 1.2 date 2005.01.05.15.52.52; author drochner; state dead; branches; next 1.1; 1.1 date 2004.02.21.22.58.08; author cube; state Exp; branches; next ; desc @@ 1.8 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-aa,v 1.7 2007/04/25 13:36:18 sborrill Exp $ --- camlibs/ptp2/library.c.orig 2007-01-30 20:06:58.000000000 -0500 +++ camlibs/ptp2/library.c 2007-01-30 20:13:25.000000000 -0500 @@@@ -50,23 +50,6 @@@@ # define N_(String) (String) #endif -/* - * On MacOS (Darwin) and *BSD we're not using glibc, but libiconv. - * glibc knows that UCS-2 is to be in the local machine endianness, - * whereas libiconv does not. So we construct this macro to get - * things right. Reportedly, glibc 2.1.3 has a bug so that UCS-2 - * is always bigendian though, we would need to work around that - * too... - */ -#ifndef __GLIBC__ -#define UCS_2_INTERNAL "UCS-2-INTERNAL" -#else -#if (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1 ) -#error "Too old glibc. This versions iconv() implementation cannot be trusted." -#endif -#define UCS_2_INTERNAL "UCS-2" -#endif - #include "ptp.h" #include "ptp-bugs.h" #include "ptp-private.h" @@@@ -3619,7 +3602,7 @@@@ CameraAbilities a; int ret, i, retried = 0; PTPParams *params; - char *curloc; + char *camloc, *curloc; /* Make sure our port is either USB or PTP/IP. */ if ((camera->port->type != GP_PORT_USB) && (camera->port->type != GP_PORT_PTPIP)) { @@@@ -3649,6 +3632,11 @@@@ memset (camera->pl->params.data, 0, sizeof (PTPData)); ((PTPData *) camera->pl->params.data)->camera = camera; camera->pl->params.byteorder = PTP_DL_LE; + if (camera->pl->params.byteorder == PTP_DL_LE) { + camloc = "UCS-2LE"; + } else { + camloc = "UCS-2BE"; + } switch (camera->port->type) { case GP_PORT_USB: @@@@ -3696,8 +3684,8 @@@@ curloc = nl_langinfo (CODESET); if (!curloc) curloc="UTF-8"; - camera->pl->params.cd_ucs2_to_locale = iconv_open(curloc, UCS_2_INTERNAL); - camera->pl->params.cd_locale_to_ucs2 = iconv_open(UCS_2_INTERNAL, curloc); + camera->pl->params.cd_ucs2_to_locale = iconv_open(curloc, camloc); + camera->pl->params.cd_locale_to_ucs2 = iconv_open(camloc, curloc); if ((camera->pl->params.cd_ucs2_to_locale == (iconv_t) -1) || (camera->pl->params.cd_locale_to_ucs2 == (iconv_t) -1)) { gp_log (GP_LOG_ERROR, "iconv", "Failed to create iconv converter.\n"); @ 1.7 log @Use improved patch for UCS-2/iconv problems. Based on: https://sourceforge.net/tracker/?func=detail&atid=108874&aid=1648398&group_id=8874 Bump PKGREVISION to 3 @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @update libgphoto2 to 2.3.1nb2 - fix typo in patch-aa @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2007/03/19 08:42:04 sborrill Exp $ d3 4 a6 13 --- camlibs/ptp2/library.c.orig 2006-12-24 15:16:20.000000000 +0000 +++ camlibs/ptp2/library.c @@@@ -58,6 +58,7 @@@@ * is always bigendian though, we would need to work around that * too... */ +/* #ifndef __GLIBC__ #define UCS_2_INTERNAL "UCS-2-INTERNAL" #else @@@@ -66,7 +67,7 @@@@ #endif #define UCS_2_INTERNAL "UCS-2" d8 17 a25 1 +*/ d29 22 a50 1 @@@@ -3696,8 +3697,12 @@@@ camera_init (Camera *camera, GPContext * d56 2 a57 6 + camera->pl->params.cd_ucs2_to_locale = iconv_open(curloc, "UCS-2-INTERNAL"); + if(camera->pl->params.cd_ucs2_to_locale == (iconv_t) -1) + camera->pl->params.cd_ucs2_to_locale = iconv_open(curloc, "UCS-2"); + camera->pl->params.cd_locale_to_ucs2 = iconv_open("UCS-2-INTERNAL", curloc); + if(camera->pl->params.cd_locale_to_ucs2 == (iconv_t) -1) + camera->pl->params.cd_locale_to_ucs2 = iconv_open("UCS-2", curloc); @ 1.5 log @Patch ptp code to work with (hopefully) all implementations of iconv, including NetBSD in-tree, pkgsrc and glibc. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- camlibs/ptp2/library.c.orig 2007-03-16 13:18:01.000000000 +0000 +++ camlibs/ptp2/library.c 2007-03-16 13:18:01.000000000 +0000 d22 1 a22 1 @@@@ -3696,8 +3697,12 @@@@ d29 1 a29 1 + if(camera->pl->params.cd_ucs2_to_locale == (iconv_t) -1)) d32 1 a32 1 + if(camera->pl->params.cd_locale_to_ucs2 == (iconv_t) -1)) @ 1.4 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: patch-aa,v 1.3 2005/11/07 18:38:37 joerg Exp $ d3 20 a22 5 --- 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; d24 13 a36 5 -#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); @ 1.3 log @Add DragonFly support. Depend on errno from errno.h. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @update to 2.1.5 changes: -many cameras added, misc driver enhancements and fixes -support for multiple USB devices @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2004/02/21 22:58:08 cube Exp $ d3 5 a7 13 --- 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); d9 5 a13 15 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); @ 1.1 log @Make this compile with gcc-2.95 (hi drochner!). Closes PR 24515. bl3ify, and provide a buildlink3.mk file for future bl3ification of dependencies. @ text @d1 1 a1 1 $NetBSD$ @