- remove obsolete gphoto as it has been deprecated and unmaintained for

years in favor of gphoto2

"no objections" from sturm@ who didn't know what gphoto was
"seems reasonable" to pvalchev@

rip...
This commit is contained in:
ajacoutot 2009-01-28 10:10:19 +00:00
parent 68a32a0dcd
commit b1a7d74100
34 changed files with 0 additions and 872 deletions

View File

@ -1,51 +0,0 @@
# $OpenBSD: Makefile,v 1.24 2008/12/14 19:18:02 ajacoutot Exp $
COMMENT= universal digital camera picture control tool
DISTNAME= gphoto-0.4.3
PKGNAME= ${DISTNAME}p4
SHARED_LIBS= gphoto_canon 0.0 \
gphoto_casio_qv 0.0 \
gphoto_coolpix600 0.0 \
gphoto_dimage_v 0.0 \
gphoto_dir 0.0 \
gphoto_fuji 0.0 \
gphoto_kodak_dc2x 0.0 \
gphoto_kodak_generic 0.0 \
gphoto_konica_qm100 0.0 \
gphoto_konica_qmxxx 0.0 \
gphoto_mustek_mdc800 1.0 \
gphoto_philips 0.5 \
gphoto_photopc 0.0 \
gphoto_ricoh300z 0.0 \
gphoto_samsung 0.0 \
gphoto_sony_dscf1 0.0 \
gphoto_sony_dscf55 0.0
CATEGORIES= graphics
MASTER_SITES= http://www.gphoto.org/dist/
HOMEPAGE= http://www.gphoto.org/
LIB_DEPENDS= gdk_imlib::graphics/imlib
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xau Xdmcp Xext Xi ICE SM c gdk glib gmodule gtk \
jpeg m png tiff ungif z
MODULES= devel/gettext
USE_X11= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS='-DDOCDIR="${PREFIX}/share/doc/gphoto"'
post-extract:
@perl -pi -e 's/\r$$//' ${WRKSRC}/sony/command.c
.include <bsd.port.mk>

View File

@ -1,5 +0,0 @@
MD5 (gphoto-0.4.3.tar.gz) = i05w33iHBHnS2aRcj0219A==
RMD160 (gphoto-0.4.3.tar.gz) = sM796lW1kuI3oHh2iSVcKTkYBgg=
SHA1 (gphoto-0.4.3.tar.gz) = 8GBkRMoLPDcGWwIsviiuJlcErzk=
SHA256 (gphoto-0.4.3.tar.gz) = jG+12IXm4xLU4LaC8pEuBMm6jWpXk93hfiXFYiYOXPQ=
SIZE (gphoto-0.4.3.tar.gz) = 709336

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Makefile.in,v 1.2 2004/05/15 18:37:53 naddy Exp $
--- Makefile.in.orig 2000-03-06 23:06:33.000000000 +0100
+++ Makefile.in 2004-05-15 19:17:35.000000000 +0200
@@ -90,7 +90,7 @@ CFLAGS = -O2 -Wall
SUBDIRS = canon casio directory fuji gallery kodak kodak_generic konica konica_qmxxx man minolta mustek nikon philips photopc ricoh samsung sony src
-gphotodocdir = $(datadir)/gphoto/doc
+gphotodocdir = $(datadir)/doc/gphoto
gphotodoc_DATA = AUTHORS MANUAL

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-canon_serial_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- canon/serial.c.orig Sat Dec 13 13:22:26 2008
+++ canon/serial.c Sat Dec 13 13:23:06 2008
@@ -19,6 +19,7 @@
#include <sys/time.h>
#include <errno.h>
#include <sys/ioctl.h>
+#include <string.h>
#include "util.h"

View File

@ -1,22 +0,0 @@
$OpenBSD: patch-directory_directory_c,v 1.1 2004/05/15 18:37:53 naddy Exp $
--- directory/directory.c.orig 2004-05-15 19:15:18.000000000 +0200
+++ directory/directory.c 2004-05-15 19:15:49.000000000 +0200
@@ -206,12 +206,12 @@ char *dir_summary() {
static char *dir_description() {
return(
-"Browse Directory\nScott Fritzinger <scottf@unr.edu>
-Allows the user to \"open\" a directory of
-images and all gPhoto functions will work
-on those images (HTML Gallery, etc...)\n
-This will not work in command-line mode,
-due to the high amount of input needed
+"Browse Directory\nScott Fritzinger <scottf@unr.edu>\n\
+Allows the user to \"open\" a directory of\n\
+images and all gPhoto functions will work\n\
+on those images (HTML Gallery, etc...)\n\n\
+This will not work in command-line mode,\n\
+due to the high amount of input needed\n\
to set it up.");
}

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-fuji_fujilib_c,v 1.1 2004/05/15 18:37:53 naddy Exp $
--- fuji/fujilib.c.orig 2004-05-15 19:21:12.000000000 +0200
+++ fuji/fujilib.c 2004-05-15 19:21:37.000000000 +0200
@@ -1157,13 +1157,13 @@ char *fuji_summary() {
char *fuji_description() {
return(
-"Generic Fuji
-Matthew G. Martin
-Based on fujiplay by
-Thierry Bousch<bousch@topo.math.u-psud.fr>
-
-Known to work with Fuji DS-7 and DX-5,7,10 and MX-500,600,700,2700
-, Apple QuickTake 200,Samsung Kenox SSC-350N cameras,
+"Generic Fuji\n\
+Matthew G. Martin\n\
+Based on fujiplay by\n\
+Thierry Bousch<bousch@topo.math.u-psud.fr>\n\
+\n\
+Known to work with Fuji DS-7 and DX-5,7,10 and MX-500,600,700,2700\n\
+, Apple QuickTake 200,Samsung Kenox SSC-350N cameras, \n\
but may support other Fuji cams as well.");
}

View File

@ -1,56 +0,0 @@
$OpenBSD: patch-kodak_dc21x_main_c,v 1.1 2004/05/15 18:37:53 naddy Exp $
--- kodak/dc21x/main.c.orig 2004-05-15 19:22:49.000000000 +0200
+++ kodak/dc21x/main.c 2004-05-15 19:23:25.000000000 +0200
@@ -54,29 +54,29 @@ void print_info( int type )
void usage(void)
{
- printf ("Kodak DC21x Digital Camera utility by timecop [timecop@japan.co.jp]
-
- Usage:
- -s n Use /dev/ttySn for camera port
- -q Minimum messages to console [script use]
-
- -i [n] Display Camera [ or picture n ] information
- -n Display number of pictures in camera
- -d n Delete image number n from camera
- -D Delete all images from camera
- -t [filename] Take a picture, save to filename
- -r [n] [fname] Retrieve picture n, save as fname
- -R Retrieve all pictures, save as imageNNN.jpg
-
- -z 1|0 Set resolution to [1:High,0:Low]
- -Q 1-3 Set JPEG quality. [1:Best,2:Better,3:Good]
- -Z 0..4 | 5 Set zoom. [0:58mm,1:51mm,2:41mm,3:34mm,4:29mm,5:Macro]
- -f 0-4 Flash setting. [0:Auto,1:Flash,2:NoFlash]
- [3:RedEyeAuto,4:RedEyeFlash]
-
- Some options can be combined, for example:
- cam -s 2 -z 0 -q -f 1 -t webcam.jpg
-
+ printf ("Kodak DC21x Digital Camera utility by timecop [timecop@japan.co.jp]\n\
+\n\
+ Usage:\n\
+ -s n Use /dev/ttySn for camera port\n\
+ -q Minimum messages to console [script use]\n\
+ \n\
+ -i [n] Display Camera [ or picture n ] information\n\
+ -n Display number of pictures in camera\n\
+ -d n Delete image number n from camera\n\
+ -D Delete all images from camera\n\
+ -t [filename] Take a picture, save to filename\n\
+ -r [n] [fname] Retrieve picture n, save as fname\n\
+ -R Retrieve all pictures, save as imageNNN.jpg\n\
+\n\
+ -z 1|0 Set resolution to [1:High,0:Low]\n\
+ -Q 1-3 Set JPEG quality. [1:Best,2:Better,3:Good]\n\
+ -Z 0..4 | 5 Set zoom. [0:58mm,1:51mm,2:41mm,3:34mm,4:29mm,5:Macro]\n\
+ -f 0-4 Flash setting. [0:Auto,1:Flash,2:NoFlash]\n\
+ [3:RedEyeAuto,4:RedEyeFlash]\n\
+ \n\
+ Some options can be combined, for example:\n\
+ cam -s 2 -z 0 -q -f 1 -t webcam.jpg\n\
+\n\
");
}

View File

@ -1,28 +0,0 @@
$OpenBSD: patch-kodak_kodak_dc210_c,v 1.2 2008/12/14 19:18:02 ajacoutot Exp $
--- kodak/kodak_dc210.c.orig Thu Jan 20 22:42:17 2000
+++ kodak/kodak_dc210.c Sat Dec 13 15:42:49 2008
@@ -10,6 +10,7 @@
#include <stdarg.h>
#include <termios.h>
#include <fcntl.h>
+#include <string.h>
/* glib is used for byte swapping and endian checking */
@@ -789,11 +790,11 @@ char *kodak_dc210_summary()
char *kodak_dc210_description()
{
- return("Enhanced Kodak DC210 support
-by TimeCop <timecop@japan.co.jp>
-http://www.ne.jp/asahi/linux/timecop
-based on original code
-by Brian Hirt <bhirt@mobygames.com>
+ return("Enhanced Kodak DC210 support\n\
+by TimeCop <timecop@japan.co.jp>\n\
+http://www.ne.jp/asahi/linux/timecop\n\
+based on original code\n\
+by Brian Hirt <bhirt@mobygames.com> \n\
http://www.mobygames.com");
}

View File

@ -1,28 +0,0 @@
$OpenBSD: patch-kodak_kodak_dc2x_c,v 1.2 2008/12/14 19:18:02 ajacoutot Exp $
--- kodak/kodak_dc2x.c.orig Sun Dec 5 19:48:53 1999
+++ kodak/kodak_dc2x.c Sat Dec 13 13:22:12 2008
@@ -357,15 +357,15 @@ dc20_info->model, dc20_info->pic_taken, dc20_info->pic
char *kodak_dc2x_description() {
return(
-"Kodak DC25 and DC20 support
-by Del Simmons <del@freespeech.com>.
-This code is working on my DC25 but
-I know it will have some problems with
-the DC20. If you have a DC20, please
-give it a shot and let me know all
-the places it fails. If compiling for
-the DC20, please try removng the -DDC25
-flag from the Makefile in the kodak
+"Kodak DC25 and DC20 support \n\
+by Del Simmons <del@freespeech.com>. \n\
+This code is working on my DC25 but \n\
+I know it will have some problems with \n\
+the DC20. If you have a DC20, please \n\
+give it a shot and let me know all \n\
+the places it fails. If compiling for\n\
+the DC20, please try removng the -DDC25\n\
+flag from the Makefile in the kodak \n\
directory. Thanks!");
}

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-konica_qmxxx_qm_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- konica_qmxxx/qm.c.orig Sat Dec 13 15:43:02 2008
+++ konica_qmxxx/qm.c Sat Dec 13 15:43:12 2008
@@ -25,6 +25,7 @@
#include <sys/stat.h>
#include <sys/uio.h>
#include <unistd.h>
+#include <string.h>
#include "../src/gphoto.h"
#include "../src/util.h"

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-mustek_core_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- mustek/core.c.orig Sat Dec 13 13:24:52 2008
+++ mustek/core.c Sat Dec 13 13:25:02 2008
@@ -27,6 +27,7 @@
#include <termios.h>
#include <sys/time.h>
#include <stdlib.h>
+#include <string.h>
#include "print.h"
#include "device.h"

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-mustek_image_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- mustek/image.c.orig Sat Dec 13 13:24:16 2008
+++ mustek/image.c Sat Dec 13 13:24:39 2008
@@ -22,6 +22,8 @@
* is used.
*/
+#include <string.h>
+
#include "image.h"
#include "print.h"

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-mustek_print_h,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- mustek/print.h.orig Sat Dec 13 14:58:47 2008
+++ mustek/print.h Sat Dec 13 14:58:57 2008
@@ -5,6 +5,7 @@
#ifndef DEFINE_PRINT_H
#define DEFINE_PRINT_H
#include <stdio.h>
+#include <string.h>
/* Message or Errors from the gphoto API */
#define printAPINote if (1) printf

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-nikon_coolpix600_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- nikon/coolpix600.c.orig Sat Dec 13 15:43:26 2008
+++ nikon/coolpix600.c Sat Dec 13 15:43:40 2008
@@ -61,6 +61,7 @@
#include<setjmp.h>
#include<sys/time.h>
#include<signal.h>
+#include <string.h>
#include "../src/gphoto.h"
#include "../src/util.h"

View File

@ -1,74 +0,0 @@
$OpenBSD: patch-philips_philips_h,v 1.1 2004/05/15 18:37:53 naddy Exp $
--- philips/philips.h.orig 2004-05-15 19:26:36.000000000 +0200
+++ philips/philips.h 2004-05-15 19:27:09.000000000 +0200
@@ -86,38 +86,38 @@ typedef struct PHILIPS_CFG {
static char *philips_description_string =
-"Philips/Ricoh gPhoto Library
-Bob Paauwe <bpaauwe@bobsplace.com>
-http://www.bobsplace.com/philips/
-
-The following cameras are known to work:
-Philips ESP60
-Philips ESP80
-Ricoh RDC-300
-Ricoh RDC-300Z
-Ricoh RDC-4200
-Ricoh RDC-4300
-Ricoh RDC-5000
-
-Should work with other Ricoh and Philips
-models but I need the identifier number for
-them. If you have a:
-
- RDC-1, RDC-2, RDC-2E, RDC-100G, ESP50,
- ESP60, or ESP2
-
-please bring up the configuration dialog
-box and send me the number that appears in
-the status bar as Unkown model nnnn.
-
-Known Issues as of 8/25/1999:
- 1) Thumbnails are only displayed
- in black & white. (except RDC-5000)
- 2) philips_get_preview function only
- works for Philips ESP80/Ricoh 4x00
- cameras.
- 3) Every other thumbnail times out
- with RDC-5000.
+"Philips/Ricoh gPhoto Library\n\
+Bob Paauwe <bpaauwe@bobsplace.com>\n\
+http://www.bobsplace.com/philips/\n\
+\n\
+The following cameras are known to work:\n\
+Philips ESP60\n\
+Philips ESP80\n\
+Ricoh RDC-300\n\
+Ricoh RDC-300Z\n\
+Ricoh RDC-4200\n\
+Ricoh RDC-4300\n\
+Ricoh RDC-5000\n\
+\n\
+Should work with other Ricoh and Philips\n\
+models but I need the identifier number for\n\
+them. If you have a:\n\
+\n\
+ RDC-1, RDC-2, RDC-2E, RDC-100G, ESP50, \n\
+ ESP60, or ESP2 \n\
+\n\
+please bring up the configuration dialog\n\
+box and send me the number that appears in\n\
+the status bar as Unkown model nnnn.\n\
+\n\
+Known Issues as of 8/25/1999:\n\
+ 1) Thumbnails are only displayed\n\
+ in black & white. (except RDC-5000)\n\
+ 2) philips_get_preview function only\n\
+ works for Philips ESP80/Ricoh 4x00\n\
+ cameras.\n\
+ 3) Every other thumbnail times out \n\
+ with RDC-5000.\n\
";

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-photopc_eph_cmd_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- photopc/eph_cmd.c.orig Sat Dec 13 15:43:55 2008
+++ photopc/eph_cmd.c Sat Dec 13 15:44:05 2008
@@ -65,6 +65,7 @@
#include "../src/gphoto.h"
#include "../src/util.h"
#include <stdio.h>
+#include <string.h>
#define TMPBUF_SIZE (2048)

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-photopc_eph_open_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- photopc/eph_open.c.orig Sat Dec 13 15:25:31 2008
+++ photopc/eph_open.c Sat Dec 13 15:25:45 2008
@@ -102,6 +102,7 @@
#include <stdlib.h>
#include <fcntl.h>
#include <errno.h>
+#include <string.h>
#ifdef MSWINDOWS
#define ERRNO GetLastError()

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-photopc_olympus_c,v 1.1 2004/05/15 18:37:53 naddy Exp $
--- photopc/olympus.c.orig 2004-05-15 19:27:56.000000000 +0200
+++ photopc/olympus.c 2004-05-15 19:28:13.000000000 +0200
@@ -594,10 +594,10 @@ char *oly_summary() {
char *oly_description() {
return(
-"Olympus/PhotoPC Digital Camera Support
-Scott Fritzinger <scottf@unr.edu>
-using the photoPC library by
-Eugene Crosser <crosser@average.org>
+"Olympus/PhotoPC Digital Camera Support\n\
+Scott Fritzinger <scottf@unr.edu>\n\
+using the photoPC library by\n\
+Eugene Crosser <crosser@average.org>\n\
http://www.average.org/digicam");
}

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-ricoh_ricoh_300_io_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- ricoh/ricoh_300_io.c.orig Sat Dec 13 15:26:54 2008
+++ ricoh/ricoh_300_io.c Sat Dec 13 15:27:06 2008
@@ -25,6 +25,7 @@
#include <time.h>
#include <sys/time.h>
#include <sys/stat.h>
+#include <string.h>
/* debuging macros */
#define dprintf(x) \

View File

@ -1,30 +0,0 @@
$OpenBSD: patch-ricoh_ricoh_300z_c,v 1.2 2008/12/14 19:18:02 ajacoutot Exp $
--- ricoh/ricoh_300z.c.orig Sun Oct 3 01:41:37 1999
+++ ricoh/ricoh_300z.c Sat Dec 13 15:44:23 2008
@@ -4,6 +4,7 @@
#include <jpeglib.h>
#include <setjmp.h>
#include <time.h>
+#include <string.h>
#include "../src/gphoto.h"
#include "../src/util.h"
@@ -914,12 +915,12 @@ char *ricoh_300z_summary() {
char *ricoh_300z_description() {
return(
-"Ricoh 300Z
-Clifford Wright <cliff@snipe444.org>
-
-*The Ricoh 300Z does not support thumbnail
-previewing, so the thumbnails that appear
-are place holders until the actual images
+"Ricoh 300Z\n\
+Clifford Wright <cliff@snipe444.org>\n\
+\n\
+*The Ricoh 300Z does not support thumbnail\n\
+previewing, so the thumbnails that appear\n\
+are place holders until the actual images\n\
are downloaded.");
}

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-samsung_samsung_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- samsung/samsung.c.orig Thu Jan 27 00:12:42 2000
+++ samsung/samsung.c Sat Dec 13 15:44:40 2008
@@ -42,6 +42,8 @@
#include<setjmp.h>
#include<sys/time.h>
#include<signal.h>
+#include <stdlib.h>
+#include <string.h>
#include "../src/gphoto.h"
#include "../src/util.h"

View File

@ -1,26 +0,0 @@
$OpenBSD: patch-sony_command_c,v 1.2 2008/12/14 19:18:02 ajacoutot Exp $
--- sony/command.c.orig Sat Dec 13 15:25:10 2008
+++ sony/command.c Sat Dec 13 15:28:27 2008
@@ -23,6 +23,7 @@
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
+#include <string.h>
#if 0
# define dprintf(x) fprintf x
@@ -288,11 +289,11 @@ char* return_buf;
break;
}
sprintf(tmp_buf, "Total Pictures: %02d\n", pic_num);
- strcat(status_buf, tmp_buf, sizeof(tmp_buf));
+ strlcat(status_buf, tmp_buf, sizeof(tmp_buf));
sprintf(tmp_buf, "Date: %02d/%02d/%02d\n", month, date, year);
- strcat(status_buf, tmp_buf, sizeof(tmp_buf));
+ strlcat(status_buf, tmp_buf, sizeof(tmp_buf));
sprintf(tmp_buf, "Time: %02d:%02d\n",hour, minutes);
- strcat(status_buf, tmp_buf, sizeof(tmp_buf));
+ strlcat(status_buf, tmp_buf, sizeof(tmp_buf));
}
/* return (buf[2]); ok*/
strcpy(return_buf, status_buf);

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-sony_dsc_f1_c,v 1.1 2004/05/15 18:37:53 naddy Exp $
--- sony/dsc_f1.c.orig 2004-05-15 19:45:37.000000000 +0200
+++ sony/dsc_f1.c 2004-05-15 19:46:20.000000000 +0200
@@ -166,10 +166,10 @@ int dsc_f1_delete_image (int picNum) {
char *dsc_f1_description () {
return(
- "Sony DSC-F1 Digital Camera Support\n
- M. Adam Kendall <joker@penguinpub.com>\n\n
- Based on the chotplay CLI interface from\n
- Ken-ichi Hayashi\n\n
+ "Sony DSC-F1 Digital Camera Support\n\n\
+ M. Adam Kendall <joker@penguinpub.com>\n\n\n\
+ Based on the chotplay CLI interface from\n\n\
+ Ken-ichi Hayashi\n\n\n\
This lib may not work. YMMV\n");
}

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-sony_dscf55_Makefile.in,v 1.2 2004/05/15 18:37:53 naddy Exp $
--- sony/dscf55/Makefile.in.orig 2000-03-06 23:07:07.000000000 +0100
+++ sony/dscf55/Makefile.in 2004-05-14 10:42:56.000000000 +0200
@@ -93,7 +93,7 @@ bin_PROGRAMS = rsony
rsony_SOURCES =
rsony_LDADD = srsony.o config.o serio.o
-CFLAGS = @CFLAGS@ @GTK_CFLAGS@
+CFLAGS = @CFLAGS@ @GDK_IMLIB_CFLAGS@
libgphoto_sony_dscf55_la_SOURCES = $(rs)

View File

@ -1,44 +0,0 @@
$OpenBSD: patch-sony_dscf55_rsony_c,v 1.1 2004/05/15 18:37:53 naddy Exp $
--- sony/dscf55/rsony.c.orig 2004-05-15 19:29:42.000000000 +0200
+++ sony/dscf55/rsony.c 2004-05-15 19:30:26.000000000 +0200
@@ -378,26 +378,26 @@ char *sony_dscf55_summary()
*/
char *sony_dscf55_description()
{
- return "Sony DSC F55/505 gPhoto Library
-Mark Davies <mdavies@dial.pipex.com>
-Sony DSC F55 and DSC F505 cameras.
-Still image support.
-* Mpegs are downloadable in standalone
- version only.
+ return "Sony DSC F55/505 gPhoto Library\n\
+Mark Davies <mdavies@dial.pipex.com>\n\
+Sony DSC F55 and DSC F505 cameras.\n\
+Still image support.\n\
+* Mpegs are downloadable in standalone\n\
+ version only.\n\
";
}
char *sony_msac_sr1_description()
{
- return "Sony DSC F55/505 gPhoto Library
-Mark Davies <mdavies@dial.pipex.com>
-Sony MSAC-SR1 and Memory Stick used
-by DCR-PC100.
-Still image support. Patches by
-Bernd Seemann <bernd@seebaer.ruhr.de>
-* Mpegs are downloadable in
-standalone version only.
+ return "Sony DSC F55/505 gPhoto Library\n\
+Mark Davies <mdavies@dial.pipex.com>\n\
+Sony MSAC-SR1 and Memory Stick used\n\
+by DCR-PC100.\n\
+Still image support. Patches by\n\
+Bernd Seemann <bernd@seebaer.ruhr.de>\n\
+* Mpegs are downloadable in\n\
+standalone version only.\n\
";
}

View File

@ -1,132 +0,0 @@
$OpenBSD: patch-src_callbacks_c,v 1.2 2008/12/14 19:18:02 ajacoutot Exp $
--- src/callbacks.c.orig Mon Mar 6 22:23:06 2000
+++ src/callbacks.c Sat Dec 13 13:22:12 2008
@@ -790,18 +790,18 @@ void save_config() {
void version_dialog() {
char msg[1024];
- sprintf(msg, "
-Version Information
--------------------
-
-Current Version: %s
-
-New features all over the place. Please see
-the ChangeLog for more information.
-
-As always, report bugs gphoto-devel@gphoto.org
-
-Thanx much.
+ sprintf(msg, "\n\
+Version Information\n\
+-------------------\n\
+\n\
+Current Version: %s\n\
+\n\
+New features all over the place. Please see\n\
+the ChangeLog for more information.\n\
+\n\
+As always, report bugs gphoto-devel@gphoto.org\n\
+\n\
+Thanx much.\n\
", VERSION);
error_dialog(msg);
@@ -865,27 +865,27 @@ void usersmanual_dialog() {
void faq_dialog() {
error_dialog(
-"Please visit http://www.gphoto.org/help.php3
+"Please visit http://www.gphoto.org/help.php3 \n\
for the current FAQ list.");
}
void show_license() {
- error_dialog("
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+ error_dialog("\n\
+This program is free software; you can redistribute it and/or modify\n\
+it under the terms of the GNU General Public License as published by\n\
+the Free Software Foundation; either version 2 of the License, or\n\
+(at your option) any later version.\n\
+\n\
+This program is distributed in the hope that it will be useful,\n\
+but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\
+GNU General Public License for more details.\n\
+\n\
+You should have received a copy of the GNU General Public License\n\
+along with this program; if not, write to the Free Software\n\
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n\
+\n\
See http://www.gnu.org for more details on the GNU project.");
}
@@ -1238,9 +1238,9 @@ void save_opened_image (int i, char *filename) {
if (gdk_imlib_save_image(node->imlibimage,filename, NULL) == 0) {
error_dialog(
- "Could not save image. Please make
- sure that you typed the image
- extension and that permissions for
+ "Could not save image. Please make\n\
+ sure that you typed the image\n\
+ extension and that permissions for\n\
the directory are correct.");
return;
}
@@ -1370,11 +1370,11 @@ void print_pic () {
gtk_box_pack_end_defaults(GTK_BOX(hbox),entry);
label = gtk_label_new(
-"* The filename is appended to the end
- of the command.
-* The \"-r\" flag is needed to delete
- the temporary file. If not used, a
- temporary file will be in your $HOME/.gphoto
+"* The filename is appended to the end\n\
+ of the command.\n\
+* The \"-r\" flag is needed to delete \n\
+ the temporary file. If not used, a \n\
+ temporary file will be in your $HOME/.gphoto\n\
directory.");
gtk_widget_show(label);
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
@@ -1814,9 +1814,9 @@ void post_process_change (GtkWidget *widget, GtkWidget
FALSE, FALSE, 0);
label = gtk_label_new(
-"
-Note: gPhoto will replace \"%s\" in the script command-line
-with the full path to the selected image. See the User's Manual
+"\n\
+Note: gPhoto will replace \"%s\" in the script command-line\n\
+with the full path to the selected image. See the User's Manual\n\
in the Help menu for more information. ");
gtk_widget_show(label);
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
@@ -1832,8 +1832,8 @@ in the Help menu for more information. ");
if ((strstr(gtk_entry_get_text(GTK_ENTRY(script)), "%s") == NULL)
&& GTK_TOGGLE_BUTTON(pp)->active) {
error_dialog(
-"Missing \"%s\" in the post-processing entry.
-This is required so the post-processing program
+"Missing \"%s\" in the post-processing entry.\n\
+This is required so the post-processing program\n\
knows where the image is located.");
return;
}

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_commandline_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- src/commandline.c.orig Sat Dec 13 13:25:23 2008
+++ src/commandline.c Sat Dec 13 13:25:34 2008
@@ -1,6 +1,7 @@
#include <stdlib.h>
#include <stdio.h>
+#include <string.h>
#include "config.h"
#include "main.h"

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_gallery_c,v 1.1 2004/05/15 18:37:53 naddy Exp $
--- src/gallery.c.orig 2004-05-15 19:47:31.000000000 +0200
+++ src/gallery.c 2004-05-15 19:47:44.000000000 +0200
@@ -271,9 +271,9 @@ void gallery_main() {
if (Thumbnails.next == NULL) {
error_dialog(
-"Please retrieve the index first,
-and select the images to include
-in the gallery by clicking on them.
+"Please retrieve the index first,\n\
+and select the images to include\n\
+in the gallery by clicking on them.\n\
Then, re-run the HTML Gallery.");
return;
}

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-src_main_c,v 1.1 2004/05/15 18:37:53 naddy Exp $
--- src/main.c.orig 2004-05-15 19:46:50.000000000 +0200
+++ src/main.c 2004-05-15 19:47:10.000000000 +0200
@@ -277,10 +277,10 @@ int main (int argc, char *argv[]) {
/* put anything here to do on the first run */
developer_dialog_create();
error_dialog(
-"Could not load config file.
-Resetting to defaults.
-Click on \"Select Port-Camera Model\"
-in the Configure menu to set your
+"Could not load config file.\n\
+Resetting to defaults.\n\
+Click on \"Select Port-Camera Model\"\n\
+in the Configure menu to set your\n\
camera model and serial port");
}
gtk_main();

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_menu_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- src/menu.c.orig Sat Dec 13 13:25:46 2008
+++ src/menu.c Sat Dec 13 13:26:01 2008
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <string.h>
+
#include "main.h"
#include "gphoto.h"
#include "menu.h"

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_util_c,v 1.2 2008/12/14 19:18:02 ajacoutot Exp $
--- src/util.c.orig Mon Mar 6 22:23:06 2000
+++ src/util.c Sat Dec 13 13:22:12 2008
@@ -257,7 +257,7 @@ void save_image (char *filename, struct Image *im) {
else
{
snprintf(errormsg,1024,
-"The image couldn't be saved to %s because of the following error:
+"The image couldn't be saved to %s because of the following error: \n\
%s",filename,sys_errlist[errno]);
error_dialog(errormsg);
}

View File

@ -1,13 +0,0 @@
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.

View File

@ -1,18 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/30 12:14:40 steven Exp $
@lib lib/libgphoto_canon.so.${LIBgphoto_canon_VERSION}
@lib lib/libgphoto_casio_qv.so.${LIBgphoto_casio_qv_VERSION}
@lib lib/libgphoto_coolpix600.so.${LIBgphoto_coolpix600_VERSION}
@lib lib/libgphoto_dimage_v.so.${LIBgphoto_dimage_v_VERSION}
@lib lib/libgphoto_dir.so.${LIBgphoto_dir_VERSION}
@lib lib/libgphoto_fuji.so.${LIBgphoto_fuji_VERSION}
@lib lib/libgphoto_kodak_dc2x.so.${LIBgphoto_kodak_dc2x_VERSION}
@lib lib/libgphoto_kodak_generic.so.${LIBgphoto_kodak_generic_VERSION}
@lib lib/libgphoto_konica_qm100.so.${LIBgphoto_konica_qm100_VERSION}
@lib lib/libgphoto_konica_qmxxx.so.${LIBgphoto_konica_qmxxx_VERSION}
@lib lib/libgphoto_mustek_mdc800.so.${LIBgphoto_mustek_mdc800_VERSION}
@lib lib/libgphoto_philips.so.${LIBgphoto_philips_VERSION}
@lib lib/libgphoto_photopc.so.${LIBgphoto_photopc_VERSION}
@lib lib/libgphoto_ricoh300z.so.${LIBgphoto_ricoh300z_VERSION}
@lib lib/libgphoto_samsung.so.${LIBgphoto_samsung_VERSION}
@lib lib/libgphoto_sony_dscf1.so.${LIBgphoto_sony_dscf1_VERSION}
@lib lib/libgphoto_sony_dscf55.so.${LIBgphoto_sony_dscf55_VERSION}

View File

@ -1,80 +0,0 @@
@comment $OpenBSD: PLIST,v 1.4 2008/12/14 19:18:02 ajacoutot Exp $
@bin bin/dc21x_cam
@bin bin/gphoto
@bin bin/gphoto-exifdump
@bin bin/qm100
@bin bin/qmxxx
@bin bin/rsony
lib/libgphoto_canon.a
lib/libgphoto_canon.la
lib/libgphoto_casio_qv.a
lib/libgphoto_casio_qv.la
lib/libgphoto_coolpix600.a
lib/libgphoto_coolpix600.la
lib/libgphoto_dimage_v.a
lib/libgphoto_dimage_v.la
lib/libgphoto_dir.a
lib/libgphoto_dir.la
lib/libgphoto_fuji.a
lib/libgphoto_fuji.la
lib/libgphoto_kodak_dc2x.a
lib/libgphoto_kodak_dc2x.la
lib/libgphoto_kodak_generic.a
lib/libgphoto_kodak_generic.la
lib/libgphoto_konica_qm100.a
lib/libgphoto_konica_qm100.la
lib/libgphoto_konica_qmxxx.a
lib/libgphoto_konica_qmxxx.la
lib/libgphoto_mustek_mdc800.a
lib/libgphoto_mustek_mdc800.la
lib/libgphoto_philips.a
lib/libgphoto_philips.la
lib/libgphoto_photopc.a
lib/libgphoto_photopc.la
lib/libgphoto_ricoh300z.a
lib/libgphoto_ricoh300z.la
lib/libgphoto_samsung.a
lib/libgphoto_samsung.la
lib/libgphoto_sony_dscf1.a
lib/libgphoto_sony_dscf1.la
lib/libgphoto_sony_dscf55.a
lib/libgphoto_sony_dscf55.la
@man man/man1/gphoto.1
share/doc/gphoto/
share/doc/gphoto/AUTHORS
share/doc/gphoto/MANUAL
share/gnome/
share/gnome/apps/
share/gnome/apps/Graphics/
share/gnome/apps/Graphics/gphoto.desktop
share/gphoto/
share/gphoto/gallery/
share/gphoto/gallery/CSStheme/
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/
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/
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
%%SHARED%%