Attachment 72222 Details for Bug 105024 – swiggle-0.3.3_2.patch

[patch] swiggle-0.3.3_2.patch

swiggle-0.3.3_2.patch (text/plain), 8.94 KB, created by Lars Engels on 2006-11-01 16:10:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lars Engels

Created: 2006-11-01 16:10:37 UTC

Size: 8.94 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/www/swiggle.orig/Makefile /usr/ports/www/swiggle/Makefile
>--- /usr/ports/www/swiggle.orig/Makefile	Wed Nov 1 15:12:14 2006
>+++ /usr/ports/www/swiggle/Makefile	Wed Nov 1 15:12:32 2006
>@@ -6,7 +6,7 @@
> 
> PORTNAME=	swiggle
> PORTVERSION=	0.3.3
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www
> MASTER_SITES=	http://homepage.univie.ac.at/l.ertl/swiggle/files/ \
> 		http://bsd-geek.de/FreeBSD/distfiles/
>diff -ruN --exclude=CVS /usr/ports/www/swiggle.orig/files/patch-html.c /usr/ports/www/swiggle/files/patch-html.c
>--- /usr/ports/www/swiggle.orig/files/patch-html.c	Thu Jan 1 01:00:00 1970
>+++ /usr/ports/www/swiggle/files/patch-html.c	Wed Nov 1 16:18:43 2006
>@@ -0,0 +1,164 @@
>+--- html.c.orig	Sat Oct 23 22:57:02 2004
>++++ html.c	Wed Nov 1 15:45:01 2006
>+@@ -50,6 +50,7 @@
>+ #define	MAX_PER_PAGE	(cols*rows)
>+ 
>+ extern int	cols;
>++extern int	exif_display;
>+ extern int	rows;
>+ extern char	generated[];
>+ extern char	*albumdesc;
>+@@ -115,37 +116,66 @@
>+ 		 imglist[x].width,
>+ 		 imglist[x].height,
>+ 		 (int) (imglist[x].filesize/1024));
>+-		
>+-		fprintf(html, "<table width=\"100%%\" border=\"1\">\n");
>+-		
>+-		if (imglist[x].datetime != NULL) {
>+-			fprintf(html, "<tr>\n<td>Taken:</td>"
>+-			 "<td>%s</td>\n</tr>\n",
>+-			 imglist[x].datetime);
>+-		}
>+-		if (imglist[x].aperture != NULL) {
>+-			fprintf(html, "<tr>\n<td>Aperture:</td>"
>+-			 "<td>%s</td>\n</tr>\n",
>+-			 imglist[x].aperture);
>+-		}
>+-		if (imglist[x].exposuretime != NULL) {
>+-			fprintf(html, "<tr>\n<td>Exposure Time:"
>+-			 "</td><td>%s</td>\n</tr>\n",
>+-			 imglist[x].exposuretime);
>+-		}
>+-		if (imglist[x].flash != NULL) {
>+-			fprintf(html, "<tr>\n<td>Flash:</td>"
>+-			 "<td>%s</td>\n</tr>\n",
>+-			 imglist[x].flash);
>+-		}
>+-		if (imglist[x].model != NULL) {
>+-			fprintf(html, "<tr>\n<td>Model:</td>"
>+-			 "<td>%s</td>\n</tr>\n",
>+-			 imglist[x].model);
>++
>++		/* Display by default */
>++		if (exif_display == 1) {
>++			fprintf(html, "<table width=\"100%%\" border=\"1\">\n");
>++
>++			if (imglist[x].datetime != NULL) {
>++				fprintf(html, "<tr>\n<td>Taken:</td>"
>++				 "<td>%s</td>\n</tr>\n",
>++				 imglist[x].datetime);
>++			}
>++			if (imglist[x].aperture != NULL) {
>++				fprintf(html, "<tr>\n<td>Aperture:</td>"
>++				 "<td>%s</td>\n</tr>\n",
>++				 imglist[x].aperture);
>++			}
>++			if (imglist[x].exposuretime != NULL) {
>++				fprintf(html, "<tr>\n<td>Exposure Time:"
>++				 "</td><td>%s</td>\n</tr>\n",
>++				 imglist[x].exposuretime);
>++			}
>++			if (imglist[x].flash != NULL) {
>++				fprintf(html, "<tr>\n<td>Flash:</td>"
>++				 "<td>%s</td>\n</tr>\n",
>++				 imglist[x].flash);
>++			}
>++			if (imglist[x].model != NULL) {
>++				fprintf(html, "<tr>\n<td>Model:</td>"
>++				 "<td>%s</td>\n</tr>\n",
>++				 imglist[x].model);
>++			}
>++
>++			fprintf(html, "</table>\n\n\n");
>++		/* Hide in comments if user requests */
>++		} else if (exif_display == 2) {
>++			fprintf(html, "\n");
>+ 		}
>+ 		
>+-		fprintf(html, "</table>\n\n\n");
>+-		
>+ 		if (offset == 1) {
>+ 			fprintf(html, "<a href=\"index.html\">"
>+ 			 "Back to thumbnails</a>\n");
>+@@ -197,7 +227,7 @@
>+ * Returns the number of thumbnail index pages created.
>+ */
>+ int 
>+-create_thumbindex(char *dir, struct imginfo *imglist, int imgcount)
>++create_thumbindex(char *dir, struct imginfo *imglist, int imgcount, int show_descr)
>+ {
>+ 	char *desc, final[MAXPATHLEN], tmp[MAXPATHLEN];
>+ 	int pages, offset, x, y;
>+@@ -277,21 +307,33 @@
>+ 		while (x < y) {
>+ 			if (x % cols == 0)
>+ 				fprintf(html, "<tr>\n");
>+-			
>+-			fprintf(html, "<td align=\"center\">\n"
>+-			 "<a href=\"%s.html\"><img src=\".thumbs/%s\" "
>+-			 "border=\"0\" alt=\"%s\" width=\"%d\" "
>+-			 "height=\"%d\"></a> \n%d x %d, %d KB"
>+-			 "\n \n</td>\n", 
>+-			 imglist[x].filename, 
>+-			 imglist[x].filename, 
>+-			 imglist[x].filename, 
>+-			 imglist[x].thumbwidth, 
>+-			 imglist[x].thumbheight,
>+-			 imglist[x].width,
>+-			 imglist[x].height,
>+-			 (int)(imglist[x].filesize / 1024));
>+-			
>++			if (show_descr) {
>++				fprintf(html, "<td align=\"center\">\n"
>++				 "<a href=\"%s.html\"><img src=\".thumbs/%s\" "
>++				 "border=\"0\" alt=\"%s\" width=\"%d\" "
>++				 "height=\"%d\"></a> \n%s"
>++				 "\n \n</td>\n", 
>++				 imglist[x].filename, 
>++				 imglist[x].filename, 
>++				 imglist[x].filename, 
>++				 imglist[x].thumbwidth, 
>++				 imglist[x].thumbheight,
>++				 imglist[x].description);
>++			} else {
>++				fprintf(html, "<td align=\"center\">\n"
>++				 "<a href=\"%s.html\"><img src=\".thumbs/%s\" "
>++				 "border=\"0\" alt=\"%s\" width=\"%d\" "
>++				 "height=\"%d\"></a> \n%d x %d, %d KB"
>++				 "\n \n</td>\n", 
>++				 imglist[x].filename, 
>++				 imglist[x].filename, 
>++				 imglist[x].filename, 
>++				 imglist[x].thumbwidth, 
>++				 imglist[x].thumbheight,
>++				 imglist[x].width,
>++				 imglist[x].height,
>++				 (int)(imglist[x].filesize / 1024));
>++			}	
>+ 			if ((x % cols == cols - 1) || (x + 1 == imgcount))
>+ 				fprintf(html, "</tr>\n");
>+ 			
>diff -ruN --exclude=CVS /usr/ports/www/swiggle.orig/files/patch-swiggle.c /usr/ports/www/swiggle/files/patch-swiggle.c
>--- /usr/ports/www/swiggle.orig/files/patch-swiggle.c	Thu Jan 1 01:00:00 1970
>+++ /usr/ports/www/swiggle/files/patch-swiggle.c	Wed Nov 1 16:36:04 2006
>@@ -0,0 +1,70 @@
>+--- swiggle.c.orig	Sat Oct 23 22:58:37 2004
>++++ swiggle.c	Wed Nov 1 16:34:10 2006
>+@@ -66,12 +66,14 @@
>+ char generated[1024];
>+ char *progname = "";
>+ int cols = 5;
>++int exif_display = 1; /* By default, display the exif data */
>+ int rows = 3;
>+ int scaleheight = 480;
>+ int thumbheight = 96;
>+ int force = 0;
>+ int bilinear = 0;
>+ int rm_orphans = 1;
>++int show_descr = 0;
>+ int (*sort_func)();
>+ 
>+ #define	MAX_PER_PAGE	(cols*rows)
>+@@ -113,7 +115,7 @@
>+ 	progname = argv[0];
>+ 	sort_func = sort_by_filename;
>+ 
>+-	while ((i = getopt(argc, argv, "c:d:h:H:r:s:flov")) != -1) {
>++	while ((i = getopt(argc, argv, "c:d:h:H:r:s:DeEflov")) != -1) {
>+ 		switch (i) {
>+ 		case 'c':
>+ 			cols = (int) strtol(optarg, &eptr, 10);
>+@@ -163,6 +165,12 @@
>+ 				usage();
>+ 			}
>+ 			break;
>++		case 'e':
>++			exif_display = 2;
>++			break;
>++		case 'E':
>++			exif_display = 0;
>++			break;
>+ 		case 'f':
>+ 			force = 1;
>+ 			break;
>+@@ -172,6 +180,9 @@
>+ 		case 'o':
>+ 			rm_orphans = 0;
>+ 			break;
>++		case 'D':
>++			show_descr = 1;
>++			break;
>+ 		case 'v':
>+ 			version();
>+ 			break;
>+@@ -353,7 +364,7 @@
>+ 		qsort(imglist, imgcount, sizeof(struct imginfo), sort_func);
>+ 		
>+ 		create_html(dir, imglist, imgcount);
>+-		x = create_thumbindex(dir, imglist, imgcount);
>++		x = create_thumbindex(dir, imglist, imgcount, show_descr);
>+ 		printf("%d thumbnail index pages created.\n", x);
>+ 	}
>+ 	
>+@@ -1040,6 +1051,11 @@
>+ 	 "(default: %d)\n", thumbheight);
>+ 	fprintf(stderr, " -H <j> ... height of the scaled images in pixel "
>+ 	 "(default: %d)\n", scaleheight);
>++	fprintf(stderr, " -e ... don't display exif data on the page, "
>++	 "insert it in html comments\n");
>++	fprintf(stderr, " -E ... don't display exif data at all\n");
>++	fprintf(stderr, " -D ... display filename instead of size on "
>++	 "index page\n");
>+ 	fprintf(stderr, " -f ... force rebuild of everything; ignore "
>+ 	 "cache\n");
>+ 	fprintf(stderr, " -o ... don't remove orphaned files\n");
>diff -ruN --exclude=CVS /usr/ports/www/swiggle.orig/files/patch-swiggle.h /usr/ports/www/swiggle/files/patch-swiggle.h
>--- /usr/ports/www/swiggle.orig/files/patch-swiggle.h	Thu Jan 1 01:00:00 1970
>+++ /usr/ports/www/swiggle/files/patch-swiggle.h	Wed Nov 1 16:19:55 2006
>@@ -0,0 +1,11 @@
>+--- swiggle.h.orig	Sat Oct 23 22:58:37 2004
>++++ swiggle.h	Wed Nov 1 15:43:27 2006
>+@@ -72,7 +72,7 @@
>+ };
>+ 
>+ void	create_html(char *, struct imginfo *, int);
>+-int	create_thumbindex(char *, struct imginfo *, int);
>++int	create_thumbindex(char *, struct imginfo *, int, int);
>+ 
>+ int resize_bicubic(struct jpeg_decompress_struct *,
>+ struct jpeg_compress_struct *, const unsigned char *, unsigned char **);

Actions: View | Diff

Attachments on bug 105024: 72222