pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/gphoto Make this compile with gcc3. Should fi...
details: https://anonhg.NetBSD.org/pkgsrc/rev/6ff6eb0f32c9
branches: trunk
changeset: 466498:6ff6eb0f32c9
user: cube <cube%pkgsrc.org@localhost>
date: Mon Jan 19 15:52:40 2004 +0000
description:
Make this compile with gcc3. Should fix PR 24151.
diffstat:
graphics/gphoto/distinfo | 17 ++++-
graphics/gphoto/patches/patch-ae | 21 ++++++
graphics/gphoto/patches/patch-ai | 29 ++++++++
graphics/gphoto/patches/patch-ao | 23 ++++++
graphics/gphoto/patches/patch-ap | 25 +++++++
graphics/gphoto/patches/patch-aq | 57 ++++++++++++++++
graphics/gphoto/patches/patch-ar | 75 +++++++++++++++++++++
graphics/gphoto/patches/patch-as | 19 +++++
graphics/gphoto/patches/patch-at | 23 ++++++
graphics/gphoto/patches/patch-au | 19 +++++
graphics/gphoto/patches/patch-av | 19 +++++
graphics/gphoto/patches/patch-aw | 45 +++++++++++++
graphics/gphoto/patches/patch-ax | 133 +++++++++++++++++++++++++++++++++++++++
graphics/gphoto/patches/patch-ay | 17 ++++
graphics/gphoto/patches/patch-az | 19 +++++
graphics/gphoto/patches/patch-ba | 13 +++
16 files changed, 553 insertions(+), 1 deletions(-)
diffs (truncated from 621 to 300 lines):
diff -r a49589ed5b77 -r 6ff6eb0f32c9 graphics/gphoto/distinfo
--- a/graphics/gphoto/distinfo Mon Jan 19 15:49:24 2004 +0000
+++ b/graphics/gphoto/distinfo Mon Jan 19 15:52:40 2004 +0000
@@ -1,4 +1,19 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:15 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/01/19 15:52:40 cube Exp $
SHA1 (gphoto-0.4.3.tar.gz) = f0606444ca0b3c37065b022cbe28ae265704af39
Size (gphoto-0.4.3.tar.gz) = 709336 bytes
+SHA1 (patch-ae) = 35f5286f36759f533ddf0301ae263eca5589c7c3
+SHA1 (patch-ai) = 4f049409172a9c327e5bdf1d275863dc115a6c80
+SHA1 (patch-ao) = 752aef4f1ca6d4ca20b7d88688d7de3ab27137d2
+SHA1 (patch-ap) = bf5f5f42216bd47d2fdfaf0f8c28c9b4bf775cd9
+SHA1 (patch-aq) = f31567b62da9c1616563819bb14af448bfcfb01a
+SHA1 (patch-ar) = 4480452473fe430b50b125305b02301e039ae58a
+SHA1 (patch-as) = f738f3f4ac38483580f32ad7b2b03a17123d360d
+SHA1 (patch-at) = 24b00b79ecdd0ee87baf0ee6215d21df393f26c0
+SHA1 (patch-au) = d6a59af49fa17f7a23487b2ee723b7f34e46e661
+SHA1 (patch-av) = 2c4aaa7b7f73829880be3c0b7f2bae40370c7ad8
+SHA1 (patch-aw) = f896c6774c04e60419dc81847412dae9286216f7
+SHA1 (patch-ax) = d52694837311a05d310280a11497e13ad8648229
+SHA1 (patch-ay) = 31bed2ab061434fd28ffeda727babfd17f1bbe6e
+SHA1 (patch-az) = 0a4bc130750db709a5f4d808453f44ae20028e81
+SHA1 (patch-ba) = 2c08925c186f5a34cc1328b82ed95319bcec01b3
diff -r a49589ed5b77 -r 6ff6eb0f32c9 graphics/gphoto/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gphoto/patches/patch-ae Mon Jan 19 15:52:40 2004 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-ae,v 1.3 2004/01/19 15:52:40 cube Exp $
+
+--- kodak/kodak_dc210.c.orig 2000-01-20 22:42:17.000000000 +0100
++++ kodak/kodak_dc210.c
+@@ -789,11 +789,11 @@ char *kodak_dc210_summary()
+ char *kodak_dc210_description()
+ {
+
+- return("Enhanced Kodak DC210 support
+-by TimeCop <timecop%japan.co.jp@localhost>
+-http://www.ne.jp/asahi/linux/timecop
+-based on original code
+-by Brian Hirt <bhirt%mobygames.com@localhost>
++ return("Enhanced Kodak DC210 support\n\
++by TimeCop <timecop%japan.co.jp@localhost>\n\
++http://www.ne.jp/asahi/linux/timecop\n\
++based on original code\n\
++by Brian Hirt <bhirt%mobygames.com@localhost> \n\
+ http://www.mobygames.com";);
+
+ }
diff -r a49589ed5b77 -r 6ff6eb0f32c9 graphics/gphoto/patches/patch-ai
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gphoto/patches/patch-ai Mon Jan 19 15:52:40 2004 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-ai,v 1.3 2004/01/19 15:52:40 cube Exp $
+
+--- kodak/kodak_dc2x.c.orig 1999-12-05 19:48:53.000000000 +0100
++++ kodak/kodak_dc2x.c
+@@ -357,15 +357,15 @@ dc20_info->model, dc20_info->pic_taken,
+ char *kodak_dc2x_description() {
+
+ return(
+-"Kodak DC25 and DC20 support
+-by Del Simmons <del%freespeech.com@localhost>.
+-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@localhost>. \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!");
+ }
+
diff -r a49589ed5b77 -r 6ff6eb0f32c9 graphics/gphoto/patches/patch-ao
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gphoto/patches/patch-ao Mon Jan 19 15:52:40 2004 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-ao,v 1.1 2004/01/19 15:52:40 cube Exp $
+
+--- directory/directory.c.orig 1999-07-02 01:11:05.000000000 +0200
++++ directory/directory.c
+@@ -206,12 +206,12 @@ char *dir_summary() {
+ static char *dir_description() {
+
+ return(
+-"Browse Directory\nScott Fritzinger <scottf%unr.edu@localhost>
+-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@localhost> \
++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 \
+ to set it up.");
+
+ }
diff -r a49589ed5b77 -r 6ff6eb0f32c9 graphics/gphoto/patches/patch-ap
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gphoto/patches/patch-ap Mon Jan 19 15:52:40 2004 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-ap,v 1.1 2004/01/19 15:52:40 cube Exp $
+
+--- fuji/fujilib.c.orig 2000-01-11 03:13:33.000000000 +0100
++++ fuji/fujilib.c
+@@ -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@localhost>
+-
+-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@localhost>\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.");
+ }
+
diff -r a49589ed5b77 -r 6ff6eb0f32c9 graphics/gphoto/patches/patch-aq
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gphoto/patches/patch-aq Mon Jan 19 15:52:40 2004 +0000
@@ -0,0 +1,57 @@
+$NetBSD: patch-aq,v 1.1 2004/01/19 15:52:40 cube Exp $
+
+--- kodak/dc21x/main.c.orig 2000-01-20 22:42:18.000000000 +0100
++++ kodak/dc21x/main.c
+@@ -54,29 +54,29 @@ void print_info( int type )
+
+ void usage(void)
+ {
+- printf ("Kodak DC21x Digital Camera utility by timecop [timecop%japan.co.jp@localhost]
+-
+- 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@localhost]\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\
+ ");
+ }
+
diff -r a49589ed5b77 -r 6ff6eb0f32c9 graphics/gphoto/patches/patch-ar
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gphoto/patches/patch-ar Mon Jan 19 15:52:40 2004 +0000
@@ -0,0 +1,75 @@
+$NetBSD: patch-ar,v 1.1 2004/01/19 15:52:40 cube Exp $
+
+--- philips/philips.h.orig 1999-11-20 17:28:41.000000000 +0100
++++ philips/philips.h
+@@ -86,38 +86,38 @@ typedef struct PHILIPS_CFG {
+
+
+ static char *philips_description_string =
+-"Philips/Ricoh gPhoto Library
+-Bob Paauwe <bpaauwe%bobsplace.com@localhost>
+-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@localhost>\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\
+ ";
+
+
diff -r a49589ed5b77 -r 6ff6eb0f32c9 graphics/gphoto/patches/patch-as
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gphoto/patches/patch-as Mon Jan 19 15:52:40 2004 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-as,v 1.1 2004/01/19 15:52:40 cube Exp $
+
+--- photopc/olympus.c.orig 1999-06-25 02:25:46.000000000 +0200
++++ photopc/olympus.c
+@@ -594,10 +594,10 @@ char *oly_summary() {
+ char *oly_description() {
+
+ return(
+-"Olympus/PhotoPC Digital Camera Support
+-Scott Fritzinger <scottf%unr.edu@localhost>
+-using the photoPC library by
+-Eugene Crosser <crosser%average.org@localhost>
++"Olympus/PhotoPC Digital Camera Support\n\
++Scott Fritzinger <scottf%unr.edu@localhost>\n\
++using the photoPC library by\n\
++Eugene Crosser <crosser%average.org@localhost>\n\
+ http://www.average.org/digicam";);
+ }
Home |
Main Index |
Thread Index |
Old Index