From 5910f689fcee5046a0e206b5b09485e07a3362b0 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 12 May 2006 12:26:58 +0000 Subject: Add DragonFly support and fix GCC 3.4+ issues. --- graphics/gphoto/distinfo | 9 +++++++-- graphics/gphoto/patches/patch-aa | 22 ++++++++++++++++++++++ graphics/gphoto/patches/patch-ab | 21 +++++++++++++++++++++ graphics/gphoto/patches/patch-ac | 13 +++++++++++++ graphics/gphoto/patches/patch-ad | 12 ++++++++++++ graphics/gphoto/patches/patch-af | 20 ++++++++++++++++++++ graphics/gphoto/patches/patch-ba | 16 +++++++++++++--- 7 files changed, 108 insertions(+), 5 deletions(-) create mode 100644 graphics/gphoto/patches/patch-aa create mode 100644 graphics/gphoto/patches/patch-ab create mode 100644 graphics/gphoto/patches/patch-ac create mode 100644 graphics/gphoto/patches/patch-ad create mode 100644 graphics/gphoto/patches/patch-af (limited to 'graphics') diff --git a/graphics/gphoto/distinfo b/graphics/gphoto/distinfo index e16718c91bc..f1de5a54c6d 100644 --- a/graphics/gphoto/distinfo +++ b/graphics/gphoto/distinfo @@ -1,9 +1,14 @@ -$NetBSD: distinfo,v 1.5 2005/11/05 18:58:03 kristerw Exp $ +$NetBSD: distinfo,v 1.6 2006/05/12 12:26:58 joerg Exp $ SHA1 (gphoto-0.4.3.tar.gz) = f0606444ca0b3c37065b022cbe28ae265704af39 RMD160 (gphoto-0.4.3.tar.gz) = b0cefdea55b592e237a0787689255c2939180608 Size (gphoto-0.4.3.tar.gz) = 709336 bytes +SHA1 (patch-aa) = e058276c0a63972daf3dc127005c26114ca42f8c +SHA1 (patch-ab) = f1cfb8c078a7ba2de3e15cdfe6b2cac197f5ed8a +SHA1 (patch-ac) = e115b685d176f032ab6d85f63982b7bdf9496138 +SHA1 (patch-ad) = 575c36f042edeb22751f6cf7d6a57abd4b1ef813 SHA1 (patch-ae) = 35f5286f36759f533ddf0301ae263eca5589c7c3 +SHA1 (patch-af) = 0d2614d84550d459c68914b068e89b7f06ce66ca SHA1 (patch-ai) = 4f049409172a9c327e5bdf1d275863dc115a6c80 SHA1 (patch-ao) = 752aef4f1ca6d4ca20b7d88688d7de3ab27137d2 SHA1 (patch-ap) = bf5f5f42216bd47d2fdfaf0f8c28c9b4bf775cd9 @@ -17,4 +22,4 @@ SHA1 (patch-aw) = f896c6774c04e60419dc81847412dae9286216f7 SHA1 (patch-ax) = d52694837311a05d310280a11497e13ad8648229 SHA1 (patch-ay) = 31bed2ab061434fd28ffeda727babfd17f1bbe6e SHA1 (patch-az) = 0a4bc130750db709a5f4d808453f44ae20028e81 -SHA1 (patch-ba) = 2c08925c186f5a34cc1328b82ed95319bcec01b3 +SHA1 (patch-ba) = 61ead767f4f2ec2f61218d28127c29e29e97f4f5 diff --git a/graphics/gphoto/patches/patch-aa b/graphics/gphoto/patches/patch-aa new file mode 100644 index 00000000000..2b313b81f38 --- /dev/null +++ b/graphics/gphoto/patches/patch-aa @@ -0,0 +1,22 @@ +$NetBSD: patch-aa,v 1.3 2006/05/12 12:26:58 joerg Exp $ + +--- canon/serial.c.orig 2006-05-06 12:21:45.000000000 +0000 ++++ canon/serial.c +@@ -121,7 +121,7 @@ int canon_serial_init(const char *devnam + + D(printf("canon_init_serial(): devname %s\n", devname)); + +- #ifdef __FreeBSD__ ++ #if defined(__FreeBSD__) || (defined(__DragonFly__) && !defined(O_SYNC)) + fd = open(devname, O_RDWR | O_NOCTTY | O_NONBLOCK); + #else + fd = open(devname, O_RDWR | O_NOCTTY | O_SYNC | O_NONBLOCK); +@@ -143,7 +143,7 @@ int canon_serial_init(const char *devnam + newtio.c_cflag = (newtio.c_cflag & ~CSIZE) | CS8; + + /* Set into raw, no echo mode */ +- #if defined(__FreeBSD__) || defined(__NetBSD__) ++ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) + 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..48838bbcceb --- /dev/null +++ b/graphics/gphoto/patches/patch-ab @@ -0,0 +1,21 @@ +$NetBSD: patch-ab,v 1.3 2006/05/12 12:26:58 joerg Exp $ + +--- konica/setSpeed.c.orig 2006-05-06 12:23:27.000000000 +0000 ++++ konica/setSpeed.c +@@ -17,14 +17,14 @@ void qm100_setSpeed(int serialdev, int s + + newt.c_cflag |= CS8; + newt.c_iflag &= ~(IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK|ISTRIP|INLCR); +- #if defined(__FreeBSD__) || defined(__NetBSD__) /* by fujisawa@konica.co.jp */ ++ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) /* 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); +- #if defined(__FreeBSD__) || defined(__NetBSD__) ++ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) + /**/ + #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..ba16b9ff723 --- /dev/null +++ b/graphics/gphoto/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.3 2006/05/12 12:26:58 joerg Exp $ + +--- mustek/device.c.orig 2006-05-12 11:09:50.000000000 +0000 ++++ mustek/device.c +@@ -59,7 +59,7 @@ int mdc800_device_setupDevice (fd, baud) + newtio.c_cflag = (newtio.c_cflag & ~CSIZE) | CS8; + + // Set into raw, no echo mode +- #if defined(__NetBSD__) ++ #if defined(__NetBSD__) || defined(__DragonFly__) + newtio.c_iflag &= ~(IGNBRK | IGNCR | INLCR | ICRNL | + IXANY | IXON | IXOFF | INPCK | ISTRIP); + #else diff --git a/graphics/gphoto/patches/patch-ad b/graphics/gphoto/patches/patch-ad new file mode 100644 index 00000000000..dc8a4ec8c28 --- /dev/null +++ b/graphics/gphoto/patches/patch-ad @@ -0,0 +1,12 @@ +$NetBSD: patch-ad,v 1.3 2006/05/12 12:26:59 joerg Exp $ + +--- sony/chotplay.c.orig 2006-05-12 11:27:38.000000000 +0000 ++++ sony/chotplay.c +@@ -2,7 +2,6 @@ + #include + #include + #include +-extern int errno; + #ifdef BINARYFILEMODE + #include /* for setmode() */ + #endif diff --git a/graphics/gphoto/patches/patch-af b/graphics/gphoto/patches/patch-af new file mode 100644 index 00000000000..e133dca5459 --- /dev/null +++ b/graphics/gphoto/patches/patch-af @@ -0,0 +1,20 @@ +$NetBSD: patch-af,v 1.4 2006/05/12 12:26:59 joerg Exp $ + +--- src/menu.c.orig 2006-05-12 11:37:58.000000000 +0000 ++++ src/menu.c +@@ -17,6 +17,7 @@ + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + ++#include + #include "main.h" + #include "gphoto.h" + #include "menu.h" +@@ -177,6 +178,7 @@ void menu_select (gpointer data, guint a + del_dialog(1); + break; + default: ++ break; + } + } + diff --git a/graphics/gphoto/patches/patch-ba b/graphics/gphoto/patches/patch-ba index 1bb566c3355..c0e4ab2f643 100644 --- a/graphics/gphoto/patches/patch-ba +++ b/graphics/gphoto/patches/patch-ba @@ -1,8 +1,18 @@ -$NetBSD: patch-ba,v 1.1 2004/01/19 15:52:40 cube Exp $ +$NetBSD: patch-ba,v 1.2 2006/05/12 12:26:59 joerg Exp $ ---- src/util.c.orig 2000-03-06 22:23:06.000000000 +0100 +--- src/util.c.orig 2000-03-06 21:23:06.000000000 +0000 +++ src/util.c -@@ -257,7 +257,7 @@ void save_image (char *filename, struct +@@ -11,8 +11,7 @@ + #include + #include + #include +-#ifdef __FreeBSD__ +-#else ++#if !defined(__FreeBSD__) && !defined(__DragonFly__) + #include + #endif + #ifdef linux +@@ -257,7 +256,7 @@ void save_image (char *filename, struct else { snprintf(errormsg,1024, -- cgit v1.2.3