Initial import of gphoto-0.4.1

gPhoto is an universal, free GTK+ application that will allow
downloading, saving, and manipulation of images from several 
different digital camera models, or from the local harddrive.

gPhoto has a basic command line interface, which is handy, 
if you want to set up a web camera, and use gphoto in a 
script, e.g. with Perl/PHP.  

gPhoto sports a new HTML engine, that let's you create your
gallery "themes" (HTML with special tags), and publish images 
to the web.  A directory browse mode has also been implemented.

gPhoto supports a wide array of digital camera models.  

8 files changed, 192 insertions, 0 deletions

diff --git a/graphics/gphoto/patches/patch-aa b/graphics/gphoto/patches/patch-aa
new file mode 100644
index 00000000000..4844ea5af23
--- /dev/null
+++ b/graphics/gphoto/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 1999/11/30 00:01:38 dmcmahill Exp $
+
+--- canon/serial.c.orig	Wed Nov 24 23:37:05 1999
++++ canon/serial.c	Wed Nov 24 23:48:38 1999
+@@ -84,7 +84,7 @@
+     newtio.c_cflag = (newtio.c_cflag & ~CSIZE) | CS8;
+ 
+     /* Set into raw, no echo mode */
+-    #ifdef __FreeBSD__
++    #if defined(__FreeBSD__) || defined(__NetBSD__)
+     newtio.c_iflag &= ~(IGNBRK | IGNCR | INLCR | ICRNL | 
+ 			IXANY | IXON | IXOFF | INPCK | ISTRIP);
+     #else
diff --git a/graphics/gphoto/patches/patch-ab b/graphics/gphoto/patches/patch-ab
new file mode 100644
index 00000000000..937dd7aee50
--- /dev/null
+++ b/graphics/gphoto/patches/patch-ab
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.1.1.1 1999/11/30 00:01:38 dmcmahill Exp $
+
+--- konica/setSpeed.c.orig	Wed Nov 24 23:41:49 1999
++++ konica/setSpeed.c	Wed Nov 24 23:49:08 1999
+@@ -17,14 +17,14 @@
+ 
+   newt.c_cflag |= CS8;
+   newt.c_iflag &= ~(IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK|ISTRIP|INLCR);
+-  #ifdef __FreeBSD__ /* by fujisawa@konica.co.jp */
++  #if defined(__FreeBSD__) || defined(__NetBSD__) /* by fujisawa@konica.co.jp */
+   newt.c_iflag &= ~(IGNCR|ICRNL|IXON|IXOFF|      IXANY|IMAXBEL);
+   #else
+   newt.c_iflag &= ~(IGNCR|ICRNL|IXON|IXOFF|IUCLC|IXANY|IMAXBEL);
+   #endif
+   newt.c_oflag &= ~(OPOST);
+   newt.c_lflag &= ~(ISIG|ICANON);
+-  #ifdef __FreeBSD__
++  #if defined(__FreeBSD__) || defined(__NetBSD__)
+   /**/
+   #else
+   newt.c_cflag &= ~(XCASE);
diff --git a/graphics/gphoto/patches/patch-ac b/graphics/gphoto/patches/patch-ac
new file mode 100644
index 00000000000..45b3bbb926d
--- /dev/null
+++ b/graphics/gphoto/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1.1.1 1999/11/30 00:01:38 dmcmahill Exp $
+
+--- konica_qmxxx/os.c.orig	Wed Nov 24 23:44:27 1999
++++ konica_qmxxx/os.c	Wed Nov 24 23:45:01 1999
+@@ -134,7 +134,7 @@
+ 	printf("19 V_spare2  0x%02x\n", 0 );
+ 	#endif
+ 
+-	#if defined(linux) || defined(FreeBSD_3)
++	#if defined(linux) || defined(FreeBSD_3) || defined(__NetBSD__)
+ 		switch( mode ){
+ 		case XON_XOFF:	iflag = (IXON|IXOFF|IGNBRK);	break;
+ 		case CRTS_CTS:	iflag = (CRTSCTS);		break;
diff --git a/graphics/gphoto/patches/patch-ad b/graphics/gphoto/patches/patch-ad
new file mode 100644
index 00000000000..f41194cd57a
--- /dev/null
+++ b/graphics/gphoto/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.1.1.1 1999/11/30 00:01:38 dmcmahill Exp $
+
+--- mustek/device.c.orig	Wed Nov 24 23:46:03 1999
++++ mustek/device.c	Wed Nov 24 23:47:06 1999
+@@ -59,8 +59,13 @@
+ 	newtio.c_cflag = (newtio.c_cflag & ~CSIZE) | CS8;
+ 
+ 	//  Set into raw, no echo mode 
++	#if defined(__NetBSD__)
++	newtio.c_iflag &= ~(IGNBRK | IGNCR | INLCR | ICRNL |
++		IXANY | IXON | IXOFF | INPCK | ISTRIP);
++	#else
+ 	newtio.c_iflag &= ~(IGNBRK | IGNCR | INLCR | ICRNL | IUCLC |
+ 		IXANY | IXON | IXOFF | INPCK | ISTRIP);
++	#endif
+ 	newtio.c_iflag |= (BRKINT | IGNPAR);
+ 	newtio.c_oflag &= ~OPOST;
+ 	newtio.c_lflag = ~(ICANON | ISIG | ECHO | ECHONL | ECHOE | ECHOK);
diff --git a/graphics/gphoto/patches/patch-ae b/graphics/gphoto/patches/patch-ae
new file mode 100644
index 00000000000..b28c597a6b4
--- /dev/null
+++ b/graphics/gphoto/patches/patch-ae
@@ -0,0 +1,47 @@
+$NetBSD: patch-ae,v 1.1.1.1 1999/11/30 00:01:38 dmcmahill Exp $
+
+--- kodak/kodak_dc210.c.orig	Thu Nov 25 00:00:33 1999
++++ kodak/kodak_dc210.c	Thu Nov 25 00:18:45 1999
+@@ -372,7 +372,7 @@
+ 
+   struct termios newt, oldt;
+ 
+-  serialdev = open(devname, O_RDWR|O_NOCTTY);
++  serialdev = open(devname, O_RDWR|O_NOCTTY|O_NONBLOCK);
+ 
+   if (serialdev < 0) 
+     error_dialog("Cannot open device");
+@@ -384,10 +384,11 @@
+ 
+   /* need the device to be raw. 8 bits no parity on 9600 baud to start.  */
+   cfmakeraw(&newt);
+-  newt.c_oflag &= ~CSTOPB;
++  newt.c_cflag &= ~CSTOPB;
+   newt.c_cflag &= ~PARENB;
+   newt.c_cflag |= CS8;
+   newt.c_cflag &= ~PARODD;
++  newt.c_cflag |= CRTSCTS;
+ 
+   newt.c_cc[VMIN] = 0;
+   newt.c_cc[VTIME] = 10;
+@@ -594,10 +595,16 @@
+       memcpy(imData,bmpHeader, sizeof(bmpHeader));
+ 
+       /* reverse the thumbnail data */
+-      for (j=fileSize-1,i=54; j >= 0 ; j--)
+-      {
+-	imData[i++] = picData[j];
+-      }
++      /* not only is the data reversed but the image is flipped
++       * left to right
++       */
++      for (i = 0; i < 72; i++) {
++         for (j = 0; j < 96; j++) {
++            imData[i*96*3+j*3+54] = picData[(71-i)*96*3+j*3+2];
++            imData[i*96*3+j*3+54+1] = picData[(71-i)*96*3+j*3+1];
++            imData[i*96*3+j*3+54+2] = picData[(71-i)*96*3+j*3];
++            }
++         }
+ 
+       strcpy ( im->image_type, "bmp" );
+       im->image_info = NULL;
diff --git a/graphics/gphoto/patches/patch-af b/graphics/gphoto/patches/patch-af
new file mode 100644
index 00000000000..a07e1578a6b
--- /dev/null
+++ b/graphics/gphoto/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1.1.1 1999/11/30 00:01:38 dmcmahill Exp $
+
+--- ./configure.orig	Fri Nov 19 21:32:38 1999
++++ ./configure	Mon Nov 29 15:40:55 1999
+@@ -1583,8 +1583,8 @@
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
++#LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++#LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
diff --git a/graphics/gphoto/patches/patch-ag b/graphics/gphoto/patches/patch-ag
new file mode 100644
index 00000000000..37b9afedcdc
--- /dev/null
+++ b/graphics/gphoto/patches/patch-ag
@@ -0,0 +1,53 @@
+$NetBSD: patch-ag,v 1.1.1.1 1999/11/30 00:01:38 dmcmahill Exp $
+
+--- ./casio/configure.c.orig	Thu May 27 14:32:02 1999
++++ ./casio/configure.c	Mon Nov 29 16:16:10 1999
+@@ -226,5 +226,5 @@
+   gtk_signal_connect (GTK_OBJECT (normalSize), "pressed",
+                       GTK_SIGNAL_FUNC (setSize),
+-                      0);
++                      (gpointer) 0);
+ 
+   doubleSize = gtk_radio_button_new_with_label (Size_group, "640 x 480");
+@@ -236,5 +236,5 @@
+   gtk_signal_connect (GTK_OBJECT (doubleSize), "pressed",
+                       GTK_SIGNAL_FUNC (setSize),
+-                      1);
++                      (gpointer) 1);
+ 
+   vbox1 = gtk_vbox_new (FALSE, 0);
+@@ -252,5 +252,5 @@
+   gtk_signal_connect_after (GTK_OBJECT (spd_9600), "pressed",
+                             GTK_SIGNAL_FUNC (on_spd_pressed),
+-                            DEFAULT);
++                            (gpointer) DEFAULT);
+ 
+   spd_19200 = gtk_radio_button_new_with_label (Speed_group, "19200");
+@@ -262,5 +262,5 @@
+   gtk_signal_connect_after (GTK_OBJECT (spd_19200), "pressed",
+                             GTK_SIGNAL_FUNC (on_spd_pressed),
+-                            MID);
++                            (gpointer) MID);
+ 
+   spd_38400 = gtk_radio_button_new_with_label (Speed_group, "38400");
+@@ -272,5 +272,5 @@
+   gtk_signal_connect_after (GTK_OBJECT (spd_38400), "pressed",
+                             GTK_SIGNAL_FUNC (on_spd_pressed),
+-                            HIGH);
++                            (gpointer) HIGH);
+ 
+   spd_57600 = gtk_radio_button_new_with_label (Speed_group, "57600");
+@@ -282,5 +282,5 @@
+   gtk_signal_connect_after (GTK_OBJECT (spd_57600), "pressed",
+                             GTK_SIGNAL_FUNC (on_spd_pressed),
+-                            TOP);
++                            (gpointer) TOP);
+ 
+   spd_115200 = gtk_radio_button_new_with_label (Speed_group, "115200");
+@@ -292,5 +292,5 @@
+   gtk_signal_connect_after (GTK_OBJECT (spd_115200), "pressed",
+                             GTK_SIGNAL_FUNC (on_spd_pressed),
+-                            LIGHT);
++                            (gpointer) LIGHT);
+ 
+   vbox3 = gtk_vbox_new (FALSE, 0);
diff --git a/graphics/gphoto/patches/patch-ah b/graphics/gphoto/patches/patch-ah
new file mode 100644
index 00000000000..5e7f585bf59
--- /dev/null
+++ b/graphics/gphoto/patches/patch-ah
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1.1.1 1999/11/30 00:01:38 dmcmahill Exp $
+
+--- ./mustek/rs232.c.orig	Thu Nov 18 16:50:35 1999
++++ ./mustek/rs232.c	Mon Nov 29 16:17:36 1999
+@@ -32,5 +32,7 @@
+ #include <fcntl.h>
+ #include <termios.h>
++#include <sys/types.h>
+ #include <sys/time.h>
++#include <unistd.h>
+ 
+ /*