6 files changed, 0 insertions, 309 deletions

diff --git a/graphics/libgphoto2/files/patch-Canon b/graphics/libgphoto2/files/patch-Canon
deleted file mode 100644
index c12841ebf4ac..000000000000
--- a/graphics/libgphoto2/files/patch-Canon
+++ /dev/null
@@ -1,201 +0,0 @@
---- camlibs/canon/canon.c.orig	Sun Jan 18 20:47:01 2004
-+++ camlibs/canon/canon.c	Wed Oct 20 13:25:01 2004
-@@ -15,7 +15,7 @@
-  * and usb.c, keeping the common protocols/busses support in this
-  * file.
-  *
-- * $Id: canon.c,v 1.236.2.6 2004/01/15 12:30:11 hun Exp $
-+ * $Id: canon.c,v 1.247 2004/08/14 00:24:12 hfiguiere Exp $
-  */
- 
- #include "config.h"
-@@ -83,15 +83,17 @@
-  *   detection.
-  * - Newer Canon USB cameras also support a PTP mode. See ptp2 camlib.
-  * - No IEEE1394 cameras supported yet.
-+ * - The size limit constants aren't used properly anywhere. We should
-+ *   probably get rid of them altogether.
-  **/
- 
- /* SL_* - size limit constants */
--#define KILOBYTE	(1024)
--#define MEGABYTE	(1024 * KILOBYTE)
--#define SL_THUMB	( 100 * KILOBYTE)
--#define SL_PICTURE	(  10 * MEGABYTE)
--#define SL_MOVIE_SMALL	( 100 * MEGABYTE)
--#define SL_MOVIE_LARGE	(2048 * MEGABYTE)
-+#define KILOBYTE	(1024U)
-+#define MEGABYTE	(1024U * KILOBYTE)
-+#define SL_THUMB	( 100U * KILOBYTE)
-+#define SL_PICTURE	(  10U * MEGABYTE)
-+#define SL_MOVIE_SMALL	( 100U * MEGABYTE)
-+#define SL_MOVIE_LARGE	(2048U * MEGABYTE)
- #define NO_USB  0
- 
- const struct canonCamModelData models[] = {
-@@ -171,8 +173,9 @@
- 	/* 3078 and 307a are in MacOS Info.plist, but I don't know
- 	 * what they are --swestin. */
- 	{"Canon:PowerShot unknown 5",		CANON_PS_UNK5,	0x04A9, 0x307a, CAP_SUP, SL_MOVIE_SMALL, SL_THUMB, SL_PICTURE, NULL},
--	/* MV630i seems to be a DV camcorder */
-+	/* MV630i is a DV camcorder */
- 	{"Canon:MV630i",		CANON_MV630I,		0x04A9, 0x307b, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
-+	{"Canon:MV650i",		CANON_MV650I,		0x04A9, 0x3079, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
- 	{"Canon:Optura 20",		CANON_OPT_20,		0x04A9, 0x307f, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
- 	{"Canon:Optura 10",		CANON_OPT_10,		0x04A9, 0x3081, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
- 
-@@ -184,6 +187,13 @@
- 	/* PS G5 uses the same ProductID for PTP and Canon, with protocol autodetection */
- 	{"Canon:PowerShot G5 (normal mode)",	CANON_PS_G5,	0x04A9, 0x3085, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
- 	{"Canon:PowerShot A80 (normal mode)",CANON_PS_A80,      0x04A9, 0x309A, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
-+	{"Canon:PowerShot S60 (normal mode)", CANON_PS_S60,     0x04A9, 0x30b2, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
-+	{"Canon:Digital IXUS 500 (normal mode)",CANON_PS_S500,  0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
-+	{"Canon:PowerShot A75",        CANON_PS_A75, 	        0x04A9, 0x30b5, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
-+	{"Canon:PowerShot A85",        CANON_PS_A75,            0x04A9, 0x30b9, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
-+	{"Canon:PowerShot A310",        CANON_PS_A310,          0x04A9, 0x30b8, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, 
-+	{"Canon:PowerShot S410 (normal mode)",CANON_PS_S410,  0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
-+	{"Canon:Digital IXUS 430 (normal mode)",CANON_PS_S410,  0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
- 
- 	{NULL}
- 	/* *INDENT-ON* */
-@@ -1535,10 +1545,13 @@
-  * @path: gphoto2 path
-  * @context: context for error reporting
-  *
-- * convert gphoto2 path  (e.g.   "/DCIM/116CANON/IMG_1240.JPG")
-+ * convert gphoto2 path  (e.g.   "/dcim/116CANON/img_1240.jpg")
-  * into canon style path (e.g. "D:\DCIM\116CANON\IMG_1240.JPG")
-  *
-- * Returns: string with converted path name
-+ * Canon cameras use FAT with upper case internally, so we convert
-+ * into that.
-+ *
-+ * Returns: immutable string with converted path name
-  *
-  */
- const char *
-@@ -1562,13 +1575,14 @@
- 
- 	snprintf (tmp, sizeof (tmp), "%s%s", camera->pl->cached_drive, path);
- 
--	/* replace all slashes by backslashes */
-+	/* replace all slashes by backslashes, change case to upper for FAT */
- 	for (p = tmp; *p != '\0'; p++) {
- 		if (*p == '/')
- 			*p = '\\';
-+		*p = (char) toupper(*p);
- 	}
- 
--	/* remove trailing backslash */
-+	/* remove trailing backslash, making sure buffer ends with \0 */
- 	if ((p > tmp) && (*(p - 1) == '\\'))
- 		*(p - 1) = '\0';
- 
-@@ -1803,7 +1817,7 @@
- 				 * that is not an error for serial cameras
- 				 * (at least the A50 adds five zero bytes at the end)
- 				 */
--				for (temp_ch = pos; temp_ch < end_of_data && *temp_ch; temp_ch++) ;	/* do nothing */
-+				for (temp_ch = pos; (temp_ch < end_of_data) && (!*temp_ch); temp_ch++) ;	/* do nothing */
- 
- 				if (temp_ch == end_of_data) {
- 					GP_DEBUG ("canon_int_list_dir: "
---- camlibs/canon/canon.h.orig	Sun Jan 18 20:47:01 2004
-+++ camlibs/canon/canon.h	Wed Oct 20 13:25:58 2004
-@@ -3,7 +3,7 @@
-  *
-  * Written 1999 by Wolfgang G. Reissnegger and Werner Almesberger
-  *
-- * $Id: canon.h,v 1.87.2.3 2004/01/15 12:29:40 hun Exp $
-+ * $Id: canon.h,v 1.95 2004/08/14 00:24:12 hfiguiere Exp $
-  *
-  */
- 
-@@ -68,7 +68,9 @@
-  * @CANON_PS_A50: PowerShot A50
-  * @CANON_PS_A60: PowerShot A60
-  * @CANON_PS_A70: PowerShot A70
-+ * @CANON_PS_A75: PowerShot A75
-  * @CANON_PS_A80: PowerShot A80
-+ * @CANON_PS_A85: PowerShot A85
-  * @CANON_PS_PRO70: PowerShot Pro70
-  * @CANON_PS_S10: PowerShot S10
-  * @CANON_PS_S20: PowerShot S20
-@@ -91,11 +93,15 @@
-  * @CANON_PS_A300: PowerShot A300
-  * @CANON_PS_S200: PowerShot S200, Digital IXUS v2
-  * @CANON_PS_S330: Digital IXUS 330
-+ * @CANON_PS_S410: Digital IXUS 430
-+ * @CANON_PS_S500: Digital IXUS 500
-  * @CANON_PS_S45: PowerShot S45
-+ * @CANON_PS_S60: PowerShot S60
-  * @CANON_PS_G3: PowerShot G3
-  * @CANON_PS_G5: PowerShot G5
-  * @CANON_PS_S230: PowerShot S230, Digital IXUS v3
-  * @CANON_MV630I: MV630i camcorder
-+ * @CANON_MV650I: MV650i camcorder
-  * @CANON_EOS_10D: EOS 10D
-  * @CANON_OPT_10: Optura 10
-  * @CANON_OPT_20: Optura 20
-@@ -119,7 +125,9 @@
- 	CANON_PS_A50,
- 	CANON_PS_A60,
- 	CANON_PS_A70,
-+	CANON_PS_A75,
- 	CANON_PS_A80,
-+	CANON_PS_A85,
- 	CANON_PS_S10,
- 	CANON_PS_S20,
- 	CANON_PS_S30,
-@@ -141,11 +149,13 @@
- 	CANON_PS_A100,
- 	CANON_PS_A200,
- 	CANON_PS_A300,
-+	CANON_PS_A310,
- 	CANON_PS_S50,
- 	CANON_PS_S45,
- 	CANON_PS_G3,
- 	CANON_PS_S230,
- 	CANON_MV630I,
-+	CANON_MV650I,
- 	CANON_EOS_10D,
- 	CANON_OPT_200,
- 	/* In Mac OS Image Capture, but not yet seen in the wild. */
-@@ -156,6 +166,9 @@
- 	CANON_PS_UNK5,
- 	/* other cameras */
- 	CANON_PS_S400,
-+	CANON_PS_S410,
-+	CANON_PS_S60,
-+	CANON_PS_S500,
- 	CANON_PS_SD100,
- 	CANON_EOS_300D,
- 	CANON_PS_G5,
-@@ -256,6 +269,7 @@
- 	unsigned short usb_vendor;
- 	unsigned short usb_product;
- 	canonCaptureSupport usb_capture_support;
-+	/* these three constants aren't used properly */
- 	unsigned int max_movie_size;
- 	unsigned int max_thumbnail_size;
- 	unsigned int max_picture_size;
---- camlibs/canon/usb.c.orig	Sun Jan 18 20:47:01 2004
-+++ camlibs/canon/usb.c	Wed Oct 20 13:21:24 2004
-@@ -4,7 +4,7 @@
-  *
-  * USB communication layer.
-  *
-- * $Id: usb.c,v 1.83 2004/01/02 15:42:33 marcusmeissner Exp $
-+ * $Id: usb.c,v 1.85 2004/02/03 18:24:39 hun Exp $
-  ****************************************************************************/
- 
- #include "config.h"
-@@ -1178,7 +1178,7 @@
- 
- 	/* the 1 is to show status */
- 	res = canon_usb_long_dialogue (camera, CANON_USB_FUNCTION_GET_FILE, data, length,
--				       camera->pl->md->max_picture_size, payload,
-+				       camera->pl->md->max_movie_size, payload,
- 				       payload_length, 1, context);
- 	if (res != GP_OK) {
- 		GP_DEBUG ("canon_usb_get_file: canon_usb_long_dialogue() "
diff --git a/graphics/libgphoto2/files/patch-camlibs:aox:aox.c b/graphics/libgphoto2/files/patch-camlibs:aox:aox.c
deleted file mode 100644
index 341fdd528aae..000000000000
--- a/graphics/libgphoto2/files/patch-camlibs:aox:aox.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- camlibs/aox/aox.c.orig	Mon Jan 26 01:24:20 2004
-+++ camlibs/aox/aox.c	Mon Jan 26 01:25:54 2004
-@@ -39,10 +39,11 @@
- int aox_init (GPPort *port, Model *model, Info *info) 
- {
- 	unsigned char c[4];
--	memset(c,0,sizeof(c));
- 	unsigned char hi[2];
--	memset (hi,0,2);
- 	unsigned char lo[2];
-+
-+	memset(c,0,sizeof(c));
-+	memset (hi,0,2);
- 	memset (lo,0,2);
- 
- 	GP_DEBUG("Running aox_init\n");
-@@ -86,11 +87,12 @@
- 
- int aox_get_picture_size  (GPPort *port, int lo, int hi, int n, int k) 
- {
-+	unsigned char c[4];
-+        unsigned int size;
-+
- 	GP_DEBUG("Running aox_get_picture_size\n");
- 
--	unsigned char c[4];
- 	memset (c,0,4);
--        unsigned int size;
- 
- 	if ( ( (lo) && ( n ==k ) && (k ==0)) ) {
- 	    	READ(port, 0x04, 0x1, 0x1, c, 2);	
diff --git a/graphics/libgphoto2/files/patch-camlibs:aox:library.c b/graphics/libgphoto2/files/patch-camlibs:aox:library.c
deleted file mode 100644
index bac1eafcba9b..000000000000
--- a/graphics/libgphoto2/files/patch-camlibs:aox:library.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- camlibs/aox/library.c.orig	Mon Jan 26 01:22:59 2004
-+++ camlibs/aox/library.c	Mon Jan 26 01:23:58 2004
-@@ -167,7 +167,7 @@
- 	unsigned char *data;
- 	unsigned char *p_data = NULL;
- 	unsigned char *output = NULL;     
--	int len;
-+	int len, header_len;
- 	char header[128];	
- 	unsigned char gtable[256];
- 
-@@ -222,7 +222,7 @@
- 			GP_DEBUG("size of data = %i\n", sizeof(data));
- 			GP_DEBUG("size of p_data = %i\n", sizeof(p_data));
- 			/* And now create a ppm file, with our own header */
--			int  header_len = snprintf(header, 127, 
-+			header_len = snprintf(header, 127, 
- 				"P6\n" 
- 				"# CREATOR: gphoto2, aox library\n" 
- 				"%d %d\n" 
diff --git a/graphics/libgphoto2/files/patch-libgphoto2::gphoto2-filesys.c b/graphics/libgphoto2/files/patch-libgphoto2::gphoto2-filesys.c
deleted file mode 100644
index 017bdec955b1..000000000000
--- a/graphics/libgphoto2/files/patch-libgphoto2::gphoto2-filesys.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgphoto2/gphoto2-filesys.c.orig	Sun Jan 18 20:46:59 2004
-+++ libgphoto2/gphoto2-filesys.c	Thu Jul 22 07:55:25 2004
-@@ -1920,7 +1920,7 @@
- #elif HAVE_SYSCTL && (__FreeBSD__ || __NetBSD__ || __OpenBSD__ || __APPLE__ )
- 
- 	int mib[2] = { CTL_HW, HW_PHYSMEM };
--	int value;
-+	unsigned long value;
- 	size_t valuelen = sizeof(value);
- 	*free=0;
- 	if (sysctl(mib, 2 , &value, &valuelen, NULL, 0) == -1) {
diff --git a/graphics/libgphoto2/files/patch-libgphoto2_port::ltmain.sh b/graphics/libgphoto2/files/patch-libgphoto2_port::ltmain.sh
deleted file mode 100644
index 7fd28043b837..000000000000
--- a/graphics/libgphoto2/files/patch-libgphoto2_port::ltmain.sh
+++ /dev/null
@@ -1,23 +0,0 @@
---- libgphoto2_port/ltmain.sh.orig	Tue Jun 25 21:56:37 2002
-+++ libgphoto2_port/ltmain.sh	Tue Jul  2 02:34:54 2002
-@@ -967,6 +967,7 @@
- 	;;
- 
-       -avoid-version)
-+	build_old_libs=no
- 	avoid_version=yes
- 	continue
- 	;;
-@@ -4273,10 +4274,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/graphics/libgphoto2/files/patch-ltmain.sh b/graphics/libgphoto2/files/patch-ltmain.sh
deleted file mode 100644
index 886fc92f7ccc..000000000000
--- a/graphics/libgphoto2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,23 +0,0 @@
---- ltmain.sh.orig	Sat Mar  2 08:58:32 2002
-+++ ltmain.sh	Sat Mar  2 08:59:07 2002
-@@ -958,6 +958,7 @@
- 	;;
- 
-       -avoid-version)
-+	build_old_libs=no
- 	avoid_version=yes
- 	continue
- 	;;
-@@ -4247,10 +4248,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"