head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.18
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.16
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.14
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.12
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.10
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.8
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.6
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.4
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.2
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.1.0.10
	pkgsrc-2008Q1-base:1.1
	pkgsrc-2007Q4:1.1.0.8
	pkgsrc-2007Q4-base:1.1
	pkgsrc-2007Q3:1.1.0.6
	pkgsrc-2007Q3-base:1.1
	pkgsrc-2007Q2:1.1.0.4
	pkgsrc-2007Q2-base:1.1
	pkgsrc-2007Q1:1.1.0.2
	pkgsrc-2007Q1-base:1.1;
locks; strict;
comment	@# @;


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

1.1
date	2007.02.05.20.03.19;	author markd;	state Exp;
branches;
next	;


desc
@@


1.2
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-ae,v 1.1 2007/02/05 20:03:19 markd Exp $

--- camlibs/mars/mars.c.orig	2007-02-03 18:30:12.430858000 +1300
+++ camlibs/mars/mars.c
@@@@ -38,7 +38,7 @@@@
 #define GET_DATA 	0x0f
 
 static int 
-M_READ (GPPort *port, char *data, int size) 
+Ma_READ (GPPort *port, char *data, int size) 
 {
 	gp_port_write(port, "\x21", 1);
     	gp_port_read(port, data, 16); 	
@@@@ -49,7 +49,7 @@@@ static int 
 M_COMMAND (GPPort *port, char *command, int size, char *response) 
 {
 	gp_port_write(port, command, size);
-    	M_READ(port, response, 16); 	
+    	Ma_READ(port, response, 16); 	
 	return GP_OK;
 }
 
@@@@ -68,7 +68,7 @@@@ mars_init (Camera *camera, GPPort *port,
 	 * camera reports 0x02 it is "jammed" and we must clear it.
 	 */ 
 
-    	M_READ(port, c, 16); 	
+    	Ma_READ(port, c, 16); 	
 	if ( (c[0] == 0x02 ) ) {
 		gp_port_write(port, "\x19", 1);
 		gp_port_read(port, c, 16);
@@@@ -317,7 +317,7 @@@@ mars_routine (Info *info, GPPort *port, 
 	memset(c,0,sizeof(c));
 
 	/*Routine used in initialization, photo download, and reset. */
-    	M_READ(port, c, 16); 	
+    	Ma_READ(port, c, 16); 	
 	M_COMMAND(port, start, 2, c);
 	M_COMMAND(port, do_something, 2, c);
 	M_COMMAND(port, address1, 2, c);
@@@@ -326,7 +326,7 @@@@ mars_routine (Info *info, GPPort *port, 
 	gp_port_write(port, address2, 2);	
 	/* Moving the memory cursor to the given address? */
 	while (( c[0] != 0xa) ) {	
-    	M_READ(port, c, 16); 	
+    	Ma_READ(port, c, 16); 	
 	}
 	
 	M_COMMAND(port, address3, 2, c);
@


1.1
log
@Fix build on Solaris.
 - There is no configure test for limits.h, just use it.
 - M_READ is a define pulled in from system headers
 - s/= =/=/ in a Makefile
@
text
@d1 1
a1 1
$NetBSD$
@