gphoto - universal digital camera picture control. www.gphoto.org

This commit is contained in:
dugsong 1999-12-05 18:11:13 +00:00
parent 714febb5c1
commit 0e0033a559
24 changed files with 544 additions and 0 deletions

24
graphics/gphoto/Makefile Normal file
View File

@ -0,0 +1,24 @@
# Makefile for: gphoto
# Version required: 0.4.0
# Date created: 7 Nov 1999
# Whom: dugsong@monkey.org
#
# $OpenBSD: Makefile,v 1.1.1.1 1999/12/05 18:11:13 dugsong Exp $
DISTNAME= gphoto-0.4.1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.gphoto.org/projects/gphoto/pub/tar/0.4/
MAINTAINER= dugsong@monkey.org
LIB_DEPENDS= gtk.1.2:${PORTSDIR}/x11/gtk+ \
Imlib.19:${PORTSDIR}/graphics/imlib \
Magick.4:${PORTSDIR}/graphics/ImageMagick
GNU_CONFIGURE= yes
USE_AUTOCONF= yes
.include <bsd.port.mk>

View File

@ -0,0 +1,3 @@
MD5 (gphoto-0.4.1.tar.gz) = 37d71ed13c12374eaaeb146918db3e81
RMD160 (gphoto-0.4.1.tar.gz) = c8a614b21d9babaae71e628373a4f9dd8ce48020
SHA1 (gphoto-0.4.1.tar.gz) = 573a493c99eb67cc5477d1152fc68a40bf6ff181

View File

@ -0,0 +1,11 @@
--- ./Makefile.am.orig Wed Nov 10 19:26:53 1999
+++ ./Makefile.am Wed Nov 10 19:27:10 1999
@@ -9,7 +9,7 @@
directory \
src gallery man
-gphotodocdir = $(datadir)/gphoto/doc
+gphotodocdir = $(datadir)/doc/gphoto
gphotodoc_DATA = AUTHORS MANUAL

View File

@ -0,0 +1,11 @@
--- ./Makefile.in.orig Wed Nov 10 18:58:36 1999
+++ ./Makefile.in Wed Nov 10 19:19:57 1999
@@ -91,7 +91,7 @@
SUBDIRS = canon casio fuji kodak kodak_generic konica minolta mustek philips konica_qmxxx photopc ricoh sony nikon directory src gallery man
-gphotodocdir = $(datadir)/gphoto/doc
+gphotodocdir = $(datadir)/doc/gphoto
gphotodoc_DATA = AUTHORS MANUAL

View File

@ -0,0 +1,37 @@
--- ./canon/serial.c.orig Wed Nov 10 18:17:45 1999
+++ ./canon/serial.c Wed Nov 10 18:45:39 1999
@@ -12,12 +12,16 @@
*
****************************************************************************/
+#include "config.h"
#include <stdio.h>
#include <unistd.h>
#include <termios.h>
#include <fcntl.h>
#include <sys/time.h>
#include <errno.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
#include "util.h"
@@ -62,7 +66,7 @@
D(printf("canon_init_serial(): devname %s\n", devname));
- #ifdef __FreeBSD__
+ #ifdef BSD
fd = open(devname, O_RDWR | O_NOCTTY | O_NONBLOCK);
#else
fd = open(devname, O_RDWR | O_NOCTTY | O_SYNC | O_NONBLOCK);
@@ -84,7 +88,7 @@
newtio.c_cflag = (newtio.c_cflag & ~CSIZE) | CS8;
/* Set into raw, no echo mode */
- #ifdef __FreeBSD__
+ #ifdef BSD
newtio.c_iflag &= ~(IGNBRK | IGNCR | INLCR | ICRNL |
IXANY | IXON | IXOFF | INPCK | ISTRIP);
#else

View File

@ -0,0 +1,30 @@
--- ./casio/casio_qv.c.orig Wed Nov 10 18:19:06 1999
+++ ./casio/casio_qv.c Wed Nov 10 18:45:20 1999
@@ -1,5 +1,9 @@
+#include "config.h"
#include <stdio.h>
#include <string.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
#include <gdk_imlib.h>
#include <gdk/gdk.h>
@@ -79,7 +83,7 @@
switch(speed) {
case LIGHT: /* 115200 baud */
-#if defined(WIN32) || defined (OS2) || defined(__FreeBSD__) || defined(DOS) || defined(__linux__)
+#if defined(WIN32) || defined (OS2) || defined(BSD) || defined(DOS) || defined(__linux__)
baud = B115200;
#else
baud = B38400;
@@ -87,7 +91,7 @@
break;
case TOP: /* 57600 baud */
-#if defined(WIN32) || defined(OS2) || defined(__FreeBSD__) || defined(DOS) || defined(__linux__)
+#if defined(WIN32) || defined(OS2) || defined(BSD) || defined(DOS) || defined(__linux__)
baud = B57600;
#else

View File

@ -0,0 +1,39 @@
--- ./casio/command.c.orig Wed Nov 10 18:20:45 1999
+++ ./casio/command.c Wed Nov 10 18:34:11 1999
@@ -3,6 +3,9 @@
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
#include <termios.h>
@@ -65,7 +68,7 @@
/*supposed to be 0x5c('Z') or 0x69*/
if (casio_qv_read(info, &c, 1) == SDC_FAIL) return(-1);
-#if !defined(__FreeBSD__) /* Why ? */
+#if !defined(BSD) /* Why ? */
if (!casio_qv_confirm_checksum(info, c)) {
print_error(CHECKSUM_FAILED, "QVreset");
return(-1);
@@ -766,7 +769,7 @@
switch(speed) {
case LIGHT: /* 115200 baud */
n = 3;
-#if defined(WIN32) || defined (OS2) || defined(__FreeBSD__) || defined(DOS) || defined(__linux__)
+#if defined(WIN32) || defined (OS2) || defined(BSD) || defined(DOS) || defined(__linux__)
baud = B115200;
#else
baud = B38400;
@@ -775,7 +778,7 @@
case TOP: /* 57600 baud */
n = 7;
-#if defined(WIN32) || defined(OS2) || defined(__FreeBSD__) || defined(DOS) || defined(__linux__)
+#if defined(WIN32) || defined(OS2) || defined(BSD) || defined(DOS) || defined(__linux__)
baud = B57600;
#else

View File

@ -0,0 +1,22 @@
--- ./casio/sdComm.c.orig Wed Nov 10 18:21:17 1999
+++ ./casio/sdComm.c Wed Nov 10 18:34:36 1999
@@ -26,6 +26,10 @@
#include <unistd.h>
#endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#else HAVE_TERMIOS_H
@@ -119,7 +123,7 @@
return(SDC_SUCCESS); /* Not technically a failure */
}
- #ifdef __FreeBSD__ /* by fujisawa */
+ #ifdef BSD /* by fujisawa */
info->fd = open(info->devName, O_RDWR );
#else
info->fd = open(info->devName, O_RDWR | O_SYNC /* | O_NDELAY */);

View File

@ -0,0 +1,23 @@
--- configure.in.orig Fri Nov 19 20:36:44 1999
+++ configure.in Sun Dec 5 12:46:04 1999
@@ -62,17 +62,17 @@
dnl Local setup
dnl Is there a better way of doing docs?
-GPHOTO_EXPAND_DIR(DOCDIR, "$datadir/gphoto/doc")
+GPHOTO_EXPAND_DIR(DOCDIR, "$datadir/doc/gphoto")
AC_DEFINE_UNQUOTED(DOCDIR, "$DOCDIR")
dnl Or gallery themes?
GPHOTO_EXPAND_DIR(GALLERYDIR, "$datadir/gphoto/gallery")
AC_DEFINE_UNQUOTED(GALLERYDIR, "$GALLERYDIR")
-driversdir='${pkglibdir}'
+driversdir='${libdir}/gphoto/drivers'
AC_SUBST(driversdir)
-gallerydir='${pkgdatadir}/gallery'
+gallerydir='${datadir}/gphoto/gallery'
AC_SUBST(gallerydir)
AC_OUTPUT(Makefile \

View File

@ -0,0 +1,19 @@
--- ./kodak_generic/kodak_dc240.c.orig Wed Nov 10 18:21:48 1999
+++ ./kodak_generic/kodak_dc240.c Wed Nov 10 18:46:09 1999
@@ -16,12 +16,14 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include "config.h"
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
-#ifdef __FreeBSD__
-#include <sys/types.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
#endif
+#include <sys/types.h>
#include <netinet/in.h>
#include "kodak_generic.h"

View File

@ -0,0 +1,19 @@
--- ./konica/qm100.h.orig Wed Nov 10 18:37:00 1999
+++ ./konica/qm100.h Wed Nov 10 18:46:50 1999
@@ -1,5 +1,6 @@
#ifndef _QM100_H
#define _QM100_H
+#include "config.h"
#include <fcntl.h>
#include <setjmp.h>
#include <stdio.h>
@@ -8,6 +9,9 @@
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
#include <termios.h>
#include <unistd.h>
#include <errno.h>

View File

@ -0,0 +1,19 @@
--- ./konica/setSpeed.c.orig Wed Nov 10 18:23:12 1999
+++ ./konica/setSpeed.c Wed Nov 10 18:23:27 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 */
+ #ifdef BSD /* 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__
+ #ifdef BSD
/**/
#else
newt.c_cflag &= ~(XCASE);

View File

@ -0,0 +1,50 @@
--- ./konica_qmxxx/os.c.orig Wed Nov 10 18:23:44 1999
+++ ./konica_qmxxx/os.c Wed Nov 10 18:56:26 1999
@@ -17,6 +17,7 @@
*
*/
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
@@ -27,16 +28,17 @@
#include <string.h>
#include <sys/time.h>
#include <sys/types.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
#include <sys/uio.h>
#include <sys/ioctl.h>
#include "log.h"
#include "os.h"
-#ifdef __FreeBSD__
- #if 3 <= __FreeBSD__
- #define FreeBSD_3
- #else
+#ifdef BSD
+ #if (defined (__FreeBSD__) && __FreeBSD__ < 3)
#error FreeBSD-2.2.x is not support for kernel sio bug
#endif
#endif
@@ -134,7 +136,6 @@
printf("19 V_spare2 0x%02x\n", 0 );
#endif
- #if defined(linux) || defined(FreeBSD_3)
switch( mode ){
case XON_XOFF: iflag = (IXON|IXOFF|IGNBRK); break;
case CRTS_CTS: iflag = (CRTSCTS); break;
@@ -146,9 +147,6 @@
sio_termios.c_lflag = 0;
//sio_termios.c_cc[VMIN] = 0;
//sio_termios.c_cc[VTIME] = 100;
- #else
- #error This OS is not support
- #endif
cfsetospeed(&sio_termios, B9600);
cfsetispeed(&sio_termios, B9600);

View File

@ -0,0 +1,18 @@
--- ./minolta/dimage_v.h.orig Wed Nov 10 18:40:10 1999
+++ ./minolta/dimage_v.h Wed Nov 10 18:47:21 1999
@@ -1,11 +1,15 @@
#ifndef __MINOLTA_H__
+#include "config.h"
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <termios.h>
#include <sys/stat.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
#include <errno.h>
#include <unistd.h>
#include "../src/gphoto.h"

View File

@ -0,0 +1,11 @@
--- ./minolta/dimage_v_util.c.orig Wed Nov 10 18:25:51 1999
+++ ./minolta/dimage_v_util.c Wed Nov 10 18:25:59 1999
@@ -6,7 +6,7 @@
int fd=-1, errorlen=0;
char *errormsg, *buffer;
- #ifdef __FreeBSD__
+ #ifdef BSD
fd = open(dimage_v_device, O_RDWR|O_NOCTTY);
#else
fd = open(dimage_v_device, O_RDWR|O_NOCTTY|O_SYNC);

View File

@ -0,0 +1,11 @@
--- ./philips/Makefile.in.orig Wed Nov 10 18:53:59 1999
+++ ./philips/Makefile.in Wed Nov 10 18:54:27 1999
@@ -102,7 +102,7 @@
LTLIBRARIES = $(drivers_LTLIBRARIES)
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I${prefix}/include
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@

View File

@ -0,0 +1,25 @@
--- ./photopc/eph_io.c.orig Wed Nov 10 18:26:19 1999
+++ ./photopc/eph_io.c Wed Nov 10 18:48:10 1999
@@ -67,9 +67,13 @@
*/
+#include "config.h"
#include "eph_io.h"
#include "eph_priv.h"
#include <sys/types.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
#ifdef UNIX
#include <time.h>
#include <unistd.h>
@@ -91,7 +95,7 @@
#define ERRNO errno
#endif
-#ifdef __FreeBSD__ /* by fujisawa */
+#ifdef BSD /* by fujisawa */
#undef HAVE_NANOSLEEP
#endif

View File

@ -0,0 +1,11 @@
--- ./ricoh/Makefile.in.orig Wed Nov 10 19:09:31 1999
+++ ./ricoh/Makefile.in Wed Nov 10 19:09:46 1999
@@ -103,7 +103,7 @@
LTLIBRARIES = $(drivers_LTLIBRARIES)
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I${prefix}/include
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@

View File

@ -0,0 +1,20 @@
--- ./sony/chotplay.c.orig Wed Nov 10 18:26:49 1999
+++ ./sony/chotplay.c Wed Nov 10 18:27:10 1999
@@ -812,7 +812,7 @@
switch(optarg[0]){
case 'l':
case '5':
-#if defined(WIN32) || defined(OS2) || defined(__FreeBSD__) || defined(DOS)
+#if defined(WIN32) || defined(OS2) || defined(BSD) || defined(DOS)
speed = B115200;
#else
speed = B38400;
@@ -820,7 +820,7 @@
break;
case 't':
case '4':
-#if defined(WIN32) || defined(OS2) || defined(__FreeBSD__) || defined(DOS)
+#if defined(WIN32) || defined(OS2) || defined(BSD) || defined(DOS)
speed = B57600;
#else
speed = B38400;

View File

@ -0,0 +1,11 @@
--- ./src/Makefile.in.orig Wed Nov 10 19:11:17 1999
+++ ./src/Makefile.in Wed Nov 10 19:12:10 1999
@@ -105,7 +105,7 @@
PROGRAMS = $(bin_PROGRAMS)
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I${prefix}/include
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@

View File

@ -0,0 +1,21 @@
--- ./src/callbacks.c.orig Wed Nov 10 18:28:31 1999
+++ ./src/callbacks.c Wed Nov 10 18:41:40 1999
@@ -28,6 +28,9 @@
#include <time.h>
#include <unistd.h>
#include <stdlib.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
#include "post_processing_on.xpm"
#include "post_processing_off.xpm"
@@ -430,7 +433,7 @@
#ifdef linux
sprintf(serial_port_prefix, "/dev/ttyS");
-#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(BSD)
sprintf(serial_port_prefix, "/dev/tty0");
#else
sprintf(serial_port_prefix, "/dev/tty0");

View File

@ -0,0 +1 @@
universal digital camera picture control tool

19
graphics/gphoto/pkg/DESCR Normal file
View File

@ -0,0 +1,19 @@
http://www.gphoto.org/
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. Visit
http://www.gphoto.org/cameras.php3 for an updated list.
-d.

89
graphics/gphoto/pkg/PLIST Normal file
View File

@ -0,0 +1,89 @@
bin/gphoto
bin/gphoto-exifdump
bin/qm100
bin/qmxxx
bin/rsony
lib/gphoto/drivers/libgphoto_canon.a
lib/gphoto/drivers/libgphoto_canon.la
lib/gphoto/drivers/libgphoto_canon.so.0.0
lib/gphoto/drivers/libgphoto_casio_qv.a
lib/gphoto/drivers/libgphoto_casio_qv.la
lib/gphoto/drivers/libgphoto_casio_qv.so.0.0
lib/gphoto/drivers/libgphoto_coolpix600.a
lib/gphoto/drivers/libgphoto_coolpix600.la
lib/gphoto/drivers/libgphoto_coolpix600.so.0.0
lib/gphoto/drivers/libgphoto_dimage_v.a
lib/gphoto/drivers/libgphoto_dimage_v.la
lib/gphoto/drivers/libgphoto_dimage_v.so.0.0
lib/gphoto/drivers/libgphoto_dir.a
lib/gphoto/drivers/libgphoto_dir.la
lib/gphoto/drivers/libgphoto_dir.so.0.0
lib/gphoto/drivers/libgphoto_fuji.a
lib/gphoto/drivers/libgphoto_fuji.la
lib/gphoto/drivers/libgphoto_fuji.so.0.0
lib/gphoto/drivers/libgphoto_kodak_dc2x.a
lib/gphoto/drivers/libgphoto_kodak_dc2x.la
lib/gphoto/drivers/libgphoto_kodak_dc2x.so.0.0
lib/gphoto/drivers/libgphoto_kodak_generic.a
lib/gphoto/drivers/libgphoto_kodak_generic.la
lib/gphoto/drivers/libgphoto_kodak_generic.so.0.0
lib/gphoto/drivers/libgphoto_konica_qm100.a
lib/gphoto/drivers/libgphoto_konica_qm100.la
lib/gphoto/drivers/libgphoto_konica_qm100.so.0.0
lib/gphoto/drivers/libgphoto_konica_qmxxx.a
lib/gphoto/drivers/libgphoto_konica_qmxxx.la
lib/gphoto/drivers/libgphoto_konica_qmxxx.so.0.0
lib/gphoto/drivers/libgphoto_mustek_mdc800.a
lib/gphoto/drivers/libgphoto_mustek_mdc800.la
lib/gphoto/drivers/libgphoto_mustek_mdc800.so.1.0
lib/gphoto/drivers/libgphoto_philips.a
lib/gphoto/drivers/libgphoto_philips.la
lib/gphoto/drivers/libgphoto_philips.so.0.5
lib/gphoto/drivers/libgphoto_photopc.a
lib/gphoto/drivers/libgphoto_photopc.la
lib/gphoto/drivers/libgphoto_photopc.so.0.0
lib/gphoto/drivers/libgphoto_ricoh300z.a
lib/gphoto/drivers/libgphoto_ricoh300z.la
lib/gphoto/drivers/libgphoto_ricoh300z.so.0.0
lib/gphoto/drivers/libgphoto_sony_dscf1.a
lib/gphoto/drivers/libgphoto_sony_dscf1.la
lib/gphoto/drivers/libgphoto_sony_dscf1.so.0.0
lib/gphoto/drivers/libgphoto_sony_dscf55.a
lib/gphoto/drivers/libgphoto_sony_dscf55.la
lib/gphoto/drivers/libgphoto_sony_dscf55.so.0.0
man/man1/gphoto.1
share/doc/gphoto/AUTHORS
share/doc/gphoto/MANUAL
share/gphoto/gallery/CSStheme/gphotobutton.png
share/gphoto/gallery/CSStheme/index_bottom.html
share/gphoto/gallery/CSStheme/index_top.html
share/gphoto/gallery/CSStheme/mwcos.png
share/gphoto/gallery/CSStheme/picture.html
share/gphoto/gallery/CSStheme/styles.css
share/gphoto/gallery/CSStheme/thumbnail.html
share/gphoto/gallery/CSStheme/vh40.png
share/gphoto/gallery/Default/banner.gif
share/gphoto/gallery/Default/index.gif
share/gphoto/gallery/Default/index_bottom.html
share/gphoto/gallery/Default/index_top.html
share/gphoto/gallery/Default/next.gif
share/gphoto/gallery/Default/picture.html
share/gphoto/gallery/Default/previous.gif
share/gphoto/gallery/Default/thumbnail.html
share/gphoto/gallery/RedNGray/backgrnd.gif
share/gphoto/gallery/RedNGray/banner.gif
share/gphoto/gallery/RedNGray/index.gif
share/gphoto/gallery/RedNGray/index_bottom.html
share/gphoto/gallery/RedNGray/index_top.html
share/gphoto/gallery/RedNGray/next.gif
share/gphoto/gallery/RedNGray/picture.html
share/gphoto/gallery/RedNGray/previous.gif
share/gphoto/gallery/RedNGray/thumbnail.html
@dirrm share/gphoto/gallery/RedNGray
@dirrm share/gphoto/gallery/Default
@dirrm share/gphoto/gallery/CSStheme
@dirrm share/gphoto/gallery
@dirrm share/gphoto
@dirrm share/doc/gphoto
@dirrm lib/gphoto/drivers
@dirrm lib/gphoto